Commit Graph

6779 Commits

Author SHA1 Message Date
jeschli
a7e49dd5fc Merge branch 'staging/jeschli' of prism.i:stockholm into staging/jeschli 2018-02-28 20:10:42 +00:00
jeschli
4a2af184e6 j vim: unsure changes 2018-02-28 19:54:11 +00:00
tv
877b410437 urlwatch: 2.7 -> 2.8 2018-02-28 15:15:58 +01:00
tv
67969d72e1 os-release: use <stockholm-version> 2018-02-28 15:15:58 +01:00
tv
dd4fac0fa4 populate: 2.1.0 -> 2.3.0 2018-02-28 15:15:58 +01:00
tv
3ac7941968 types: refactor source 2018-02-28 15:15:58 +01:00
lassulus
793742b9d1 Merge remote-tracking branch 'gum/master' 2018-02-28 09:34:34 +01:00
makefu
cf2d31899e
.gitignore: add result 2018-02-28 09:13:13 +01:00
lassulus
2944eae45a Merge remote-tracking branch 'gum/master' 2018-02-28 09:06:03 +01:00
lassulus
ec798442e7 Merge remote-tracking branch 'prism/staging/jeschli' 2018-02-28 09:05:55 +01:00
lassulus
4d35757348 Merge remote-tracking branch 'onondaga/master' 2018-02-27 22:40:24 +01:00
lassulus
8e73dd86b4 Merge remote-tracking branch 'onondaga/master' 2018-02-27 22:39:54 +01:00
nin
3bed8beabf nin im: copy irc script from tv 2018-02-27 22:39:08 +01:00
nin
10ad102e7a nin git: remove irc announce 2018-02-27 22:34:32 +01:00
nin
009c64eb37 nin: follow krebs nixpkgs 2018-02-27 22:31:43 +01:00
nin
01289f3331 Merge remote-tracking branch 'prism/master' 2018-02-27 22:30:49 +01:00
jeschli
4c0d0f64ed Merge branch 'master' of prism.r:stockholm into staging/jeschli 2018-02-27 20:41:20 +01:00
lassulus
ae2055f008 nixpkgs: d09e425 -> c5bc83b 2018-02-27 20:12:02 +01:00
makefu
a35ac200ae
ma pkgs.qcma: fix broken build 2018-02-27 01:53:10 +01:00
makefu
56eb983946
ma pkgs.mcomix: disable tests 2018-02-27 01:28:56 +01:00
makefu
1f1bc3f220
ma pkgs.dionaea: rip 2018-02-27 01:24:40 +01:00
makefu
3fcd396a6b
ma pkgs.farpd: rip 2018-02-27 01:09:24 +01:00
makefu
aa919a7797
ma pkgs: cleanup awesomecfg, custom, shackie 2018-02-27 00:08:43 +01:00
makefu
02a53c3b9e
ma pkgs.opl-utils: remove license for now 2018-02-26 23:22:34 +01:00
lassulus
9e67031cb8 Merge remote-tracking branch 'gum/master' 2018-02-26 22:08:39 +01:00
makefu
99d4464e6c
ma git: init hydra-stockholm 2018-02-26 22:03:59 +01:00
makefu
b0edf1be81
ma programs-db: rip 2018-02-26 19:33:24 +01:00
makefu
c222aadefe
ma hydra.wbob.r: init 2018-02-26 18:59:43 +01:00
lassulus
5b9fe77d8f l mail: add more mailboxes 2018-02-25 23:33:15 +01:00
lassulus
2d6f67e535 l mail: use tags for mailboxes 2018-02-25 23:32:59 +01:00
jeschli
e5b89294d7 Merge branch 'master' of prism.r:stockholm into staging/jeschli 2018-02-25 16:47:44 +01:00
lassulus
23a7012581 l: init dpdkm 2018-02-24 12:15:13 +01:00
lassulus
1b61fa920e nixpkgs: c831224 -> d09e425 2018-02-22 22:17:38 +01:00
lassulus
14e60f8b82 Merge remote-tracking branch 'prism/makefu' 2018-02-22 18:34:41 +01:00
lassulus
87bc9a72ee l baseX: run xmonad only in xmonad session 2018-02-22 18:34:24 +01:00
lassulus
aef9e595f0 l baseX: use network-manager 2018-02-22 18:23:12 +01:00
makefu
b5d83996a8
ma 6tests/secrets: add auth.nix dummy 2018-02-22 09:58:45 +01:00
makefu
c4fdec7ce9
ma x.r: add bluetooth 2018-02-21 16:00:33 +01:00
lassulus
34e88f9cef Merge remote-tracking branch 'prism/tv' 2018-02-19 14:14:04 +01:00
tv
8654c0511b github: update known hosts 2018-02-19 13:42:00 +01:00
makefu
ebb5d67cf3
ma urlwatch: taskwarrior is now on github 2018-02-19 11:33:25 +01:00
lassulus
28f96d4cb1 l: php5 -> php7 2018-02-19 09:53:56 +01:00
lassulus
efb192f515 l vim: run gometalinter 2018-02-19 09:50:45 +01:00
lassulus
1adeeffb7e l vim: add govet workaround 2018-02-19 09:47:35 +01:00
lassulus
ae9dc0e1a6 l minecraft: open port for dynmap 2018-02-19 09:46:50 +01:00
lassulus
8c600fd0f5 l shodan.r: ignore lidswitch 2018-02-19 09:46:00 +01:00
lassulus
d8c6ef4d10 l prism.r: add jeschli user 2018-02-19 09:45:39 +01:00
lassulus
8b3916ad4a l helios.r: add minio.cert 2018-02-19 00:20:23 +01:00
lassulus
99b28c290f l icarus.r: update ssh pubkey 2018-02-19 00:19:41 +01:00
jeschli
52b846c98b Merge branch 'master' of prism.r:stockholm into staging/jeschli 2018-02-18 10:48:18 +01:00