summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'prism/master'nin2018-01-3042-216/+717
|\
| * init ftblassulus2018-01-302-0/+55
| * Merge remote-tracking branch 'gum/master'lassulus2018-01-303-11/+7
| |\
| | * ma hw/stk1160: fix invalid kernel optionmakefu2018-01-281-1/+0
| | * ma cgit: disable irc hookmakefu2018-01-281-9/+0
| | * wolf.r: pin et0makefu2018-01-281-1/+7
| * | Merge remote-tracking branch 'prism/staging/jeschli'lassulus2018-01-302-89/+105
| |\ \
| | * | jeschli bolide: +j std configjeschli2018-01-281-88/+96
| | * | jeschli vim: +vim-elmjeschli2018-01-281-1/+9
| * | | l zsh: set as default shell for everyonelassulus2018-01-301-2/+1
| |/ /
| * / infest prepare: define _which on nixos_isolassulus2018-01-281-0/+3
| |/
| * Merge remote-tracking branch 'gum/master'lassulus2018-01-284-12/+42
| |\
| | * ma hw/stk1160: bump linux kernelmakefu2018-01-281-3/+2
| | * ma gum.r: add vpn pubkeys for work routermakefu2018-01-281-0/+16
| | * ma photostore.krebsco.de: enable sslmakefu2018-01-281-8/+10
| | * Revert "ma hw/stk1160: rip"makefu2018-01-282-4/+17
| * | l eddi.r: public ip changelassulus2018-01-261-1/+2
| * | source: enable overridelassulus2018-01-241-15/+18
| * | l nixpkgs: follow krebslassulus2018-01-241-4/+1
| * | nixpkgs: 0b30c1d -> b222a0lassulus2018-01-241-1/+1
| * | l mail: use attrSetslassulus2018-01-231-10/+10
| * | l mail: template with nixlassulus2018-01-231-16/+18
| * | Merge remote-tracking branch 'prism/staging/jeschli'lassulus2018-01-232-56/+99
| |\ \
| | * | jeschli brauerei: +aliasesjeschli2018-01-231-0/+7
| | * | j vim: refactoringjeschli2018-01-231-56/+92
| * | | l git: show diff of prism/masterlassulus2018-01-231-2/+2
| * | | krebs: disable CIlassulus2018-01-232-2/+0
| |/ /
| * | l zsh: use zsh in nix-shell & better promptlassulus2018-01-221-25/+39
| * | l nixpkgs: d9a2891 -> 5141f28lassulus2018-01-211-1/+1
| * | Merge branch 'master' of prism.i:stockholmjeschli2018-01-218-1/+87
| |\ \
| | * | l: set ssh agentTimeout to 10mlassulus2018-01-201-0/+1
| | * | l mors.r: use nixUnstablelassulus2018-01-201-1/+1
| | * | l radio: force play regularlylassulus2018-01-201-0/+1
| | * | Merge branch 'staging/jeschli' of prism.r:stockholmjeschli2018-01-192-0/+24
| | |\ \
| | | * | j bln: +virtualboxMarkus Hihn2018-01-192-0/+24
| | | * | Merge branch 'master' of prism.r:stockholmMarkus Hihn2018-01-174-39/+5
| | | |\ \
| | | * \ \ Merge branch 'master' of prism.r:stockholmMarkus Hihn2018-01-1611-35/+91
| | | |\ \ \
| | * | | | | jeschli: +IMjeschli2018-01-191-0/+56
| | * | | | | Merge branch 'master' of prism.r:stockholmjeschli2018-01-199-49/+41
| | |\ \ \ \ \
| | * \ \ \ \ \ Merge branch 'master' of prism.r:stockholmjeschli2018-01-1611-35/+91
| | |\ \ \ \ \ \ | | | |_|/ / / / | | |/| | / / / | | | | |/ / / | | | |/| | |
| | * | | | | jeschli: +irc aliasjeschli2018-01-121-0/+3
| | * | | | | jeschli enklave: import IMwjeschli2018-01-121-0/+1
| * | | | | | j: +bolidejeschli2018-01-214-0/+210
| | |_|/ / / | |/| | | |
| * | | | | l nixpkgs: 92d088e -> d9a2891lassulus2018-01-181-1/+1
| * | | | | l zsh: add fzflassulus2018-01-181-2/+5
| * | | | | l copyq: run as user servicelassulus2018-01-181-4/+3
| * | | | | l baseX: run xmonad as user servicelassulus2018-01-181-2/+27
| * | | | | l helios.r: remove broken systemctl startlassulus2018-01-181-1/+0
| | |_|/ / | |/| | |
| * | | | Merge remote-tracking branch 'ni/master'lassulus2018-01-162-36/+2
| |\ \ \ \
| | * | | | tv ju: RIPtv2018-01-161-34/+0