Commit Graph

5745 Commits

Author SHA1 Message Date
jeschli
01358d3947 Merge branch 'staging/jeschli' of prism.r:stockholm into staging/jeschli 2018-03-20 15:37:44 +01:00
jeschli
390375cd8a j: dirty merge again 2018-03-20 15:17:36 +01:00
jeschli
6267aa4250 Merge remote-tracking branch 'origin/master' into HEAD 2018-03-13 18:55:44 +01:00
lassulus
02f67eed44 l xephyrify: add minimal xmonad 2018-03-06 21:30:05 +01:00
lassulus
bec10e329b Merge remote-tracking branch 'ni/master' 2018-03-06 20:53:13 +01:00
lassulus
3551257d06 Merge remote-tracking branch 'gum/master' 2018-03-06 20:24:38 +01:00
lassulus
995d1b0c7c Merge remote-tracking branch 'prism/tv' 2018-03-06 20:21:02 +01:00
lassulus
58a21e21e2 l mail: add more mailboxes 2018-03-03 18:36:58 +01:00
lassulus
6d975a493c l: add more mails 2018-03-03 18:28:40 +01:00
lassulus
7eb71976f1 l: add xephyrify 2018-03-03 18:28:05 +01:00
lassulus
742cda0e22 l: turn pkgs into overlay 2018-03-03 15:30:29 +01:00
lassulus
55a156814a l deploy: don't run --diff 2018-03-03 15:02:47 +01:00
tv
becf1ce7ac Merge remote-tracking branch 'prism/master' 2018-02-28 22:51:18 +01:00
tv
2934d4524b tv gitrepos: add kops 2018-02-28 22:38:42 +01:00
makefu
54c439f4f4
ma owncloud: add caching 2018-02-28 21:29:23 +01:00
jeschli
e7ac3fc703 Merge branch 'staging/jeschli' of prism.i:stockholm into staging/jeschli 2018-02-28 20:22:08 +00:00
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