summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* ma x.r: disable makefu.umts, cleanupmakefu2018-02-061-5/+8
* ma gui/base: set packages only for mainusermakefu2018-02-061-7/+8
* ma omo.r: init google-muellmakefu2018-02-064-20/+64
* ma wvdial: ripmakefu2018-02-064-80/+39
* Merge branch 'master' of prism:stockholmmakefu2018-01-306-91/+164
|\
| * init ftblassulus2018-01-302-0/+55
| * Merge remote-tracking branch 'gum/master'lassulus2018-01-303-11/+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
* | | ma pkgs.pfsshell: initmakefu2018-01-301-0/+27
* | | ma wbob.r: enable mpd via bluetoothmakefu2018-01-291-64/+62
* | | ma wbob-kiosk: provide chromiummakefu2018-01-291-2/+4
| |/ |/|
* | 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 '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
| |_|/ / / |/| | | |