Commit Graph

5741 Commits

Author SHA1 Message Date
lassulus
dde9e711fc l prism.r: allow jeschli push to all branches 2018-01-16 00:03:55 +01:00
lassulus
291a3347e9 l: add minecraft.nix 2018-01-16 00:03:19 +01:00
lassulus
b713edf2f8 l daedalus.r: install some software 2018-01-16 00:01:23 +01:00
lassulus
4ae0254642 l: add lassul.us dns 2018-01-16 00:00:58 +01:00
jeschli
05b3e4b0cb jeschli: +irc alias 2018-01-12 12:03:01 +01:00
jeschli
d63de0f860 jeschli enklave: import IMw 2018-01-12 12:01:08 +01:00
nin
80c2e23ec0 Merge branch 'master' of prism:stockholm 2018-01-11 23:03:10 +01:00
lassulus
36833781d4 repo-sync: don't announce syncs in irc 2018-01-11 11:22:46 +01:00
lassulus
279ce3bbbc Merge remote-tracking branch 'prism/staging/jeschli' 2018-01-10 15:30:51 +01:00
lassulus
42e1d08836 Merge remote-tracking branch 'gum/master' 2018-01-10 15:30:45 +01:00
jeschli
94c785281a jeschli retiolum: connect to enklave 2018-01-10 15:10:56 +01:00
jeschli
547812c8ef jeschli: +enklave.r 2018-01-10 15:09:21 +01:00
jeschli
7c3e4260f2 jeschli: set default hostname 2018-01-10 15:07:04 +01:00
makefu
cc51c5f7db
ma photostore.krebsco.de: init on gum.r
also init the application server and config
2018-01-10 00:04:07 +01:00
makefu
4131fc8aca
Merge branch 'master' of http://cgit.ni/stockholm 2018-01-09 23:59:54 +01:00
makefu
44d12e0037
Merge branch 'master' of prism:stockholm 2018-01-09 23:59:43 +01:00
jeschli
794e4fe21b infest prepare: no subshell for _prepare* 2018-01-09 22:07:04 +01:00
jeschli
4c0e2b269f infest prepare: remove duplicated code 2018-01-09 22:06:16 +01:00
jeschli
f4a23ea078 infest prepare: add _which 2018-01-09 22:04:02 +01:00
lassulus
26c4dfbdfc infest prepare: add hetzner_rescue support 2018-01-09 21:40:39 +01:00
tv
813535d526 makefu collected-base: .retiolum -> .r 2018-01-09 19:13:02 +01:00
tv
4162239a16 makefu bepasty-dual: .retiolum -> .r 2018-01-09 19:11:45 +01:00
tv
b8838259b0 lass bepasty: .retiolum -> .r 2018-01-09 19:10:46 +01:00
tv
be33985efd makefu euer.wiki: .retiolum -> .r 2018-01-09 19:10:07 +01:00
tv
39f611a0d8 ircd: .retiolum -> .r 2018-01-09 19:09:15 +01:00
tv
33882a3c88 nin: .retiolum -> .r 2018-01-09 19:08:20 +01:00
tv
8ff5c5e992 Merge remote-tracking branch 'prism/master' 2018-01-09 19:06:50 +01:00
jeschli
f49137353e Merge branch 'master' of prism.r:stockholm 2018-01-09 18:31:15 +01:00
lassulus
5ef3a2c6ca l nixpkgs: 0653b73 -> d202e30 2018-01-09 18:03:28 +01:00
tv
fb0bbec70a mv nixpkgs: d0f0657 -> 0653b73 2018-01-09 14:43:51 +01:00
Markus Hihn
2b418e2c18 jeschli: meltdown fix 2018-01-09 11:16:43 +01:00
tv
bcfbd29360 tv: add SPF record 2018-01-09 05:28:54 +01:00
lassulus
99065dfd7a l nixpkgs: 0b30c1d -> 0653b73 2018-01-09 01:16:45 +01:00
makefu
05c6e0b86c
pkgs.internetarchive: remove fetchPypi, coming from python3Packages 2018-01-08 09:14:48 +01:00
lassulus
b8c561faad Merge remote-tracking branch 'prism/staging/jeschli' 2018-01-07 01:06:05 +01:00
makefu
17883f68dd
ma vbob.r: set route after network online 2018-01-06 23:44:03 +01:00
jeschli
1967d8b04f Merge branch 'master' of prism.r:stockholm 2018-01-06 21:36:32 +01:00
makefu
3aaab59b7f
Merge remote-tracking branch 'lass/master' 2018-01-06 21:27:05 +01:00
makefu
149aad4cb7
ma vbob.r: remove explicit route via systemd
does not work
2018-01-06 21:07:46 +01:00
makefu
de01eae264
ma vbob.r: add default routing through wireguard 2018-01-06 20:53:33 +01:00
makefu
9cf88110a6
ma omo.r: add nofail to disk 2018-01-06 20:51:58 +01:00
makefu
72d8ea37cc
ma gum.r: add vbob to wireguard 2018-01-06 20:51:32 +01:00
makefu
7b39418eb0
ma filepimp.r: add nofail to disks 2018-01-06 20:50:37 +01:00
makefu
9da4f1242a
pkgs.internetarchive: fix build 2018-01-06 20:49:58 +01:00
lassulus
acecab4292 l dns: use resolved 2018-01-06 01:50:51 +01:00
lassulus
99b3797151 l IM: add rxvt_unicode.terminfo 2018-01-06 01:50:16 +01:00
lassulus
65db6e7499 Merge remote-tracking branch 'gum/master' 2018-01-05 23:54:06 +01:00
makefu
7f8ec648b8
ma pkgs.gen-oath-safe: remove warning, add yubikey-manager 2018-01-05 23:12:22 +01:00
makefu
90b5b135d3
ma source: cherry-pick signal-desktop from unstable 2018-01-05 21:38:48 +01:00
jeschli
183b001e1a Merge branch 'master' of prism.r:stockholm 2018-01-05 21:14:15 +01:00