Commit Graph

6479 Commits

Author SHA1 Message Date
makefu
65cc52e01e Merge branch 'master' of pnp:stockholm
Conflicts:
	makefu/1systems/gum.nix
2015-12-04 10:16:09 +01:00
makefu
597f9e8597 k 3 tinc_graphs: add timeout 2015-12-03 20:39:29 +01:00
makefu
0b76b1081e m 1 gum: add bepasty 2015-12-03 20:39:01 +01:00
makefu
b5ffb88ba3 m 2 base-gui: add TODO 2015-12-03 20:37:04 +01:00
makefu
ada1aa277c m 2 default: do not restart ssh agent 2015-12-03 20:36:42 +01:00
makefu
61d9ec179b m 2 git: add mattermost 2015-12-03 20:36:09 +01:00
makefu
c7bb244bdf m 1 gum: provides mattermost via docker container 2015-11-27 23:10:44 +01:00
makefu
c7568df0e2 k 5 cacpanel: bump version 2015-11-27 23:10:05 +01:00
makefu
74ebb5b01c Merge remote-tracking branch 'cd/master' 2015-11-27 21:44:47 +01:00
makefu
4234745645 k 5 drivedroid-gen-repo: bump version 2015-11-25 22:00:54 +01:00
tv
d0913afc37 tv: UNIX domain socket based pulseaudio with XMonad controls 2015-11-25 01:51:35 +01:00
makefu
f12ded12c6 k 5: cacpy -> cacpanel 2015-11-23 07:53:42 +01:00
makefu
c8a920c6d9 Merge remote-tracking branch 'cloudkrebs/master' 2015-11-22 13:23:11 +01:00
makefu
c2885e2491 Merge remote-tracking branch 'cd/master' 2015-11-22 13:22:57 +01:00
makefu
e28930340b k 5 cacpy: init at 0.6.0 2015-11-22 13:22:30 +01:00
lassulus
f531e7e625 Merge remote-tracking branch 'pnp/master' 2015-11-21 14:25:02 +01:00
lassulus
a020268317 Merge remote-tracking branch 'cd/master' 2015-11-21 14:24:46 +01:00
tv
2650803ff6 mv pkgs ff: don't sudo 2015-11-20 16:59:15 +01:00
makefu
8bff399f0d Merge branch 'master' of pnp:stockholm 2015-11-18 14:11:22 +01:00
makefu
a8d0078683 unstable -> s 2 shack-drivedroid 2015-11-18 14:05:54 +01:00
tv
817a78c711 krebs: add cgit.stro.retiolum 2015-11-18 01:20:17 +01:00
tv
a1e1de3df0 mv: add stockholm repo 2015-11-18 00:57:47 +01:00
tv
7d66721687 mv: s/tv/mv/ 2015-11-18 00:28:24 +01:00
tv
3a34a2e0b0 krebs pkgs: s/retiolum/internet/ 2015-11-18 00:27:07 +01:00
lassulus
718c672e7c Merge remote-tracking branch 'cd/master' 2015-11-17 23:22:02 +01:00
makefu
a207bfd482 Merge branch 'master' of http://cgit.cd/stockholm 2015-11-17 23:20:59 +01:00
tv
63da8c4f6a Zhosts: add stro 2015-11-17 23:19:59 +01:00
makefu
84743dcd4a Merge remote-tracking branch 'cd/master' 2015-11-17 23:14:28 +01:00
makefu
e4c46c2ec2 shared 1 wolf: add self to binaryCache 2015-11-17 23:13:09 +01:00
makefu
7e4eefa91b s 2 drivedroid: fix syntax error 2015-11-17 23:11:55 +01:00
makefu
0f54a195b7 acng: also add nar files to cache 2015-11-17 23:11:29 +01:00
makefu
a3e074094b k 3 apt-cacher-ng: add CAfile 2015-11-17 23:03:21 +01:00
makefu
b8dea556e9 k 3 shared: shack ip was already in use 2015-11-17 22:26:11 +01:00
makefu
9e2ac199d5 k 5 drivedroid-gen-repo: init at 0.4.2 2015-11-17 22:18:32 +01:00
makefu
b2ac9b092a makefu: fix cgit for wry, add gc to wry 2015-11-17 22:16:55 +01:00
makefu
7346527c4f pubkeys: add exco 2015-11-17 22:15:31 +01:00
makefu
5aed0a395b shared wolf: static ip, fix todo 2015-11-17 22:15:07 +01:00
tv
dba0db28d9 mv: init 2015-11-17 19:04:32 +01:00
makefu
a4ab19181b shared 2 base: add makefu_omo to allowed pubkeys 2015-11-17 13:57:43 +01:00
makefu
4fec1920fb m 2 git: fix library and irc hooks 2015-11-17 13:55:30 +01:00
makefu
b69dcc6086 m 1 gum: add ssh repo 2015-11-17 13:54:55 +01:00
makefu
5a450ad787 apt-cacher-ng is imported by krebs modules 2015-11-17 13:49:29 +01:00
makefu
4c26fb9383 k 3 apt-cacher-ng: fix whitespace 2015-11-17 13:29:56 +01:00
makefu
48c9789141 apt-cacher-ng: init package and module
once apt-cacher-ng arrives in nixos stable it will be removed from stockholm
2015-11-17 12:16:51 +01:00
makefu
dcf55255e6 Merge branch 'master' of pnp:stockholm 2015-11-15 20:18:35 +01:00
lassulus
ff3dc90d1c l 3 dnsmasq: remove dead code 2015-11-14 17:54:45 +01:00
lassulus
d0a573c4c5 k 3 l: bump echelon internet addr 2015-11-14 17:54:08 +01:00
lassulus
452f8d8e23 l 3: remove bitlbee 2015-11-14 14:11:38 +01:00
makefu
773a67a983 Merge remote-tracking branch 'cloudkrebs/master' into pre-merge 2015-11-14 01:51:36 +01:00
makefu
a0fbe917ac Merge remote-tracking branch 'cd/master' into pre-merge 2015-11-14 01:50:39 +01:00