summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'prism/staging/jeschli'lassulus2018-09-045-1/+16
|\
| * j steam: remove dead codejeschli2018-09-041-10/+0
| * j enklave: +cgitjeschli2018-09-043-1/+3
| * Merge remote-tracking branch 'origin/master'jeschli2018-08-2151-413/+500
| |\
| * \ Merge remote-tracking branch 'origin/staging/jeschli'jeschli2018-08-212-1/+7
| |\ \
| * | | j brauerei: +steamjeschli2018-08-212-0/+23
* | | | l: rekey, rename borg.r -> rock.r (Mic92)lassulus2018-09-021-16/+15
* | | | nixpkgs: 4df3426 -> a37638dlassulus2018-09-011-3/+3
* | | | add dummy_secret for konsenslassulus2018-08-291-0/+0
* | | | buildbot-standalone: check cgit.hotdog.rlassulus2018-08-291-1/+1
* | | | repo-sync: add konsens for krops & stockholmlassulus2018-08-291-1/+25
* | | | add konsens modulelassulus2018-08-292-0/+81
* | | | l: rip dishfire.rlassulus2018-08-294-138/+0
* | | | repo-sync: remove staging branches, stylelassulus2018-08-251-22/+7
* | | | hotdog.r: repo-sync all the reposlassulus2018-08-242-26/+122
* | | | l: add some mailslassulus2018-08-231-0/+2
* | | | l prism.r: add palos pubkeyslassulus2018-08-231-0/+2
* | | | l daedalus.r: firefox -> chromiumlassulus2018-08-231-1/+2
* | | | l: update lass-android keyslassulus2018-08-232-2/+2
* | | | l helios.r: get rid of nearly everythinglassulus2018-08-231-42/+1
* | | | 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