summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* ma bluetooth-mpd: remove obsolete commentsmakefu2018-03-181-6/+0
* ma bluetooth-mpd: make abstractmakefu2018-03-183-61/+82
* 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
|\
| * 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
| |\ \ \
| * \ \ \ Merge remote-tracking branch 'prism/tv'prism/staging/tvlassulus2018-03-0614-66/+115
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | tv gitrepos: add kopstv2018-02-281-0/+3
| | * | | urlwatch: 2.7 -> 2.8tv2018-02-281-2/+2
| | * | | os-release: use <stockholm-version>tv2018-02-289-3/+47
| | * | | populate: 2.1.0 -> 2.3.0tv2018-02-282-2/+17
| | * | | types: refactor sourcetv2018-02-282-60/+48
| * | | | l mail: add more mailboxeslassulus2018-03-031-4/+30
| * | | | l: add more mailslassulus2018-03-031-1/+9
| * | | | l: add xephyrifylassulus2018-03-032-1/+10
| * | | | l: turn pkgs into overlayprism/staging/pkgslassulus2018-03-034-37/+45
| * | | | l deploy: don't run --difflassulus2018-03-031-1/+1
| | |_|/ | |/| |
| * | | Merge remote-tracking branch 'gum/master'lassulus2018-02-282-1/+1
| |\ \ \
| * \ \ \ Merge remote-tracking branch 'gum/master'lassulus2018-02-2811-192/+50
| |\ \ \ \
| * \ \ \ \ Merge remote-tracking branch 'prism/staging/jeschli'lassulus2018-02-281-0/+2
| |\ \ \ \ \
| | * \ \ \ \ Merge branch 'master' of prism.r:stockholm into staging/jeschlijeschli2018-02-277-19/+55
| | |\ \ \ \ \
| | * \ \ \ \ \ Merge branch 'master' of prism.r:stockholm into staging/jeschlijeschli2018-02-2515-14/+150
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ Merge branch 'master' of prism.r:stockholm into staging/jeschlijeschli2018-02-1844-369/+686
| | |\ \ \ \ \ \ \
| | * | | | | | | | brauerei: +backlightjeschli2018-02-181-0/+2
| * | | | | | | | | Merge remote-tracking branch 'onondaga/master'prism/staging/ninlassulus2018-02-271-0/+19
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | nin im: copy irc script from tvnin2018-02-271-0/+19
| * | | | | | | | | | Merge remote-tracking branch 'onondaga/master'lassulus2018-02-274-15/+25
| |\| | | | | | | | |
| | * | | | | | | | | nin git: remove irc announcenin2018-02-271-11/+0
| | * | | | | | | | | nin: follow krebs nixpkgsnin2018-02-271-4/+1
| | * | | | | | | | | Merge remote-tracking branch 'prism/master'nin2018-02-2745-195/+672
| | |\ \ \ \ \ \ \ \ \ | | | | |_|_|/ / / / / | | | |/| | | | | | |
| | * | | | | | | | | Merge branch 'master' of prism:stockholmnin2018-02-1127-323/+497
| | |\ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'prism/master'nin2018-01-3042-216/+717
| | |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of prism:stockholmnin2018-01-1159-151/+577
| | |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | nin axon: add abletonnin2018-01-032-0/+24
| | * | | | | | | | | | | | Merge branch 'master' of prism:stockholmnin2018-01-032-0/+21
| | |\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | nixpkgs: d09e425 -> c5bc83blassulus2018-02-271-1/+1
| | |_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | Merge remote-tracking branch 'gum/master'lassulus2018-02-266-14/+42
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | l mail: add more mailboxeslassulus2018-02-251-2/+5
| * | | | | | | | | | | | | | l mail: use tags for mailboxeslassulus2018-02-251-3/+8
| | |_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | |