summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of prism.r:stockholmjeschli2018-03-2229-146/+342
|\
| * 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
| |\ \ \
| * | | | l websites fritz: simplify msmtprclassulus2018-03-181-2/+1
| * | | | l: use xlockmore as lockscreenlassulus2018-03-182-4/+2
| * | | | l: add caballassulus2018-03-183-0/+80
| * | | | l websites domsen: more domainslassulus2018-03-181-0/+2
| * | | | l security: use default kernellassulus2018-03-181-2/+0
| * | | | electron-cash: RIPlassulus2018-03-181-64/+0
| * | | | l mail: update pubkeylassulus2018-03-151-1/+1
| * | | | l mail: add more mailboxeslassulus2018-03-131-0/+2
| * | | | l: add c-base to msmtprclassulus2018-03-131-0/+10
| * | | | l: add allygator@lassul.us maillassulus2018-03-131-0/+1
| * | | | l mors.r: minimize deploy scriptlassulus2018-03-131-22/+2
| * | | | l helios.r: fix displayManager setuplassulus2018-03-131-1/+1
| * | | | l: make spf header more restrictivelassulus2018-03-131-1/+1
| * | | | buildbot-all: remove deploy test (currently broken)lassulus2018-03-131-1/+0
| | |_|/ | |/| |
* | | | 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
|\ \ \ \ | | |/ / | |/| |
| * | | Merge remote-tracking branch 'origin/master' into HEADjeschli2018-03-1323-115/+289
| |\| |
| | * | l xephyrify: add minimal xmonadlassulus2018-03-061-2/+35
| | * | Merge remote-tracking branch 'ni/master'lassulus2018-03-061-0/+1
| | |\ \
| | | * \ Merge remote-tracking branch 'prism/master'tv2018-02-2831-229/+245
| | | |\ \
| | * | \ \ Merge remote-tracking branch 'gum/master'lassulus2018-03-061-5/+45
| | |\ \ \ \ | | | | |_|/ | | | |/| |
| | | * | | ma owncloud: add cachingmakefu2018-02-281-5/+45
| | * | | | Merge remote-tracking branch 'prism/tv'lassulus2018-03-0614-66/+115
| | |\ \ \ \ | | | | |/ / | | | |/| |
| | | * | | tv gitrepos: add kopstv2018-02-281-0/+3