summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | Merge remote-tracking branch 'prism/master'lassulus2018-08-2312-260/+19
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | xmonad-stockholm: 1.1.1 -> 1.2.0lassulus2018-08-141-2/+2
| * | | | | l xmonad: use bitmap fontprism/dcsolassulus2018-08-141-1/+1
| * | | | | l urxvt: use configured font as defaultlassulus2018-08-141-3/+3
| * | | | | xmonad-stockholm: add X11-xft dependencylassulus2018-08-141-2/+2
| * | | | | l baseX: cleanuplassulus2018-08-141-10/+0
| * | | | | l: split print stuff into print.nixlassulus2018-08-143-8/+11
| * | | | | RIP helios.rlassulus2018-08-136-234/+0
* | | | | | automate nixpkgs updatelassulus2018-08-223-1/+17
* | | | | | nixpkgs: d0c868e -> 42c07dlassulus2018-08-111-1/+1
|/ / / / /
* | | | | Merge remote-tracking branch 'gum/master'lassulus2018-08-105-58/+175
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | ma source: bumpmakefu2018-08-101-2/+1
| * | | | ma hass: rewritemakefu2018-08-104-56/+174
* | | | | Merge remote-tracking branch 'gum/master'lassulus2018-08-0922-52/+202
|\| | | |
| * | | | ma events-publisher: initmakefu2018-08-081-0/+48
| * | | | ma nextgum.r: add events-publishermakefu2018-08-081-0/+1
| * | | | ma pkgs.awesomecfg.full: start networkmanager,blueman-applet,clipitmakefu2018-08-062-3/+18
| * | | | ma torrent: use base-dir instead of torrent-dirmakefu2018-08-061-7/+11
| * | | | ma hw/network-manager: enable wifi-options and remove sessionCommandsmakefu2018-08-061-10/+4
| * | | | ma hw/mceusb: use boot.kernelPatchesmakefu2018-08-061-8/+7
| * | | | ma hw/stk1160: fix TODOmakefu2018-08-061-9/+8
| * | | | ma x.r: use nurmakefu2018-08-061-2/+5
| * | | | ma wbob.r: collect more statsmakefu2018-08-061-3/+7
| * | | | ma nextgum/hardware-config: add new logical devicesmakefu2018-08-062-2/+14
| * | | | k rtorrent: use directory.watch instead of schedulemakefu2018-08-061-1/+1
| * | | | nextgum.r: add extra hosts cache.gum, goldmakefu2018-08-061-1/+8
| * | | | ma binary-cache/server: initmakefu2018-08-061-0/+31
| * | | | ma gold.krebsco.de: init configmakefu2018-08-061-0/+24
| * | | | ma nur: initmakefu2018-08-061-0/+7
| * | | | ma tools: s/krebs.per-user/users.users/makefu2018-08-066-6/+8
* | | | | genid_signed -> genid_uint31prism/genidlassulus2018-08-095-13/+13
* | | | | Revert "krebs git: refactor"lassulus2018-08-041-24/+36
* | | | | nixpkgs: d6c6c7f -> d0c868elassulus2018-08-041-1/+1
* | | | | Merge remote-tracking branch 'prism/staging/jeschli'lassulus2018-08-044-37/+32
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | Merge remote-tracking branch 'origin/staging/jeschli'jeschli2018-08-014-50/+32
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | krebs git: refactorjeschli2018-08-011-36/+24
| | * | | j emacs: activate evilModejeschli2018-08-011-0/+1
| * | | | j xserver: removed dpi; modified urxvt font-sizejeschli2018-08-011-2/+2
| * | | | j bln: +pair programming eth linkjeschli2018-08-011-0/+5
* | | | | news: kill some broken feedslassulus2018-08-041-4/+0
* | | | | Merge remote-tracking branch 'prism/staging/jeschli'lassulus2018-07-316-21/+44
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Merge remote-tracking branch 'origin/staging/jeschli'jeschli2018-07-313-6/+37
| |\| | |
| | * | | j: +officevpn by luisjeschli2018-07-311-0/+19
| | * | | Merge remote-tracking branch 'origin/staging/jeschli'jeschli2018-07-3120-52/+101
| | |\ \ \
| | * | | | j my-emacs: cooler feel for org-modejeschli2018-07-311-6/+14
| | * | | | j bln: new office vpnjeschli2018-07-311-0/+4
| | * | | | Merge remote-tracking branch 'origin/master'jeschli2018-07-093-10/+18
| | |\ \ \ \
| * | | | | | j xserver: remove xft.dpi optionjeschli2018-07-311-1/+0
| * | | | | | j brauerei: enable pulseaudiojeschli2018-07-311-0/+1
| * | | | | | j brauerei: add audio group for jeschlijeschli2018-07-311-1/+1