summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | Merge remote-tracking branch 'pnp/master'lassulus2015-12-134-19/+49
|\| |
| * | m 5 awesomecfg: beautiful was loaded too latemakefu2015-12-131-13/+17
| * | m 2 fetchWallpaper: default enabled for mainlaptopmakefu2015-12-132-1/+28
| * | k 3 fetchWallpaper: change predicate handlingmakefu2015-12-131-5/+4
* | | l 5 xmonad: add binding for mute buttonslassulus2015-12-131-0/+2
|/ /
* | l 5 xmonad-lass: deactivate yeganesh, workspace0lassulus2015-12-121-3/+16
* | k 3 fetchWallpaper: default stateDir in /varlassulus2015-12-121-3/+4
* | l 3 fetchWallpaper -> k 3 fetchWallpaperlassulus2015-12-124-4/+4
* | l 2 xserver: remove xmobarlassulus2015-12-121-1/+0
* | l 2: add fetchWallpaper.nixlassulus2015-12-121-0/+11
* | l 2 elster: use chromium packagelassulus2015-12-121-0/+3
* | l 2 browsers: activate flash browserlassulus2015-12-121-1/+1
* | l 2 browsers: use writeScriptBinlassulus2015-12-121-15/+5
* | 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
| |\ \ \ \ \ | | | |_|/ / | | |/| | |