summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'lass/master'makefu2019-04-125-129/+12
|\
| * Merge remote-tracking branch 'ni/master' into 19.03lassulus2019-04-091-1/+0
| |\
| | * tv mail-client: kill alot due to python 2 relationtv2019-04-081-1/+0
| | * tv pulse: use pkgs.pkgsi686Linuxtv2019-04-081-1/+3
| * | tv pulse: use pkgs.pkgsi686Linuxtv2019-04-081-1/+3
| * | Merge remote-tracking branch 'ni/master'lassulus2019-04-081-126/+1
| |\|
| | * q-power_supply: init from tv's qtv2019-03-291-126/+1
| * | types host: add syncthing.idlassulus2019-03-221-0/+6
| * | Merge remote-tracking branch 'enklave/master'lassulus2019-03-221-1/+2
| |\ \
| | * \ Merge branch 'master' of prism.r:stockholm into new-masterjeschli2019-03-2113-35/+350
| | |\ \
| | * | | j brauerei: now on i3jeschli2019-03-211-1/+2
| * | | | Merge remote-tracking branch 'gum/master'lassulus2019-03-220-0/+0
| |\ \ \ \ | |/ / / / |/| | | |
* | | | | Merge remote-tracking branch 'tv/master'makefu2019-03-131-2/+3
|\ \ \ \ \ | |_|_|/ / |/| | | / | | |_|/ | |/| |
| | * | Merge remote-tracking branch 'ni/master'lassulus2019-03-221-2/+3
| |/| | |/|/ /
| * | tv utsushi: 3.48.0 -> 3.54.0tv2019-03-121-2/+2
| * | tv utsushi: set udev confdirtv2019-03-121-0/+1
* | | Merge remote-tracking branch 'enklave/master'lassulus2019-03-127-225/+101
|\ \ \ | | |/ | |/|
| * | j brauerei: -xmomad (is part of windowManager sessionnow )jeschli2019-02-261-9/+0
| * | j brauerei: -rustc (provoided by rustup)jeschli2019-02-261-1/+3
| * | j xserver: add dbus magic for xserver (xserver/default.nix not working curren...jeschli2019-02-091-0/+6
| * | j brauerei: remove not working tokei overridejeschli2019-02-091-8/+1
| * | j brauerei: remove commented dead codejeschli2019-02-091-1/+13
| * | j krops: fix directoryjeschli2019-02-091-4/+1
| * | xmonad-jeschli: remove obsolete shortkeyjeschli2019-01-291-1/+0
| * | xmonad-jeschli: remove setWMName LG3D where not neededjeschli2019-01-291-1/+1
| * | xmonad-jeschli: set my initial workspacesjeschli2019-01-291-2/+1
| * | j brauerei: add tokeijeschli2019-01-291-0/+9
| * | j brauerei: refactor: rearrange blockjeschli2019-01-291-1/+1
| * | j brauerei: remove git aliasesjeschli2019-01-291-9/+0
| * | j brauerei: add jeschli-xmonad and option to choose gnome3, xfce. +emacs as s...jeschli2019-01-291-14/+18
| * | Merge branch 'master' of prism.r:stockholmjeschli2019-01-2915-85/+101
| |\ \
| * \ \ Merge branch 'master' of prism.r:stockholmjeschli2018-12-288-13/+11
| |\ \ \
| * \ \ \ Merge branch 'master' of prism.r:stockholmjeschli2018-12-166-30/+207
| |\ \ \ \
| * \ \ \ \ Merge branch 'master' of prism.r:stockholmjeschli2018-12-0456-1548/+854
| |\ \ \ \ \
| * | | | | | j emacs: add ag, rust-mode and emacs-as-daemonjeschli2018-11-021-1/+14
| * | | | | | j emacs: add newlinesjeschli2018-11-021-0/+2
| * | | | | | j emacs: modify go-modejeschli2018-11-021-0/+16
| * | | | | | j brauerei: remove commentsjeschli2018-11-021-4/+0
| * | | | | | j brauerei: add new aliasesjeschli2018-11-021-0/+5
| * | | | | | j refactor: remove commentsjeschli2018-11-021-1/+0
| * | | | | | Merge remote-tracking branch 'origin/master'jeschli2018-10-311-2/+20
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge remote-tracking branch 'origin/master'jeschli2018-10-2625-81/+638
| |\ \ \ \ \ \ \
| * | | | | | | | j emacs: add haskell-modejeschli2018-10-261-0/+1
| * | | | | | | | j brauerei: add christopher to dev userjeschli2018-10-261-0/+1
| * | | | | | | | j brauerei: enable dockerjeschli2018-10-261-0/+2
| * | | | | | | | j brauerei: add/cleanup systemPackagesjeschli2018-10-261-12/+16
| * | | | | | | | j brauerei: add and cleanup old shellAliasesjeschli2018-10-261-5/+10
| * | | | | | | | j emacs: load monokai-alt without askingjeschli2018-10-261-1/+1
| * | | | | | | | j emacs: shortcuts for global org link creationjeschli2018-10-261-0/+2
| * | | | | | | | j emacs: enable ido completionjeschli2018-10-261-0/+5