summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'nomic/master'lassulus2015-10-094-15/+16
|\
| * known_hosts: GitHub is 192.30.252.0/22tv2015-10-091-7/+16
| * add github.com and its addrs4 to known_hoststv2015-10-094-15/+7
* | Merge remote-tracking branch 'pnp/master'lassulus2015-10-095-2/+530
|\ \
| * | 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-0916-23/+51
| |\ \
| | * | k 5 Reaktor: 0.4.3 -> 0.5.0makefu2015-10-091-2/+2
| * | | m 2 base-gui: override default configuration for awesomemakefu2015-10-092-0/+522
* | | | lass 5 go: remove unnecessary buildInputslassulus2015-10-091-2/+0
* | | | lass 2 ircd: fix import of ircd.nixlassulus2015-10-091-1/+2
* | | | lass 5 go: remove debug stufflassulus2015-10-092-3/+0
* | | | lass 1 echelon: import new stufflassulus2015-10-091-0/+3
* | | | lass 2: add go.nixlassulus2015-10-091-0/+16
* | | | lass 2 ircd: open port 6667 to retiolumlassulus2015-10-091-0/+3
* | | | lass 3: add go.nixlassulus2015-10-091-0/+61
* | | | lass 2: add redix.nixlassulus2015-10-091-0/+8
* | | | lass 2 ircd: change sid and hostnamelassulus2015-10-091-2/+2
* | | | lass 1 echelon: get hostName from build.host.namelassulus2015-10-091-1/+1
* | | | lass 2 git: add go repolassulus2015-10-091-0/+1
* | | | lass 5: add go url shortenerlassulus2015-10-094-0/+107
* | | | 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
* | | | lass 2: add skype.nixlassulus2015-10-082-0/+31
* | | | Merge remote-tracking branch 'pnp/master'lassulus2015-10-072-4/+2
|\| | |
| * | | makefu 3 tinc_graphs: actually start the timermakefu2015-10-071-3/+1
| * | | krebs 3 realwallpaper: actually start realwallpaper as timermakefu2015-10-071-1/+1
| * | | Merge remote-tracking branch 'cloudkrebs/master'makefu2015-10-0711-16/+19
| |\ \ \ | | |/ / | |/| |
* | | | Merge remote-tracking branch 'pnp/master'lassulus2015-10-076-0/+60
|\| | | | |/ / |/| |
| * | krebs 5 passwdqc-utils: init at 1.3.0makefu2015-10-062-0/+28
| * | makefu 2 cgit: primary git server is pnpmakefu2015-10-051-0/+1
| * | Merge remote-tracking branch 'cd/master'makefu2015-10-053-21/+30
| |\|
| * | makefu {1,2} Reaktor: add random-emoji plugin to Reaktor to pnp"makefu2015-10-053-0/+31
* | | krebs 3 lass: add ssh pubkeyslassulus2015-10-051-1/+9
* | | lass 2 git: make echelon main git hostlassulus2015-10-051-1/+1
* | | lass 1 echelon: activate gitlassulus2015-10-051-0/+1
* | | lass 2 realwallpaper: update due to file movelassulus2015-10-051-5/+1
* | | move realwallpaper to krebs 3lassulus2015-10-053-6/+4
* | | move realwallpaper to krebs 5lassulus2015-10-053-1/+1
* | | lass 2 desktop-base: add muchlassulus2015-10-051-2/+2
* | | 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
* | register krebsco.de internet aliasestv2015-10-051-0/+3
* | tv: cleanup internet-aliasestv2015-10-051-9/+2
* | register retiolum "internet" aliasestv2015-10-051-0/+6
* | postmaster@krebsco.de -> spam-mltv2015-10-052-3/+1
* | define spam-ml in krebs/3modulestv2015-10-052-8/+17
* | Merge remote-tracking branch 'pnp/master'tv2015-10-0414-251/+156
|\|
| * makefu 5 tinc_graphs: bump versionmakefu2015-10-040-0/+0