Commit Graph

6509 Commits

Author SHA1 Message Date
Markus Hihn
bdd7a76f4d Merge branch 'master' of prism.r:stockholm 2018-01-17 17:29:29 +01:00
lassulus
661eae8fc8 Merge remote-tracking branch 'ni/master' 2018-01-16 21:28:37 +01:00
lassulus
6c7210cd10 reaktor-plugins url-title: don't strip youtube 2018-01-16 21:24:15 +01:00
tv
7ec791bafe tv ju: RIP 2018-01-16 21:05:36 +01:00
lassulus
7c613786d1 l git: don't show verbose git log 2018-01-16 21:02:43 +01:00
tv
cc4e5322ae Merge remote-tracking branch 'prism/master' 2018-01-16 20:19:27 +01:00
tv
1c06f938b3 tv vim: mkdirs -> need-dirs 2018-01-16 19:24:42 +01:00
jeschli
595b5de0bd Merge branch 'master' of prism.r:stockholm 2018-01-16 19:15:31 +01:00
Markus Hihn
1062100c78 Merge branch 'master' of prism.r:stockholm 2018-01-16 14:46:23 +01:00
lassulus
74d1531be9 l nixpkgs: d202e30 -> 92d088e 2018-01-16 09:24:44 +01:00
lassulus
a3751cdb47 l zsh: cleanup 2018-01-16 00:09:46 +01:00
lassulus
b49137cac3 l: add more emails 2018-01-16 00:08:55 +01:00
lassulus
dd03ce2e9e l: add zsh 2018-01-16 00:08:01 +01:00
lassulus
59f3f4257d l browsers: add fin 2018-01-16 00:07:29 +01:00
lassulus
c23738db37 l browsers: preconfigure chromium 2018-01-16 00:07:08 +01:00
lassulus
0b4ce58786 l browsers: use precedence 2018-01-16 00:06:52 +01:00
lassulus
07ba3cde29 l: add taskwarrior to pkgs 2018-01-16 00:06:04 +01:00
lassulus
80e7b1254f l prism.r: add downloading (again) 2018-01-16 00:04:56 +01:00
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