summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* m 3 tinc_graphs: merge instead of override nginx configmakefu2015-10-211-5/+6
* m 2 unstable-sources: sources to unstable nixpkgsmakefu2015-10-211-0/+19
* m 3 tinc_graphs: new api for nginxmakefu2015-10-211-21/+30
* m 3 bepasty-server: fix escapemakefu2015-10-211-3/+3
* m 2 mail: remove client packages from server configmakefu2015-10-211-4/+0
* m 3 bepasty-server.nix: initmakefu2015-10-201-0/+160
* m 2 mail: split exim-retiolummakefu2015-10-202-0/+13
* m 1,2 : wry serves as iodine entry pointmakefu2015-10-193-4/+22
* m 1 wry: host is the new provider for tinc.krebsco.demakefu2015-10-191-1/+5
* m 1 wry: start Reaktormakefu2015-10-191-13/+19
* m 2 cgit: add tinc_graphs repomakefu2015-10-191-0/+3
* m 3,5 tinc_graphs: use new tinc_graphsmakefu2015-10-172-4/+7
* Merge remote-tracking branch 'cd/master'lassulus2015-10-170-0/+0
|\
| * Merge remote-tracking branches 'pnp/master' and 'mors/master'tv2015-10-170-0/+0
| |\
* | | Merge remote-tracking branch 'pnp/master'lassulus2015-10-172-25/+9
|\| | | |/ |/|
| * m 2 fs/root-home: fix root labelmakefu2015-10-171-5/+6
| * m 2 fs/sda-crypto-root-home: resolve TODO, import crypto-root, add devicemakefu2015-10-161-19/+4
| * Merge remote-tracking branch 'cd/master'makefu2015-10-150-0/+0
| |\
| * | m 2 base: make vim default editormakefu2015-10-151-3/+1
* | | Merge remote-tracking branch 'pnp/master'lassulus2015-10-156-483/+25
|\| | | |/ |/|
| * m 2 base-gui: apparently overwriting important stuff breaks other shitmakefu2015-10-141-1/+1
| * m 2 user: fix accidental inclusion of awesome configmakefu2015-10-141-479/+0
| * Merge remote-tracking branch 'cd/master'makefu2015-10-140-0/+0
| |\
| * | m 1 pornocauster: ignore lidswitch, configure additional sink for pulsemakefu2015-10-141-1/+7
| * | m 2 base-gui: also install pavuctlmakefu2015-10-141-0/+1
| * | m 2 vim: edit bin via xxdmakefu2015-10-101-0/+13
| * | m 2 git/brain: optional -> singletonmakefu2015-10-101-1/+1
| * | m 2 sources: 15.09 is new nixpkgs head for all my hostsmakefu2015-10-101-1/+2
* | | Merge remote-tracking branch 'pnp/master'lassulus2015-10-094-0/+528
|\| | | |/ |/|
| * m 5 awesomecfg: fix pathmakefu2015-10-091-1/+1
| * m 2 awesomecfg -> m 5 awesomecfgmakefu2015-10-094-2/+8
| * Merge branch 'master' of pnp:stockholmmakefu2015-10-094-4/+29
| |\
| * | m 2 base-gui: override default configuration for awesomemakefu2015-10-092-0/+522
* | | Merge remote-tracking branch 'pnp/master'lassulus2015-10-083-1/+28
|\ \ \ | | |/ | |/|
| * | m 2 Reaktor: add shack-correct, update pnp Reaktor Channelsmakefu2015-10-083-1/+28
* | | Merge remote-tracking branch 'pnp/master'lassulus2015-10-071-3/+1
|\| |
| * | makefu 3 tinc_graphs: actually start the timermakefu2015-10-071-3/+1
| * | Merge remote-tracking branch 'cloudkrebs/master'makefu2015-10-070-0/+0
| |\ \ | | |/ | |/|
* | | Merge remote-tracking branch 'pnp/master'lassulus2015-10-074-0/+32
|\| | | |/ |/|
| * makefu 2 cgit: primary git server is pnpmakefu2015-10-051-0/+1
| * Merge remote-tracking branch 'cd/master'makefu2015-10-050-0/+0
| |\
| * | makefu {1,2} Reaktor: add random-emoji plugin to Reaktor to pnp"makefu2015-10-053-0/+31
* | | Merge remote-tracking branch 'pnp/master'lassulus2015-10-054-11/+24
|\| | | |/ |/|
| * m {3,5} tinc_graphs: make everyting work, finalmakefu2015-10-043-10/+23
| * m 1 p: add get system pkgmakefu2015-10-041-1/+1
* | Merge remote-tracking branch 'pnp/master'tv2015-10-045-23/+144
|\|
| * configure graphs for wrymakefu2015-10-041-2/+10
| * m 3 tinc_graphs: make first working versionmakefu2015-10-041-13/+56
| * m 5 tinc_graphs: fix path for tinc callermakefu2015-10-041-2/+4
| * makefu 5 tinc_graphs: bump versionmakefu2015-10-042-2/+2
[cgit] Unable to lock slot /tmp/cgit/16300000.lock: No such file or directory (2)