summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* l 2 base: nixpkgs 8d1ce12 -> 363c843lassulus2015-12-121-1/+1
* l 1 prism: activate websiteslassulus2015-12-121-0/+9
* l 1 mors: import stufflassulus2015-12-121-0/+3
* l 2: add websiteslassulus2015-12-122-0/+47
* l 3: add nginx site moduleslassulus2015-12-123-11/+319
* l 2: add libvirt.nixlassulus2015-12-121-0/+22
* l 2: add teamviewer.nixlassulus2015-12-121-0/+6
* l 1 prism: set timezone to Europe/Berlinlassulus2015-12-121-0/+3
* l 1 prism: add juiceSSH key for chatlassulus2015-12-121-0/+5
* l 2 base: remove video permission for gmlassulus2015-12-121-0/+2
* l 3: add fetchWallpaper.nixlassulus2015-12-122-0/+90
* m 2 Reaktor: finish sed-pluginmakefu2015-12-082-12/+30
* m 2 Reaktor: use sed-pluginmakefu2015-12-081-4/+14
* Merge branch 'master' of pnp:stockholmmakefu2015-12-082-1/+15
|\
| * m 1 pornocauster: use tinc_premakefu2015-12-041-0/+2
| * m 1 pornocauster: add printing,virtualboxmakefu2015-12-042-1/+13
* | m 2 Reaktor: init of sed-pluginmakefu2015-12-081-0/+43
* | Merge branch 'master' of pnp:stockholmmakefu2015-12-041-11/+13
|\|
| * s 2 drivedroid: update servicemakefu2015-12-041-11/+13
* | Merge branch 'master' of pnp:stockholmmakefu2015-12-0436-182/+1376
|\|
| * m 2 base-gui: add TODOmakefu2015-12-031-0/+11
| * m 2 default: do not restart ssh agentmakefu2015-12-031-0/+1
| * m 2 git: add mattermostmakefu2015-12-031-0/+4
| * m 1 gum: provides mattermost via docker containermakefu2015-11-273-2/+56
| * k 5 cacpanel: bump versionmakefu2015-11-271-2/+2
| * Merge remote-tracking branch 'cd/master'makefu2015-11-276-2/+92
| |\
| | * tv: UNIX domain socket based pulseaudio with XMonad controlstv2015-11-256-2/+92
| * | k 5 drivedroid-gen-repo: bump versionmakefu2015-11-251-2/+2
| * | k 5: cacpy -> cacpanelmakefu2015-11-232-20/+18
| * | Merge remote-tracking branch 'cloudkrebs/master'makefu2015-11-224-162/+1
| |\ \
| | * \ Merge remote-tracking branch 'pnp/master'lassulus2015-11-2120-56/+393
| | |\ \
| | * \ \ Merge remote-tracking branch 'cd/master'lassulus2015-11-2117-14/+1181
| | |\ \ \ | | | | |/ | | | |/|
| | * | | Merge remote-tracking branch 'cd/master'lassulus2015-11-1714-0/+1260
| | |\ \ \
| | * | | | l 3 dnsmasq: remove dead codelassulus2015-11-141-7/+0
| | * | | | k 3 l: bump echelon internet addrlassulus2015-11-141-1/+1
| | * | | | l 3: remove bitlbeelassulus2015-11-142-154/+0
| * | | | | Merge remote-tracking branch 'cd/master'makefu2015-11-2217-14/+1181
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
| | * | | | mv pkgs ff: don't sudotv2015-11-202-9/+5
| | * | | | krebs: add cgit.stro.retiolumtv2015-11-181-0/+1
| | * | | | mv: add stockholm repotv2015-11-182-0/+59
| | * | | | mv: s/tv/mv/tv2015-11-1810-8/+1119
| | * | | | krebs pkgs: s/retiolum/internet/tv2015-11-186-6/+6
| | | |/ / | | |/| |
| * | | | k 5 cacpy: init at 0.6.0makefu2015-11-221-0/+20
| * | | | Merge branch 'master' of pnp:stockholmmakefu2015-11-181-3/+27
| |\ \ \ \ | | | |_|/ | | |/| |
| * | | | Merge branch 'master' of http://cgit.cd/stockholmmakefu2015-11-171-0/+10
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | Zhosts: add strotv2015-11-171-0/+10
* | | | | k 3 tinc_graphs: add timeoutmakefu2015-12-031-1/+1
* | | | | m 1 gum: add bepastymakefu2015-12-031-0/+1
| |_|/ / |/| | |
* | | | unstable -> s 2 shack-drivedroidmakefu2015-11-181-3/+27
|/ / /
* | | Merge remote-tracking branch 'cd/master'makefu2015-11-1713-0/+1250
|\| |