summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of prism:stockholmnin2018-02-1127-323/+497
|\
| * ftb: add java workaroundlassulus2018-02-111-0/+1
| |
| * Merge remote-tracking branch 'prism/staging/jeschli'lassulus2018-02-107-39/+214
| |\
| | * Merge branch 'master' of prism.r:stockholmjeschli2018-02-093-18/+5
| | |\
| | * | j vim.nix: remap tt to GoTestjeschli2018-02-091-0/+1
| | | |
| | * | j bln: +termitejeschli2018-02-081-0/+1
| | | |
| | * | j vim: +trailing White detection; *cosmeticsjeschli2018-02-071-1/+5
| | | |
| | * | j fontsize default 12; bln 20jeschli2018-01-312-32/+38
| | | |
| | * | j bln: +elmjeschli2018-01-311-0/+1
| | | |
| | * | j bln: +stockijeschli2018-01-311-6/+9
| | | |
| | * | j: +zshjeschli2018-01-312-0/+139
| | | |
| | * | j enklave +taskserverjeschli2018-01-312-0/+20
| | | |
| * | | Merge remote-tracking branch 'ni/master'lassulus2018-02-101-0/+64
| |\ \ \
| | * | | exim: init at 4.90.1tv2018-02-101-0/+64
| | | | |
| * | | | Merge remote-tracking branch 'gum/master'lassulus2018-02-1015-265/+213
| |\ \ \ \
| | * | | | ma source: bump to 2018-02-06makefu2018-02-061-1/+1
| | | | | |
| | * | | | ma 3/umts: ripmakefu2018-02-062-86/+0
| | | | | |
| | * | | | 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
| | |\ \ \ \ | | | | |/ / | | | |/| |
| | * | | | 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
| | | | | |
| * | | | | hw x220: remove broken tp-smapilassulus2018-02-101-1/+0
| | | | | |
| * | | | | nixpkgs: e18442d -> 2062ac5lassulus2018-02-101-1/+1
| | | | | |
| * | | | | nixpkgs: b34a5f6 -> e18442dlassulus2018-02-091-1/+1
| | |_|_|/ | |/| | |
| * | | | nixpkgs: b222a07 -> b34a5f6lassulus2018-02-091-1/+1
| | | | |
| * | | | ftb: minimizelassulus2018-02-061-17/+3
| | | | |
| * | | | go: open port 80lassulus2018-02-021-0/+1
| | |/ / | |/| |
* | | | 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
| | | | | | | | | | | | | | | | This reverts commit 1cbc2e5aa359e7e9b4b32c9ef75902576347a6d0.
| * | | l eddi.r: public ip changelassulus2018-01-261-1/+2
| | | |
| * | | source: enable overrideprism/staging/source-overridelassulus2018-01-241-15/+18
| | | |
| * | | l nixpkgs: follow krebslassulus2018-01-241-4/+1
| | | |