summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'enklave/master'lassulus2019-03-128-261/+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-2998-834/+1507
| |\
| * \ Merge branch 'master' of prism.r:stockholmjeschli2018-12-2850-263/+646
| |\ \
| * \ \ Merge branch 'master' of prism.r:stockholmjeschli2018-12-1693-1275/+1570
| |\ \ \
| * \ \ \ Merge branch 'master' of prism.r:stockholmjeschli2018-12-04196-3504/+3038
| |\ \ \ \
| * | | | | j xmonad-stockholm: commented develop srcjeschli2018-11-061-0/+1
| * | | | | Merge remote-tracking branch 'origin/master'jeschli2018-11-065-5/+477
| |\ \ \ \ \
| * | | | | | j reagenzglas: removejeschli2018-11-021-37/+0
| * | | | | | 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-314-3/+54
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge remote-tracking branch 'origin/master'jeschli2018-10-2682-354/+889
| |\ \ \ \ \ \ \
| * | | | | | | | 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
| * | | | | | | | jeschli: remove reagenzglasjeschli2018-10-092-178/+0
* | | | | | | | | Merge remote-tracking branch 'ni/master'lassulus2019-03-127-26/+15
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | external: add palo-pepe.pubkeytv2019-03-011-0/+3
| * | | | | | | | | Reaktor: 0.7.0 -> 0.7.1tv2019-02-171-2/+2
| * | | | | | | | | tv vim: map <f3> :ShowSyntaxtv2019-02-161-0/+2
| * | | | | | | | | tv vim: add xmodmaptv2019-02-161-0/+4
| * | | | | | | | | tv vim: add todoCommenttv2019-02-161-1/+2
| * | | | | | | | | Revert "tv: add deploy alias"tv2019-02-161-7/+0
| * | | | | | | | | lib.types.filename.check: remove unnecessary ()tv2019-02-161-1/+1
| * | | | | | | | | Revert "tv brscan4: init at 0.4.4-4"tv2019-02-161-8/+0
| * | | | | | | | | Revert "brscan4: init at 0.4.4-4"tv2019-02-162-9/+8
| * | | | | | | | | symlinkJoin: remove compatibilitytv2019-02-161-5/+0
| * | | | | | | | | flameshot-once: default filenamePattern w/o .pngtv2019-02-161-1/+1