summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* l xephyrify: change ownership of socket if wantedlassulus2018-03-281-4/+11
* l xephyrify: handle resizelassulus2018-03-281-1/+14
* Revert "exim: krebs.setuid -> security.wrappers"lassulus2018-03-271-3/+9
* Merge remote-tracking branch 'ni/nixpkgs-18.03-fix-strip' into staging/18.03lassulus2018-03-279-109/+37
|\
| * writeC: use binutils-unwrappedtv2018-03-271-1/+1
| * haskellPackages.nix-diff: RIPtv2018-03-274-108/+0
| * tv xserver: systemPackages += font-sizetv2018-03-271-0/+1
| * tv pkgs: init font-sizetv2018-03-271-0/+26
| * tv xmonad: add passmenutv2018-03-261-0/+2
| * kops: init at 1.0.0tv2018-03-061-0/+7
* | Merge branch 'master' into staging/18.03lassulus2018-03-248-115/+139
|\ \
| * | j nixpkgs: follow krebsjeschli2018-03-241-4/+1
| * | j emacs: +go-mode -evil-modejeschli2018-03-241-1/+1
| * | j bolide: +emacsjeschli2018-03-241-0/+1
| * | j emacs: +orgMode +evil-orgjeschli2018-03-221-6/+15
| * | Merge branch 'master' of prism.r:stockholmjeschli2018-03-2229-146/+342
| |\ \
| * | | j emacs: cosmeticsjeschli2018-03-211-49/+54
| * | | j brauerei: *emacs with magitjeschli2018-03-201-1/+6
| * | | j brauerei: +emacsjeschli2018-03-201-0/+1
| * | | default.nix: add debug codetv2018-03-201-0/+17
| * | | j bln: hardware-configuration cosmeticsjeschli2018-03-201-3/+0
| * | | j: add my-emacsjeschli2018-03-202-0/+59
| * | | j bln: -VBOX certsjeschli2018-03-201-2/+0
| * | | jeschli bln: config cosmeticsjeschli2018-03-201-55/+20
| * | | bln: fix config againjeschli2018-03-201-2/+2
| * | | Merge branch 'staging/jeschli' of prism.r:stockholm into staging/jeschlijeschli2018-03-2096-764/+1483
| |\ \ \
| * | | | j: dirty merge againjeschli2018-03-204-73/+38
* | | | | exim: krebs.setuid -> security.wrapperslassulus2018-03-241-9/+3
* | | | | 0e7c9b3 -> 48856a9lassulus2018-03-241-1/+1
* | | | | nixpkgs: 2a32f6b -> 0e7c9b3lassulus2018-03-211-1/+1
* | | | | l privoxy: RIP polipolassulus2018-03-211-5/+0
* | | | | os-release: follow renamed moduleslassulus2018-03-211-2/+5
* | | | | nixpkgs: c5bc83b -> 2a32f6b (18.03)lassulus2018-03-211-1/+1
| |_|/ / |/| | |
* | | | nixpkgs: c5bc83b -> c665fcclassulus2018-03-181-1/+1
* | | | Merge remote-tracking branch 'gum/master'lassulus2018-03-1815-47/+238
|\ \ \ \
| * | | | ma awesome: make locker configurablemakefu2018-03-134-23/+25
| * | | | ma x.r: re-enable virtualboxmakefu2018-03-131-1/+1
| * | | | ma cgit-retiolum: make hydra-stockholm krebsrootmakefu2018-03-071-3/+10
| * | | | ma hass: init configmakefu2018-03-071-0/+75
| * | | | ma pkgs.mic92: init overlaymakefu2018-03-072-1/+13
| * | | | ma source: add mic92 as sourcemakefu2018-03-072-0/+10
| * | | | ma tp-x2x0: start charging at 95% againmakefu2018-03-071-1/+1
| * | | | ma x.r: switch audio on port changemakefu2018-03-071-0/+1
| * | | | ma pkgs.nodemcu-uploader: 0.2.2 -> 0.4.1makefu2018-03-071-8/+11
| * | | | ma pkgs.zj-58: initmakefu2018-03-072-0/+31
| * | | | Merge remote-tracking branch 'lass/master'makefu2018-03-0728-127/+326
| |\ \ \ \
| * | | | | ma source: bump nixpkgsmakefu2018-03-071-10/+20
| * | | | | ma pkgs.python-firetv: need to pin adbmakefu2018-03-051-9/+8
| * | | | | ma pkgs.python-firetv: initmakefu2018-03-051-0/+41
* | | | | | Merge remote-tracking branch 'prism/staging/jeschli'lassulus2018-03-180-0/+0
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | |