summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'lass/master'makefu2019-01-217-18/+127
|\
| * Mic92: change mail addresslassulus2019-01-211-1/+1
| * external: add idontcare.rlassulus2019-01-211-0/+23
| * Merge remote-tracking branch 'ni/master'lassulus2019-01-2113-170/+294
| |\
| | * reaktor2 service: inittv2019-01-211-0/+63
| | * reaktor2: init at 0.0.0tv2019-01-212-0/+25
| | * krebs hosts: extraHost -> hoststv2019-01-211-13/+12
| * | Merge remote-tracking branch 'gum/master'lassulus2019-01-217-8/+21
| |\ \
| * | | l games: remove broken ftb packagelassulus2019-01-181-1/+0
| * | | nixpkgs: 0396345 -> 97e0d53lassulus2019-01-181-3/+3
| * | | Merge remote-tracking branch 'ni/master'lassulus2019-01-1615-44/+67
| |\ \ \
* | \ \ \ Merge branch 'master' of http://cgit.ni/stockholmmakefu2019-01-2110-170/+207
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | krebs: move hosts to dedeicated filetv2019-01-213-25/+38
| * | | | krebs: move retiolum-hosts to dedicated filetv2019-01-212-23/+29
| * | | | krebs: move dns stuff to dedicated filetv2019-01-214-20/+20
| * | | | krebs: move exim aliases to dedicated filetv2019-01-212-45/+50
| * | | | krebs: move github known hosts to dedicated filetv2019-01-212-25/+41
| * | | | blessings: 1.2.0 -> 1.3.0tv2019-01-181-2/+2
| * | | | tv q-todo: highlight urgent stufftv2019-01-161-1/+5
| * | | | tv q-todo: awk,bash,cat,date -> jqtv2019-01-161-20/+13
| * | | | tv q: add sigilstv2019-01-161-12/+12
* | | | | ma 2default: extra pathsToLinkmakefu2019-01-211-1/+1
* | | | | Merge remote-tracking branch 'tv/master'makefu2019-01-1623-101/+121
|\| | | |
| * | | | Merge remote-tracking branch 'prism/master'tv2019-01-1653-567/+882
| |\| | | | | |/ / | |/| |
| | * | Reaktor plugins: merge task with todo, make task like todolassulus2019-01-103-55/+25
| | * | l websites lassulus: add mors pubkey locationlassulus2019-01-041-0/+3
| | * | l mail: more list sortinglassulus2019-01-041-1/+1
| | * | l gc: garbage collect on prismlassulus2019-01-041-1/+1
| | * | l prism: mount libvirt dir on tank zfslassulus2019-01-041-0/+5
| | * | l: enable o.xanf.org nextcloudlassulus2019-01-042-0/+19
| | * | Merge remote-tracking branch 'gum/master'lassulus2019-01-039-84/+197
| | |\ \
| * | | | krebs tinc: Broadcast = notv2019-01-161-0/+1
| * | | | tv gitrepos: add reaktor2tv2019-01-131-0/+1
| * | | | tv gitrepos: add Reaktortv2019-01-131-0/+1
| * | | | tv xmodmap: add δtv2019-01-131-0/+1
| * | | | tv htop: header_margin=0tv2019-01-081-1/+1
| * | | | tv xu: add xkiller servicetv2019-01-071-0/+1
| * | | | tv xkiller service: inittv2019-01-071-0/+14
| * | | | tv xkiller: inittv2019-01-071-0/+25
| * | | | tv slock service: support multiple displaystv2019-01-071-9/+11
| * | | | per-user module: enable only if configuredtv2019-01-051-1/+1
| * | | | tv dhcpcd: set saner dbdirtv2018-12-291-0/+6
| * | | | tv ejabberd: move home to /var/libtv2018-12-292-3/+3
| * | | | tv nixpkgs-overlays: RIPtv2018-12-294-30/+0
| * | | | tv gitrepos: with-sshtv2018-12-281-0/+1
* | | | | ma cake.r: remove hack to get wifi workingmakefu2019-01-132-38/+29
| |_|_|/ |/| | |
* | | | external: new ip for evemakefu2019-01-111-2/+2
* | | | ma nixpkgs: eebd1a9263 -> 1258730 ... i am stupidmakefu2019-01-111-3/+3
* | | | ma pkgs.quodlibet: disable tests for nowmakefu2019-01-111-0/+1
* | | | Merge branch 'master' of gum.krebsco.de:stockholmmakefu2019-01-110-0/+0
|\ \ \ \ | | |_|/ | |/| |