summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--0make/lass/cloudkrebs.makefile4
-rw-r--r--0make/tv/cd.makefile4
-rw-r--r--0make/tv/mkdir.makefile4
-rw-r--r--0make/tv/nomic.makefile4
-rw-r--r--0make/tv/rmdir.makefile4
-rw-r--r--0make/tv/wu.makefile4
-rw-r--r--2configs/lass/git-repos.nix140
-rw-r--r--2configs/lass/mors/retiolum.nix21
-rw-r--r--4lib/krebs/default.nix33
-rw-r--r--4lib/tv/default.nix52
-rw-r--r--Makefile85
-rw-r--r--Zpkgs/tv/lentil/1.patch39
-rw-r--r--default.nix8
-rw-r--r--krebs/3modules/default.nix (renamed from 3modules/krebs/default.nix)251
-rw-r--r--krebs/3modules/git.nix (renamed from 3modules/krebs/git.nix)6
-rw-r--r--krebs/3modules/github-hosts-sync.nix (renamed from 3modules/krebs/github-hosts-sync.nix)6
-rw-r--r--krebs/3modules/nginx.nix (renamed from 3modules/krebs/nginx.nix)0
-rw-r--r--krebs/3modules/retiolum.nix (renamed from 3modules/krebs/retiolum.nix)0
-rw-r--r--krebs/3modules/urlwatch.nix (renamed from 3modules/krebs/urlwatch.nix)4
-rw-r--r--krebs/4lib/default.nix18
-rw-r--r--krebs/4lib/dns.nix31
-rw-r--r--krebs/4lib/listset.nix11
-rw-r--r--krebs/4lib/tree.nix13
-rw-r--r--krebs/4lib/types.nix (renamed from 4lib/krebs/types.nix)9
-rw-r--r--krebs/5pkgs/default.nix (renamed from Zpkgs/krebs/default.nix)0
-rw-r--r--krebs/5pkgs/dic.nix (renamed from Zpkgs/krebs/dic.nix)0
-rw-r--r--krebs/5pkgs/genid.nix (renamed from Zpkgs/krebs/genid.nix)0
-rw-r--r--krebs/5pkgs/github-hosts-sync.nix (renamed from Zpkgs/krebs/github-hosts-sync.nix)0
-rw-r--r--krebs/5pkgs/github-known_hosts.nix (renamed from Zpkgs/krebs/github-known_hosts.nix)0
-rw-r--r--krebs/5pkgs/hashPassword.nix (renamed from Zpkgs/krebs/hashPassword.nix)0
-rw-r--r--lass/1systems/cloudkrebs.nix46
-rw-r--r--lass/1systems/mors.nix (renamed from 1systems/lass/mors.nix)94
-rw-r--r--lass/1systems/uriel.nix (renamed from 1systems/lass/uriel.nix)69
-rw-r--r--lass/2configs/base.nix (renamed from 2configs/lass/base.nix)77
-rw-r--r--lass/2configs/binary-caches.nix (renamed from 2configs/lass/binary-caches.nix)0
-rw-r--r--lass/2configs/bird.nix (renamed from 2configs/lass/bird.nix)0
-rw-r--r--lass/2configs/bitcoin.nix (renamed from 2configs/lass/bitcoin.nix)0
-rw-r--r--lass/2configs/browsers.nix (renamed from 2configs/lass/browsers.nix)0
-rw-r--r--lass/2configs/chromium-patched.nix (renamed from 2configs/lass/chromium-patched.nix)0
-rw-r--r--lass/2configs/desktop-base.nix (renamed from 2configs/lass/desktop-base.nix)6
-rw-r--r--lass/2configs/elster.nix (renamed from 2configs/lass/elster.nix)0
-rw-r--r--lass/2configs/fastpoke-pages.nix97
-rw-r--r--lass/2configs/games.nix (renamed from 2configs/lass/games.nix)0
-rw-r--r--lass/2configs/gitolite-base.nix (renamed from 2configs/lass/gitolite-base.nix)0
-rw-r--r--lass/2configs/identity.nix50
-rw-r--r--lass/2configs/ircd.nix (renamed from 2configs/lass/ircd.nix)0
-rw-r--r--lass/2configs/mors/repos.nix (renamed from 2configs/lass/mors/repos.nix)0
-rw-r--r--lass/2configs/new-repos.nix77
-rw-r--r--lass/2configs/pass.nix (renamed from 2configs/lass/pass.nix)0
-rw-r--r--lass/2configs/programs.nix (renamed from 2configs/lass/programs.nix)0
-rw-r--r--lass/2configs/retiolum.nix28
-rw-r--r--lass/2configs/sshkeys.nix (renamed from 2configs/lass/sshkeys.nix)2
-rw-r--r--lass/2configs/steam.nix (renamed from 2configs/lass/steam.nix)0
-rw-r--r--lass/2configs/texlive.nix (renamed from 2configs/lass/texlive.nix)0
-rw-r--r--lass/2configs/urxvt.nix (renamed from 2configs/lass/urxvt.nix)4
-rw-r--r--lass/2configs/vim.nix (renamed from 2configs/lass/vim.nix)0
-rw-r--r--lass/2configs/virtualbox.nix (renamed from 2configs/lass/virtualbox.nix)0
-rw-r--r--lass/2configs/wine.nix (renamed from 2configs/lass/wine.nix)0
-rw-r--r--lass/3modules/default.nix8
-rw-r--r--lass/3modules/iptables.nix (renamed from 3modules/lass/iptables.nix)2
-rw-r--r--lass/3modules/sshkeys.nix (renamed from 3modules/lass/sshkeys.nix)0
-rw-r--r--lass/3modules/urxvtd.nix (renamed from 3modules/lass/urxvtd.nix)0
-rw-r--r--lass/3modules/xresources.nix (renamed from 3modules/lass/xresources.nix)2
-rw-r--r--tv/1systems/cd.nix (renamed from 1systems/tv/cd.nix)34
-rw-r--r--tv/1systems/mkdir.nix (renamed from 1systems/tv/mkdir.nix)28
-rw-r--r--tv/1systems/nomic.nix (renamed from 1systems/tv/nomic.nix)26
-rw-r--r--tv/1systems/rmdir.nix (renamed from 1systems/tv/rmdir.nix)28
-rw-r--r--tv/1systems/wu.nix (renamed from 1systems/tv/wu.nix)120
-rw-r--r--tv/2configs/AO753.nix (renamed from 2configs/tv/AO753.nix)2
-rw-r--r--tv/2configs/CAC-CentOS-7-64bit.nix (renamed from 2configs/tv/CAC-CentOS-7-64bit.nix)2
-rw-r--r--tv/2configs/CAC-Developer-1.nix (renamed from 2configs/tv/CAC-Developer-1.nix)0
-rw-r--r--tv/2configs/CAC-Developer-2.nix (renamed from 2configs/tv/CAC-Developer-2.nix)0
-rw-r--r--tv/2configs/base.nix (renamed from 2configs/tv/base.nix)1
-rw-r--r--tv/2configs/bash_completion.sh (renamed from 2configs/tv/bash_completion.sh)0
-rw-r--r--tv/2configs/charybdis.nix (renamed from 2configs/tv/charybdis.nix)136
-rw-r--r--tv/2configs/consul-client.nix (renamed from 2configs/tv/consul-client.nix)0
-rw-r--r--tv/2configs/consul-server.nix (renamed from 2configs/tv/consul-server.nix)0
-rw-r--r--tv/2configs/cryptoroot.nix (renamed from 2configs/tv/cryptoroot.nix)0
-rw-r--r--tv/2configs/exim-retiolum.nix (renamed from 2configs/tv/exim-retiolum.nix)0
-rw-r--r--tv/2configs/exim-smarthost.nix (renamed from 2configs/tv/exim-smarthost.nix)0
-rw-r--r--tv/2configs/git.nix (renamed from 2configs/tv/git.nix)2
-rw-r--r--tv/2configs/mail-client.nix (renamed from 2configs/tv/mail-client.nix)2
-rw-r--r--tv/2configs/smartd.nix (renamed from 2configs/tv/smartd.nix)0
-rw-r--r--tv/2configs/synaptics.nix (renamed from 2configs/tv/synaptics.nix)0
-rw-r--r--tv/2configs/urlwatch.nix (renamed from 2configs/tv/urlwatch.nix)0
-rw-r--r--tv/2configs/urxvt.nix (renamed from 2configs/tv/urxvt.nix)0
-rw-r--r--tv/2configs/w110er.nix (renamed from 2configs/tv/w110er.nix)2
-rw-r--r--tv/2configs/xserver.nix (renamed from 2configs/tv/xserver.nix)2
-rw-r--r--tv/3modules/consul.nix (renamed from 3modules/tv/consul.nix)2
-rw-r--r--tv/3modules/default.nix (renamed from 3modules/tv/default.nix)0
-rw-r--r--tv/3modules/ejabberd.nix (renamed from 3modules/tv/ejabberd.nix)0
-rw-r--r--tv/3modules/iptables.nix (renamed from 3modules/tv/iptables.nix)4
-rw-r--r--tv/4lib/default.nix27
-rw-r--r--tv/4lib/git.nix (renamed from 4lib/tv/git.nix)0
-rw-r--r--tv/4lib/modules.nix (renamed from 4lib/tv/modules.nix)0
-rw-r--r--tv/5pkgs/charybdis/default.nix (renamed from Zpkgs/tv/charybdis/default.nix)0
-rw-r--r--tv/5pkgs/charybdis/remove-setenv.patch (renamed from Zpkgs/tv/charybdis/remove-setenv.patch)2
-rw-r--r--tv/5pkgs/default.nix (renamed from Zpkgs/tv/default.nix)4
-rw-r--r--tv/5pkgs/lentil/default.nix (renamed from Zpkgs/tv/lentil/default.nix)6
-rw-r--r--tv/5pkgs/lentil/syntaxes.patch (renamed from Zpkgs/tv/lentil/syntaxes.patch)0
-rw-r--r--tv/5pkgs/much.nix (renamed from Zpkgs/tv/much.nix)0
-rw-r--r--tv/5pkgs/viljetic-pages/default.nix (renamed from Zpkgs/tv/viljetic-pages/default.nix)0
-rw-r--r--tv/5pkgs/viljetic-pages/index.html (renamed from Zpkgs/tv/viljetic-pages/index.html)0
-rw-r--r--tv/5pkgs/viljetic-pages/logo.xpm (renamed from Zpkgs/tv/viljetic-pages/logo.xpm)0
104 files changed, 988 insertions, 755 deletions
diff --git a/0make/lass/cloudkrebs.makefile b/0make/lass/cloudkrebs.makefile
new file mode 100644
index 000000000..baf7660b4
--- /dev/null
+++ b/0make/lass/cloudkrebs.makefile
@@ -0,0 +1,4 @@
+deploy_host := root@cloudkrebs
+nixpkgs_url := https://github.com/Lassulus/nixpkgs
+nixpkgs_rev := 1879a011925c561f0a7fd4043da0768bbff41d0b
+secrets_dir := /home/lass/secrets/cloudkrebs
diff --git a/0make/tv/cd.makefile b/0make/tv/cd.makefile
deleted file mode 100644
index e021423f4..000000000
--- a/0make/tv/cd.makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-deploy_host := root@cd-global
-nixpkgs_url := https://github.com/NixOS/nixpkgs
-nixpkgs_rev := 4c01e6d91993b6de128795f4fbdd25f6227fb870
-secrets_dir := /home/tv/secrets/cd
diff --git a/0make/tv/mkdir.makefile b/0make/tv/mkdir.makefile
deleted file mode 100644
index b10398a07..000000000
--- a/0make/tv/mkdir.makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-deploy_host := root@mkdir
-nixpkgs_url := https://github.com/NixOS/nixpkgs
-nixpkgs_rev := 4c01e6d91993b6de128795f4fbdd25f6227fb870
-secrets_dir := /home/tv/secrets/mkdir
diff --git a/0make/tv/nomic.makefile b/0make/tv/nomic.makefile
deleted file mode 100644
index 9e0b8671b..000000000
--- a/0make/tv/nomic.makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-deploy_host := root@nomic.gg23
-nixpkgs_url := https://github.com/NixOS/nixpkgs
-nixpkgs_rev := 9d5508d85c33b8fb22d79dde6176792eac2c2696
-secrets_dir := /home/tv/secrets/nomic
diff --git a/0make/tv/rmdir.makefile b/0make/tv/rmdir.makefile
deleted file mode 100644
index 6075bd3d4..000000000
--- a/0make/tv/rmdir.makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-deploy_host := root@rmdir
-nixpkgs_url := https://github.com/NixOS/nixpkgs
-nixpkgs_rev := 4c01e6d91993b6de128795f4fbdd25f6227fb870
-secrets_dir := /home/tv/secrets/rmdir
diff --git a/0make/tv/wu.makefile b/0make/tv/wu.makefile
deleted file mode 100644
index ef7e51194..000000000
--- a/