From fbd485cd86c7e9984819357398f912a2d5510845 Mon Sep 17 00:00:00 2001 From: tv Date: Tue, 12 Sep 2023 12:56:39 +0200 Subject: tv: emigrate --- kartei/tv/hosts/alnus.nix | 1 - kartei/tv/hosts/au.nix | 1 - kartei/tv/hosts/bu.nix | 1 - kartei/tv/hosts/mu.nix | 1 - kartei/tv/hosts/nomic.nix | 1 - kartei/tv/hosts/querel.nix | 1 - kartei/tv/hosts/ru.nix | 1 - kartei/tv/hosts/xu.nix | 1 - kartei/tv/hosts/zu.nix | 1 - tv/1systems/alnus/config.nix | 87 ---- tv/1systems/alnus/lib | 1 - tv/1systems/au/config.nix | 23 - tv/1systems/au/disks.nix | 19 - tv/1systems/au/lib | 1 - tv/1systems/bu/config.nix | 35 -- tv/1systems/bu/disks.nix | 19 - tv/1systems/bu/lib | 1 - tv/1systems/lib | 1 - tv/1systems/mu/config.nix | 127 ----- tv/1systems/mu/lib | 1 - tv/1systems/nomic/config.nix | 62 --- tv/1systems/nomic/lib | 1 - tv/1systems/querel/config.nix | 86 ---- tv/1systems/querel/lib | 1 - tv/1systems/ru/config.nix | 37 -- tv/1systems/xu/config.nix | 154 ------ tv/1systems/xu/lib | 1 - tv/1systems/zu/config.nix | 51 -- tv/2configs/autotether.nix | 19 - tv/2configs/backup.nix | 109 ----- tv/2configs/bash/default.nix | 67 --- tv/2configs/bash/lib | 1 - tv/2configs/binary-cache/default.nix | 29 -- tv/2configs/binary-cache/lib | 1 - tv/2configs/br.nix | 49 -- tv/2configs/default.nix | 137 ------ tv/2configs/elm-packages-proxy.nix | 359 -------------- tv/2configs/exim-retiolum.nix | 9 - tv/2configs/exim-smarthost.nix | 46 -- tv/2configs/fs/CAC-CentOS-7-64bit.nix | 20 - tv/2configs/gitconfig.nix | 16 - tv/2configs/gitrepos.nix | 233 --------- tv/2configs/htop.nix | 40 -- tv/2configs/hw/AO753.nix | 48 -- tv/2configs/hw/lib | 1 - tv/2configs/hw/winmax2.nix | 48 -- tv/2configs/hw/x220.nix | 89 ---- tv/2configs/imgur.nix | 22 - tv/2configs/initrd/sshd.nix | 17 - tv/2configs/lib | 1 - tv/2configs/mail-client.nix | 9 - tv/2configs/man.nix | 13 - tv/2configs/nets/hkw.nix | 68 --- tv/2configs/networkd.nix | 4 - tv/2configs/nginx/default.nix | 22 - tv/2configs/nginx/lib | 1 - tv/2configs/nginx/public_html.nix | 18 - tv/2configs/nix.nix | 9 - tv/2configs/pki/certs/tv.crt | 31 -- tv/2configs/pki/default.nix | 68 --- tv/2configs/pki/lib | 1 - tv/2configs/ppp.nix | 86 ---- tv/2configs/pulse.nix | 120 ----- tv/2configs/repo-sync/lib | 1 - tv/2configs/repo-sync/wiki.nix | 40 -- tv/2configs/retiolum.nix | 27 -- tv/2configs/smartd.nix | 17 - tv/2configs/ssh.nix | 22 - tv/2configs/sshd.nix | 27 -- tv/2configs/urlwatch.nix | 117 ----- tv/2configs/vim.nix | 183 -------- tv/2configs/weechat-server.nix | 24 - tv/2configs/wiregrill.nix | 37 -- tv/2configs/xdg.nix | 11 - tv/2configs/xserver/Xmodmap.nix | 28 -- tv/2configs/xserver/default.nix | 167 ------- tv/2configs/xserver/lib | 1 - tv/2configs/xserver/sxiv.nix | 12 - tv/2configs/xserver/urxvt.nix | 73 --- tv/2configs/xserver/xkiller.nix | 14 - tv/2configs/xserver/xserver.conf.nix | 39 -- tv/2configs/xsessions/default.nix | 5 - tv/2configs/xsessions/urxvtd.nix | 15 - tv/3modules/Xresources.nix | 38 -- tv/3modules/charybdis/config.nix | 519 --------------------- tv/3modules/charybdis/default.nix | 81 ---- tv/3modules/charybdis/lib | 1 - tv/3modules/default.nix | 8 - tv/3modules/dnsmasq.nix | 58 --- tv/3modules/ejabberd/default.nix | 275 ----------- tv/3modules/ejabberd/lib | 1 - tv/3modules/focus.nix | 4 - tv/3modules/hosts.nix | 9 - tv/3modules/hw.nix | 16 - tv/3modules/im.nix | 110 ----- tv/3modules/iptables.nix | 208 --------- tv/3modules/lib | 1 - tv/3modules/lidControl.nix | 45 -- .../org.freedesktop.machine1.host-shell.nix | 29 -- tv/3modules/slock.nix | 78 ---- tv/3modules/systemd.nix | 47 -- tv/3modules/unbound.nix | 84 ---- tv/3modules/wwan.nix | 182 -------- tv/3modules/x0vncserver.nix | 45 -- tv/5pkgs/compat/default.nix | 1 - tv/5pkgs/default.nix | 19 - tv/5pkgs/haskell/default.nix | 28 -- tv/5pkgs/haskell/lib | 1 - tv/5pkgs/haskell/th-env/default.nix | 10 - tv/5pkgs/haskell/th-env/src/THEnv.hs | 49 -- tv/5pkgs/haskell/th-env/th-env.cabal | 20 - tv/5pkgs/haskell/xmonad-tv/default.nix | 16 - tv/5pkgs/haskell/xmonad-tv/shell.nix | 83 ---- tv/5pkgs/haskell/xmonad-tv/src/Shutdown.hs | 113 ----- tv/5pkgs/haskell/xmonad-tv/src/XMonad/Extra.hs | 14 - .../src/XMonad/Hooks/EwmhDesktops/Extra.hs | 117 ----- tv/5pkgs/haskell/xmonad-tv/src/main.hs | 227 --------- tv/5pkgs/haskell/xmonad-tv/src/xmonad-tv.cabal | 29 -- tv/5pkgs/lib | 1 - tv/5pkgs/override/alacritty.nix | 16 - tv/5pkgs/override/anbox.nix | 72 --- tv/5pkgs/override/default.nix | 4 - tv/5pkgs/override/fzf/complete1.patch | 77 --- tv/5pkgs/override/fzf/default.nix | 7 - tv/5pkgs/override/gitAndTools.nix | 5 - tv/5pkgs/override/input-fonts.nix | 13 - tv/5pkgs/override/iosevka-tv-1.nix | 20 - tv/5pkgs/override/iosevka-tv-2.nix | 20 - tv/5pkgs/override/jc.nix | 21 - tv/5pkgs/override/lib | 1 - tv/5pkgs/override/uqmi.nix | 10 - .../433Utils/RPi_utils.codesend.codestring.patch | 24 - tv/5pkgs/rpi/433Utils/default.nix | 42 -- tv/5pkgs/rpi/433Utils/rc-switch.protocols.patch | 10 - tv/5pkgs/rpi/433Utils/src.json | 7 - tv/5pkgs/rpi/WiringPi/default.nix | 61 --- tv/5pkgs/rpi/WiringPi/src.json | 6 - tv/5pkgs/rpi/default.nix | 7 - tv/5pkgs/rpi/lib | 1 - tv/5pkgs/simple/alacritty-tv.nix | 152 ------ tv/5pkgs/simple/bash-fzf-history.nix | 102 ---- tv/5pkgs/simple/cr.nix | 16 - tv/5pkgs/simple/default.nix | 18 - tv/5pkgs/simple/diff-so-fancy.nix | 50 -- tv/5pkgs/simple/disko.nix | 13 - tv/5pkgs/simple/editor-input.nix | 18 - tv/5pkgs/simple/ff.nix | 8 - tv/5pkgs/simple/field.nix | 6 - tv/5pkgs/simple/flameshot-once-tv.nix | 48 -- tv/5pkgs/simple/font-size-alacritty.nix | 67 --- tv/5pkgs/simple/fzmenu/bin/otpmenu | 44 -- tv/5pkgs/simple/fzmenu/bin/passmenu | 45 -- tv/5pkgs/simple/fzmenu/default.nix | 50 -- tv/5pkgs/simple/hc.nix | 39 -- tv/5pkgs/simple/iosevka-tv-1.nix | 18 - tv/5pkgs/simple/iosevka-tv-2.nix | 20 - tv/5pkgs/simple/lib | 1 - tv/5pkgs/simple/libinput-tv.nix | 11 - tv/5pkgs/simple/mpvterm/default.nix | 8 - tv/5pkgs/simple/mpvterm/mpvterm.patch | 146 ------ tv/5pkgs/simple/pinentry-urxvt/default.nix | 124 ----- tv/5pkgs/simple/pinentry-urxvt/lib | 1 - tv/5pkgs/simple/q/default.nix | 171 ------- tv/5pkgs/simple/q/lib | 1 - tv/5pkgs/simple/rox-filer.nix | 95 ---- .../rxvt-unicode-256color-terminfo/default.nix | 16 - .../rxvt-unicode-256color.terminfo | Bin 2239 -> 0 bytes tv/5pkgs/simple/stardict/default.nix | 235 ---------- tv/5pkgs/simple/viljetic-pages/default.nix | 17 - tv/5pkgs/simple/viljetic-pages/index.html | 11 - tv/5pkgs/simple/viljetic-pages/logo.xpm | 24 - tv/5pkgs/simple/weechat-tv.nix | 9 - tv/5pkgs/simple/xdpytools/default.nix | 31 -- tv/5pkgs/simple/xdpytools/src/xdpychvt | 11 - tv/5pkgs/simple/xdpytools/src/xdpysel | 49 -- tv/5pkgs/simple/xkiller.nix | 25 - tv/5pkgs/simple/xtoggledpms.nix | 16 - tv/5pkgs/vim/default.nix | 11 - tv/5pkgs/vim/elixir.nix | 9 - tv/5pkgs/vim/file-line.nix | 10 - tv/5pkgs/vim/fzf.nix | 11 - tv/5pkgs/vim/hack.nix | 49 -- tv/5pkgs/vim/jq.nix | 10 - tv/5pkgs/vim/lib | 1 - tv/5pkgs/vim/nix.nix | 225 --------- tv/5pkgs/vim/showsyntax.nix | 26 -- tv/5pkgs/vim/tv.nix | 42 -- tv/5pkgs/vim/vim.nix | 16 - tv/default.nix | 15 - tv/dummy_secrets/default.nix | 8 - tv/dummy_secrets/o2.pin | 1 - tv/dummy_secrets/repos.nix | 1 - tv/dummy_secrets/ssh.id_ed25519 | 3 - tv/dummy_secrets/ssh.id_rsa | 3 - tv/krops.nix | 23 - tv/lib | 1 - tv/tombstone | 1 + 197 files changed, 1 insertion(+), 8560 deletions(-) delete mode 100644 tv/1systems/alnus/config.nix delete mode 120000 tv/1systems/alnus/lib delete mode 100644 tv/1systems/au/config.nix delete mode 100644 tv/1systems/au/disks.nix delete mode 120000 tv/1systems/au/lib delete mode 100644 tv/1systems/bu/config.nix delete mode 100644 tv/1systems/bu/disks.nix delete mode 120000 tv/1systems/bu/lib delete mode 120000 tv/1systems/lib delete mode 100644 tv/1systems/mu/config.nix delete mode 120000 tv/1systems/mu/lib delete mode 100644 tv/1systems/nomic/config.nix delete mode 120000 tv/1systems/nomic/lib delete mode 100644 tv/1systems/querel/config.nix delete mode 120000 tv/1systems/querel/lib delete mode 100644 tv/1systems/ru/config.nix delete mode 100644 tv/1systems/xu/config.nix delete mode 120000 tv/1systems/xu/lib delete mode 100644 tv/1systems/zu/config.nix delete mode 100644 tv/2configs/autotether.nix delete mode 100644 tv/2configs/backup.nix delete mode 100644 tv/2configs/bash/default.nix delete mode 120000 tv/2configs/bash/lib delete mode 100644 tv/2configs/binary-cache/default.nix delete mode 120000 tv/2configs/binary-cache/lib delete mode 100644 tv/2configs/br.nix delete mode 100644 tv/2configs/default.nix delete mode 100644 tv/2configs/elm-packages-proxy.nix delete mode 100644 tv/2configs/exim-retiolum.nix delete mode 100644 tv/2configs/exim-smarthost.nix delete mode 100644 tv/2configs/fs/CAC-CentOS-7-64bit.nix delete mode 100644 tv/2configs/gitconfig.nix delete mode 100644 tv/2configs/gitrepos.nix delete mode 100644 tv/2configs/htop.nix delete mode 100644 tv/2configs/hw/AO753.nix delete mode 120000 tv/2configs/hw/lib delete mode 100644 tv/2configs/hw/winmax2.nix delete mode 100644 tv/2configs/hw/x220.nix delete mode 100644 tv/2configs/imgur.nix delete mode 100644 tv/2configs/initrd/sshd.nix delete mode 120000 tv/2configs/lib delete mode 100644 tv/2configs/mail-client.nix delete mode 100644 tv/2configs/man.nix delete mode 100644 tv/2configs/nets/hkw.nix delete mode 100644 tv/2configs/networkd.nix delete mode 100644 tv/2configs/nginx/default.nix delete mode 120000 tv/2configs/nginx/lib delete mode 100644 tv/2configs/nginx/public_html.nix delete mode 100644 tv/2configs/nix.nix delete mode 100644 tv/2configs/pki/certs/tv.crt delete mode 100644 tv/2configs/pki/default.nix delete mode 120000 tv/2configs/pki/lib delete mode 100644 tv/2configs/ppp.nix delete mode 100644 tv/2configs/pulse.nix delete mode 120000 tv/2configs/repo-sync/lib delete mode 100644 tv/2configs/repo-sync/wiki.nix delete mode 100644 tv/2configs/retiolum.nix delete mode 100644 tv/2configs/smartd.nix delete mode 100644 tv/2configs/ssh.nix delete mode 100644 tv/2configs/sshd.nix delete mode 100644 tv/2configs/urlwatch.nix delete mode 100644 tv/2configs/vim.nix delete mode 100644 tv/2configs/weechat-server.nix delete mode 100644 tv/2configs/wiregrill.nix delete mode 100644 tv/2configs/xdg.nix delete mode 100644 tv/2configs/xserver/Xmodmap.nix delete mode 100644 tv/2configs/xserver/default.nix delete mode 120000 tv/2configs/xserver/lib delete mode 100644 tv/2configs/xserver/sxiv.nix delete mode 100644 tv/2configs/xserver/urxvt.nix delete mode 100644 tv/2configs/xserver/xkiller.nix delete mode 100644 tv/2configs/xserver/xserver.conf.nix delete mode 100644 tv/2configs/xsessions/default.nix delete mode 100644 tv/2configs/xsessions/urxvtd.nix delete mode 100644 tv/3modules/Xresources.nix delete mode 100644 tv/3modules/charybdis/config.nix delete mode 100644 tv/3modules/charybdis/default.nix delete mode 120000 tv/3modules/charybdis/lib delete mode 100644 tv/3modules/default.nix delete mode 100644 tv/3modules/dnsmasq.nix delete mode 100644 tv/3modules/ejabberd/default.nix delete mode 120000 tv/3modules/ejabberd/lib delete mode 100644 tv/3modules/focus.nix delete mode 100644 tv/3modules/hosts.nix delete mode 100644 tv/3modules/hw.nix delete mode 100644 tv/3modules/im.nix delete mode 100644 tv/3modules/iptables.nix delete mode 120000 tv/3modules/lib delete mode 100644 tv/3modules/lidControl.nix delete mode 100644 tv/3modules/org.freedesktop.machine1.host-shell.nix delete mode 100644 tv/3modules/slock.nix delete mode 100644 tv/3modules/systemd.nix delete mode 100644 tv/3modules/unbound.nix delete mode 100644 tv/3modules/wwan.nix delete mode 100644 tv/3modules/x0vncserver.nix delete mode 100644 tv/5pkgs/compat/default.nix delete mode 100644 tv/5pkgs/default.nix delete mode 100644 tv/5pkgs/haskell/default.nix delete mode 120000 tv/5pkgs/haskell/lib delete mode 100644 tv/5pkgs/haskell/th-env/default.nix delete mode 100644 tv/5pkgs/haskell/th-env/src/THEnv.hs delete mode 100644 tv/5pkgs/haskell/th-env/th-env.cabal delete mode 100644 tv/5pkgs/haskell/xmonad-tv/default.nix delete mode 100644 tv/5pkgs/haskell/xmonad-tv/shell.nix delete mode 100644 tv/5pkgs/haskell/xmonad-tv/src/Shutdown.hs delete mode 100644 tv/5pkgs/haskell/xmonad-tv/src/XMonad/Extra.hs delete mode 100644 tv/5pkgs/haskell/xmonad-tv/src/XMonad/Hooks/EwmhDesktops/Extra.hs delete mode 100644 tv/5pkgs/haskell/xmonad-tv/src/main.hs delete mode 100644 tv/5pkgs/haskell/xmonad-tv/src/xmonad-tv.cabal delete mode 120000 tv/5pkgs/lib delete mode 100644 tv/5pkgs/override/alacritty.nix delete mode 100644 tv/5pkgs/override/anbox.nix delete mode 100644 tv/5pkgs/override/default.nix delete mode 100644 tv/5pkgs/override/fzf/complete1.patch delete mode 100644 tv/5pkgs/override/fzf/default.nix delete mode 100644 tv/5pkgs/override/gitAndTools.nix delete mode 100644 tv/5pkgs/override/input-fonts.nix delete mode 100644 tv/5pkgs/override/iosevka-tv-1.nix delete mode 100644 tv/5pkgs/override/iosevka-tv-2.nix delete mode 100644 tv/5pkgs/override/jc.nix delete mode 120000 tv/5pkgs/override/lib delete mode 100644 tv/5pkgs/override/uqmi.nix delete mode 100644 tv/5pkgs/rpi/433Utils/RPi_utils.codesend.codestring.patch delete mode 100644 tv/5pkgs/rpi/433Utils/default.nix delete mode 100644 tv/5pkgs/rpi/433Utils/rc-switch.protocols.patch delete mode 100644 tv/5pkgs/rpi/433Utils/src.json delete mode 100644 tv/5pkgs/rpi/WiringPi/default.nix delete mode 100644 tv/5pkgs/rpi/WiringPi/src.json delete mode 100644 tv/5pkgs/rpi/default.nix delete mode 120000 tv/5pkgs/rpi/lib delete mode 100644 tv/5pkgs/simple/alacritty-tv.nix delete mode 100644 tv/5pkgs/simple/bash-fzf-history.nix delete mode 100644 tv/5pkgs/simple/cr.nix delete mode 100644 tv/5pkgs/simple/default.nix delete mode 100644 tv/5pkgs/simple/diff-so-fancy.nix delete mode 100644 tv/5pkgs/simple/disko.nix delete mode 100644 tv/5pkgs/simple/editor-input.nix delete mode 100644 tv/5pkgs/simple/ff.nix delete mode 100644 tv/5pkgs/simple/field.nix delete mode 100644 tv/5pkgs/simple/flameshot-once-tv.nix delete mode 100644 tv/5pkgs/simple/font-size-alacritty.nix delete mode 100755 tv/5pkgs/simple/fzmenu/bin/otpmenu delete mode 100755 tv/5pkgs/simple/fzmenu/bin/passmenu delete mode 100644 tv/5pkgs/simple/fzmenu/default.nix delete mode 100644 tv/5pkgs/simple/hc.nix delete mode 100644 tv/5pkgs/simple/iosevka-tv-1.nix delete mode 100644 tv/5pkgs/simple/iosevka-tv-2.nix delete mode 120000 tv/5pkgs/simple/lib delete mode 100644 tv/5pkgs/simple/libinput-tv.nix delete mode 100644 tv/5pkgs/simple/mpvterm/default.nix delete mode 100644 tv/5pkgs/simple/mpvterm/mpvterm.patch delete mode 100644 tv/5pkgs/simple/pinentry-urxvt/default.nix delete mode 120000 tv/5pkgs/simple/pinentry-urxvt/lib delete mode 100644 tv/5pkgs/simple/q/default.nix delete mode 120000 tv/5pkgs/simple/q/lib delete mode 100644 tv/5pkgs/simple/rox-filer.nix delete mode 100644 tv/5pkgs/simple/rxvt-unicode-256color-terminfo/default.nix delete mode 100644 tv/5pkgs/simple/rxvt-unicode-256color-terminfo/rxvt-unicode-256color.terminfo delete mode 100644 tv/5pkgs/simple/stardict/default.nix delete mode 100644 tv/5pkgs/simple/viljetic-pages/default.nix delete mode 100644 tv/5pkgs/simple/viljetic-pages/index.html delete mode 100644 tv/5pkgs/simple/viljetic-pages/logo.xpm delete mode 100644 tv/5pkgs/simple/weechat-tv.nix delete mode 100644 tv/5pkgs/simple/xdpytools/default.nix delete mode 100755 tv/5pkgs/simple/xdpytools/src/xdpychvt delete mode 100755 tv/5pkgs/simple/xdpytools/src/xdpysel delete mode 100644 tv/5pkgs/simple/xkiller.nix delete mode 100644 tv/5pkgs/simple/xtoggledpms.nix delete mode 100644 tv/5pkgs/vim/default.nix delete mode 100644 tv/5pkgs/vim/elixir.nix delete mode 100644 tv/5pkgs/vim/file-line.nix delete mode 100644 tv/5pkgs/vim/fzf.nix delete mode 100644 tv/5pkgs/vim/hack.nix delete mode 100644 tv/5pkgs/vim/jq.nix delete mode 120000 tv/5pkgs/vim/lib delete mode 100644 tv/5pkgs/vim/nix.nix delete mode 100644 tv/5pkgs/vim/showsyntax.nix delete mode 100644 tv/5pkgs/vim/tv.nix delete mode 100644 tv/5pkgs/vim/vim.nix delete mode 100644 tv/default.nix delete mode 100644 tv/dummy_secrets/default.nix delete mode 100644 tv/dummy_secrets/o2.pin delete mode 100644 tv/dummy_secrets/repos.nix delete mode 100644 tv/dummy_secrets/ssh.id_ed25519 delete mode 100644 tv/dummy_secrets/ssh.id_rsa delete mode 100644 tv/krops.nix delete mode 120000 tv/lib create mode 100644 tv/tombstone diff --git a/kartei/tv/hosts/alnus.nix b/kartei/tv/hosts/alnus.nix index e66236f1..099f3c74 100644 --- a/kartei/tv/hosts/alnus.nix +++ b/kartei/tv/hosts/alnus.nix @@ -1,5 +1,4 @@ { - ci = true; nets = { retiolum = { ip4.addr = "10.243.21.1"; diff --git a/kartei/tv/hosts/au.nix b/kartei/tv/hosts/au.nix index 44279b68..c897f9cb 100644 --- a/kartei/tv/hosts/au.nix +++ b/kartei/tv/hosts/au.nix @@ -1,5 +1,4 @@ { - ci = true; nets = { retiolum = { ip4.addr = "10.243.13.39"; diff --git a/kartei/tv/hosts/bu.nix b/kartei/tv/hosts/bu.nix index cbdf5af2..ca544c91 100644 --- a/kartei/tv/hosts/bu.nix +++ b/kartei/tv/hosts/bu.nix @@ -1,5 +1,4 @@ { - ci = true; nets = { retiolum = { ip4.addr = "10.243.13.36"; diff --git a/kartei/tv/hosts/mu.nix b/kartei/tv/hosts/mu.nix index e10694ec..4fb7165f 100644 --- a/kartei/tv/hosts/mu.nix +++ b/kartei/tv/hosts/mu.nix @@ -1,5 +1,4 @@ { - ci = true; nets = { retiolum = { ip4.addr = "10.243.20.1"; diff --git a/kartei/tv/hosts/nomic.nix b/kartei/tv/hosts/nomic.nix index 7c46dc40..ebb0edcf 100644 --- a/kartei/tv/hosts/nomic.nix +++ b/kartei/tv/hosts/nomic.nix @@ -1,5 +1,4 @@ { - ci = true; nets = { retiolum = { ip4.addr = "10.243.0.110"; diff --git a/kartei/tv/hosts/querel.nix b/kartei/tv/hosts/querel.nix index 6b9b9881..805eeab9 100644 --- a/kartei/tv/hosts/querel.nix +++ b/kartei/tv/hosts/querel.nix @@ -1,5 +1,4 @@ { - ci = true; nets = { retiolum = { ip4.addr = "10.243.22.22"; diff --git a/kartei/tv/hosts/ru.nix b/kartei/tv/hosts/ru.nix index 334df5d0..d1a2be27 100644 --- a/kartei/tv/hosts/ru.nix +++ b/kartei/tv/hosts/ru.nix @@ -1,5 +1,4 @@ { - ci = true; nets = { retiolum = { ip4.addr = "10.243.13.42"; diff --git a/kartei/tv/hosts/xu.nix b/kartei/tv/hosts/xu.nix index e943915e..7361092b 100644 --- a/kartei/tv/hosts/xu.nix +++ b/kartei/tv/hosts/xu.nix @@ -2,7 +2,6 @@ binary-cache = { pubkey = "xu-1:pYRENvaxZqGeImwLA9qHmRwHV4jfKaYx4u1VcZ31x0s="; }; - ci = true; nets = { retiolum = { ip4.addr = "10.243.13.38"; diff --git a/kartei/tv/hosts/zu.nix b/kartei/tv/hosts/zu.nix index 91270d57..c40de32a 100644 --- a/kartei/tv/hosts/zu.nix +++ b/kartei/tv/hosts/zu.nix @@ -1,5 +1,4 @@ { - ci = true; nets = { retiolum = { ip4.addr = "10.243.13.40"; diff --git a/tv/1systems/alnus/config.nix b/tv/1systems/alnus/config.nix deleted file mode 100644 index 90501d56..00000000 --- a/tv/1systems/alnus/config.nix +++ /dev/null @@ -1,87 +0,0 @@ -with import ./lib; -{ config, pkgs, ... }: { - imports = [ - - - - - ]; - - boot = { - initrd = { - availableKernelModules = [ "ahci" ]; - luks.devices.luksroot.device = "/dev/sda2"; - }; - }; - - environment.systemPackages = [ - pkgs.firefox - pkgs.networkmanagerapplet - (pkgs.pidgin.override { - plugins = [ pkgs.pidgin-otr ]; - }) - ]; - - fileSystems = { - "/boot" = { - device = "/dev/sda1"; - }; - "/" = { - device = "/dev/mapper/main-root"; - fsType = "ext4"; - options = [ "defaults" "noatime" ]; - }; - "/home" = { - device = "/dev/mapper/main-home"; - fsType = "ext4"; - options = [ "defaults" "noatime" ]; - }; - }; - - hardware = { - opengl.driSupport32Bit = true; - pulseaudio.enable = true; - }; - - i18n.defaultLocale = "de_DE.UTF-8"; - - krebs.build = { - host = config.krebs.hosts.alnus; - user = mkForce config.krebs.users.dv; - }; - - networking.networkmanager.enable = true; - - services.earlyoom.enable = true; - services.earlyoom.freeMemThreshold = 5; - systemd.services.earlyoom.environment.EARLYOOM_ARGS = toString [ - "--prefer '^(Web Content|Privileged Cont)$'" # firefox tabs - ]; - - services.xserver = { - enable = true; - layout = "de"; - xkbOptions = "eurosign:e"; - - libinput.enable = false; - synaptics = { - enable = true; - twoFingerScroll = true; - }; - }; - services.xserver.desktopManager.plasma5.enable = true; - services.xserver.displayManager.autoLogin.enable = true; - services.xserver.displayManager.autoLogin.user = "dv"; - - system.stateVersion = "22.05"; - - users.users.dv = { - inherit (config.krebs.users.dv) home uid; - isNormalUser = true; - extraGroups = [ - "audio" - "video" - "networkmanager" - ]; - }; -} diff --git a/tv/1systems/alnus/lib b/tv/1systems/alnus/lib deleted file mode 120000 index dc598c56..00000000 --- a/tv/1systems/alnus/lib +++ /dev/null @@ -1 +0,0 @@ -../lib \ No newline at end of file diff --git a/tv/1systems/au/config.nix b/tv/1systems/au/config.nix deleted file mode 100644 index 2521059b..00000000 --- a/tv/1systems/au/config.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ config, ... }: { - imports = [ - ./disks.nix - - - - - - ]; - - krebs.build.host = config.krebs.hosts.au; - - networking.wireless.enable = true; - networking.useDHCP = false; - networking.interfaces.enp0s25.useDHCP = true; - networking.interfaces.wlp3s0.useDHCP = true; - networking.interfaces.wwp0s29u1u4i6.useDHCP = true; - - system.stateVersion = "20.03"; - - tv.hw.screens.primary.width = 1920; - tv.hw.screens.primary.height = 1080; -} diff --git a/tv/1systems/au/disks.nix b/tv/1systems/au/disks.nix deleted file mode 100644 index 434de174..00000000 --- a/tv/1systems/au/disks.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ - boot.initrd.luks.devices.main.device = "/dev/sda2"; - fileSystems."/" = { - device = "/dev/main/root"; - options = ["defaults" "noatime" "commit=60"]; - }; - fileSystems."/boot" = { - device = "/dev/sda1"; - options = ["defaults" "noatime"]; - }; - fileSystems."/bku" = { - device = "/dev/main/bku"; - options = ["defaults" "noatime"]; - }; - fileSystems."/home" = { - device = "/dev/main/home"; - options = ["defaults" "noatime" "commit=60"]; - }; -} diff --git a/tv/1systems/au/lib b/tv/1systems/au/lib deleted file mode 120000 index dc598c56..00000000 --- a/tv/1systems/au/lib +++ /dev/null @@ -1 +0,0 @@ -../lib \ No newline at end of file diff --git a/tv/1systems/bu/config.nix b/tv/1systems/bu/config.nix deleted file mode 100644 index a3959cd8..00000000 --- a/tv/1systems/bu/config.nix +++ /dev/null @@ -1,35 +0,0 @@ -with import ./lib; -{ config, pkgs, ... }: { - imports = [ - ./disks.nix - - - - - - - - ]; - - krebs.build.host = config.krebs.hosts.bu; - - networking.wireless.enable = true; - networking.useDHCP = false; - networking.interfaces.enp0s25.useDHCP = true; - networking.interfaces.wlp3s0.useDHCP = true; - networking.interfaces.wwp0s29u1u4i6.useDHCP = true; - networking.wireless.interfaces = [ - "wlp3s0" - ]; - - programs.gnupg.agent.enable = true; - programs.gnupg.agent.pinentryFlavor = "gtk2"; - - services.earlyoom.enable = true; - services.earlyoom.freeMemThreshold = 5; - systemd.services.earlyoom.environment.EARLYOOM_ARGS = toString [ - "--prefer '(^|/)chromium$'" - ]; - - system.stateVersion = "21.11"; -} diff --git a/tv/1systems/bu/disks.nix b/tv/1systems/bu/disks.nix deleted file mode 100644 index deabefa7..00000000 --- a/tv/1systems/bu/disks.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ - boot.initrd.luks.devices.buda2.device = "/dev/sda2"; - fileSystems."/" = { - device = "buda2/root"; - fsType = "zfs"; - }; - fileSystems."/bku" = { - device = "buda2/bku"; - fsType = "zfs"; - }; - fileSystems."/home" = { - device = "buda2/home"; - fsType = "zfs"; - }; - fileSystems."/boot" = { - device = "/dev/sda1"; - fsType = "vfat"; - }; -} diff --git a/tv/1systems/bu/lib b/tv/1systems/bu/lib deleted file mode 120000 index dc598c56..00000000 --- a/tv/1systems/bu/lib +++ /dev/null @@ -1 +0,0 @@ -../lib \ No newline at end of file diff --git a/tv/1systems/lib b/tv/1systems/lib deleted file mode 120000 index dc598c56..00000000 --- a/tv/1systems/lib +++ /dev/null @@ -1 +0,0 @@ -../lib \ No newline at end of file diff --git a/tv/1systems/mu/config.nix b/tv/1systems/mu/config.nix deleted file mode 100644 index 00cdf84c..00000000 --- a/tv/1systems/mu/config.nix +++ /dev/null @@ -1,127 +0,0 @@ -with import ./lib; -{ config, pkgs, ... }: { - imports = [ - - - - - - ]; - - krebs.build.host = config.krebs.hosts.mu; - krebs.build.user = mkForce config.krebs.users.vv; - - tv.x0vncserver.enable = true; - - boot.initrd.luks.devices.muca.device = "/dev/sda2"; - boot.initrd.availableKernelModules = [ "ahci" ]; - boot.kernelModules = [ "fbcon" "kvm-intel" ]; - boot.kernelParams = [ "fsck.repair=yes" ]; - boot.extraModulePackages = [ ]; - - fileSystems = { - "/" = { - device = "/dev/mapper/muvga-root"; - fsType = "ext4"; - options = [ "defaults" "discard" ]; - }; - "/home" = { - device = "/dev/mapper/muvga-home"; - fsType = "ext4"; - options = [ "defaults" "discard" ]; - }; - "/boot" = { - device = "/dev/sda1"; - fsType = "vfat"; - }; - }; - - nixpkgs.config.allowUnfree = true; - hardware.opengl.driSupport32Bit = true; - - hardware.pulseaudio.enable = true; - - hardware.enableRedistributableFirmware = true; - - boot.loader.efi.canTouchEfiVariables = true; - boot.loader.systemd-boot.enable = true; - - networking.networkmanager.enable = true; - - # XXX reload to work around occasional "Failed to load firmware chunk!" - # TODO only do this if firmware is actually broken(?) - system.activationScripts.reload-iwlwifi = /* sh */ '' - ${pkgs.kmod}/bin/modprobe -vr iwlwifi - ${pkgs.kmod}/bin/modprobe -v iwlwifi - ''; - - environment.systemPackages = [ - pkgs.chromium - pkgs.firefox - pkgs.gimp - pkgs.iptables - pkgs.libreoffice - pkgs.plasma-pa - (pkgs.pidgin.override { - plugins = [ pkgs.pidgin-otr ]; - }) - pkgs.skypeforlinux - pkgs.slock - pkgs.tinc_pre - pkgs.vim - pkgs.xsane - - #pkgs.foomatic_filters - #pkgs.gutenprint - #pkgs.cups_pdf_filter - #pkgs.ghostscript - ]; - - - i18n.defaultLocale = "de_DE.UTF-8"; - - programs.ssh.startAgent = false; - - krebs.setuid = { - slock = { - filename = "${pkgs.slock}/bin/slock"; - mode = "4111"; - }; - }; - - security.pam.loginLimits = [ - # for jack - { domain = "@audio"; item = "memlock"; type = "-"; value = "unlimited"; } - { domain = "@audio"; item = "rtprio"; type = "-"; value = "99"; } - ]; - - fonts.fonts = [ - pkgs.xorg.fontschumachermisc - ]; - - services.xserver.enable = true; - services.xserver.layout = "de"; - services.xserver.xkbOptions = "eurosign:e"; - - # TODO this is host specific - services.xserver.libinput.enable = false; - services.xserver.synaptics = { - enable = true; - twoFingerScroll = true; - }; - - services.xserver.desktopManager.plasma5.enable = true; - - services.xserver.displayManager.autoLogin.enable = true; - services.xserver.displayManager.autoLogin.user = "vv"; - - users.users.vv = { - inherit (config.krebs.users.vv) home uid; - isNormalUser = true; - extraGroups = [ - "audio" - "video" - "networkmanager" - ]; - }; -} diff --git a/tv/1systems/mu/lib b/tv/1systems/mu/lib deleted file mode 120000 index dc598c56..00000000 --- a/tv/1systems/mu/lib +++ /dev/null @@ -1 +0,0 @@ -../lib \ No newline at end of file diff --git a/tv/1systems/nomic/config.nix b/tv/1systems/nomic/config.nix deleted file mode 100644 index 5bc25fd3..00000000 --- a/tv/1systems/nomic/config.nix +++ /dev/null @@ -1,62 +0,0 @@ -with import ./lib; -{ config, pkgs, ... }: { - krebs.build.host = config.krebs.hosts.nomic; - - imports = [ - - - - - - - - - - ]; - - boot.initrd.luks.devices.luks1.device = "/dev/sda2"; - - # Don't use UEFI because current disk was partitioned/formatted for AO753. - # TODO remove following bool.loader section after repartitioning/reformatting - boot.loader = { - grub = { - device = "/dev/sda"; - splashImage = null; - }; - systemd-boot.enable = mkForce false; - }; - - fileSystems."/" = - { device = "/dev/mapper/nomic1-root"; - fsType = "btrfs"; - }; - - fileSystems."/boot" = - { device = "/dev/sda1"; - fsType = "ext4"; - }; - - fileSystems."/home" = - { device = "/dev/mapper/nomic1-home"; - fsType = "btrfs"; - }; - - environment.systemPackages = with pkgs; [ - (writeDashBin "play" '' - set -euf - mpv() { exec ${mpv}/bin/mpv "$@"; } - case $1 in - deepmix) mpv http://deepmix.ru/deepmix128.pls;; - groovesalad) mpv http://somafm.com/play/groovesalad;; - ntslive) mpv http://listen2.ntslive.co.uk/listen.pls;; - *) - echo "$0: bad argument: $*" >&2 - exit 23 - esac - '') - gnupg - tmux - ]; - - networking.wireless.enable = true; -} diff --git a/tv/1systems/nomic/lib b/tv/1systems/nomic/lib deleted file mode 120000 index dc598c56..00000000 --- a/tv/1systems/nomic/lib +++ /dev/null @@ -1 +0,0 @@ -../lib \ No newline at end of file diff --git a/tv/1systems/querel/config.nix b/tv/1systems/querel/config.nix deleted file mode 100644 index 7ba7d162..00000000 --- a/tv/1systems/querel/config.nix +++ /dev/null @@ -1,86 +0,0 @@ -with import ./lib; -{ config, pkgs, ... }: { - imports = [ - - - ]; - - krebs.build.host = config.krebs.hosts.querel; - krebs.build.user = mkForce config.krebs.users.itak; - - boot.initrd.availableKernelModules = [ "ahci" ]; - boot.initrd.luks.devices.querel-luks1 = { - allowDiscards = true; - device = "/dev/sda2"; - }; - boot.kernelModules = [ "kvm-intel" ]; - boot.loader = { - efi.canTouchEfiVariables = true; - systemd-boot.enable = true; - }; - - environment.systemPackages = [ - pkgs.firefox - pkgs.gimp - pkgs.kate - pkgs.libreoffice - (pkgs.pidgin.override { - plugins = [ pkgs.pidgin-otr ]; - }) - pkgs.sxiv - pkgs.texlive.combined.scheme-full - pkgs.vim - pkgs.xsane - pkgs.zathura - ]; - - fileSystems = { - "/" = { - device = "/dev/mapper/querel-root"; - fsType = "ext4"; - options = [ "defaults" "discard" ]; - }; - "/home" = { - device = "/dev/mapper/querel-home"; - fsType = "ext4"; - options = [ "defaults" "discard" ]; - }; - "/boot" = { - device = "/dev/sda1"; - }; - }; - - hardware.enableRedistributableFirmware = true; - hardware.pulseaudio.enable = true; - - i18n.defaultLocale = "de_DE.UTF-8"; - - networking.networkmanager.enable = true; - - programs.ssh.startAgent = false; - - services.xserver.enable = true; - services.xserver.layout = "de"; - services.xserver.xkbOptions = "eurosign:e"; - - services.xserver.libinput.enable = false; - services.xserver.synaptics = { - enable = true; - twoFingerScroll = true; - }; - - services.xserver.desktopManager.plasma5.enable = true; - - services.xserver.displayManager.autoLogin.enable = true; - services.xserver.displayManager.autoLogin.user = "itak"; - - users.users.itak = { - inherit (config.krebs.users.itak) home uid; - isNormalUser = true; - extraGroups = [ - "audio" - "video" - "networkmanager" - ]; - }; -} diff --git a/tv/1systems/querel/lib b/tv/1systems/querel/lib deleted file mode 120000 index dc598c56..00000000 --- a/tv/1systems/querel/lib +++ /dev/null @@ -1 +0,0 @@ -../lib \ No newline at end of file diff --git a/tv/1systems/ru/config.nix b/tv/1systems/ru/config.nix deleted file mode 100644 index 0fc62167..00000000 --- a/tv/1systems/ru/config.nix +++ /dev/null @@ -1,37 +0,0 @@ -with import ./lib; -{ config, ... }: { - imports = [ - ../.. - ../../2configs/hw/winmax2.nix - ../../2configs/retiolum.nix - ../../2configs/wiregrill.nix - ]; - - boot.initrd.luks.devices.main.device = "/dev/nvme0n1p2"; - boot.loader.efi.canTouchEfiVariables = true; - boot.loader.systemd-boot.enable = true; - - fileSystems."/" = { - device = "/dev/mapper/ruvg0-root"; - fsType = "btrfs"; - options = ["defaults" "noatime" "compress=zstd"]; - }; - fileSystems."/boot" = { - device = "/dev/nvme0n1p1"; - fsType = "vfat"; - }; - fileSystems."/home" = { - device = "/dev/mapper/ruvg0-home"; - fsType = "btrfs"; - options = ["defaults" "noatime" "compress=zstd"]; - }; - fileSystems."/bku" = { - device = "/dev/mapper/ruvg0-bku"; - fsType = "btrfs"; - options = ["defaults" "noatime" "compress=zstd"]; - }; - - krebs.build.host = config.krebs.hosts.ru; - - system.stateVersion = "22.11"; -} diff --git a/tv/1systems/xu/config.nix b/tv/1systems/xu/config.nix deleted file mode 100644 index 83e17e1b..00000000 --- a/tv/1systems/xu/config.nix +++ /dev/null @@ -1,154 +0,0 @@ -with import ./lib; -{ config, pkgs, ... }: { - krebs.build.host = config.krebs.hosts.xu; - - imports = [ - - ../../2configs/autotether.nix - - - - - - - - - - - - - - - - { - environment.systemPackages = with pkgs; [ - - - # root - cryptsetup - - # tv - bc - bind # dig - brain - cac-api - dic - file - gnupg1compat - haskellPackages.hledger - jq - mkpasswd - netcat - netcup - nmap - p7zip - (pkgs.pass.withExtensions (ext: [ - ext.pass-otp - ])) - q - qrencode - texlive.combined.scheme-full - tmux - - #ack - #apache-httpd - #ascii - #emacs - #es - #esniper - #gcc - #gptfdisk - #graphviz - #haskellPackages.cabal2nix - #haskellPackages.ghc - #haskellPackages.shake - #hdparm - #i7z - #iftop - #imagemagick - #inotifyTools - #iodine - #iotop - #lshw - #lsof - #minicom - #mtools - #ncmpc - #nethogs - #nix-prefetch-scripts #cvs bug - #openssl - #openswan - #parted - #perl - #powertop - #ppp - #proot - #pythonPackages.arandr - #pythonPackages.youtube-dl - #racket - #rxvt_unicode-with-plugins - #scrot - #sec - #silver-searcher - #sloccount - #smartmontools - #socat - #sshpass - #strongswan - #sysdig - #sysstat - #tcpdump - #tlsdate - #unetbootin - #utillinuxCurses - #xdotool - #xkill - #xl2tpd - #xsel - - unison - ]; - } - ]; - - boot.initrd.luks.devices.xuca.device = "/dev/sda2"; - - fileSystems = { - "/" = { - device = "/dev/mapper/xuvga-root"; - fsType = "btrfs"; - options = ["defaults" "noatime" "ssd" "compress=lzo"]; - }; - "/bku" = { - device = "/dev/mapper/xuvga-bku"; - fsType = "btrfs"; - options = ["defaults" "noatime" "ssd" "compress=lzo"]; - }; - "/home" = { - device = "/dev/mapper/xuvga-home"; - fsType = "btrfs"; - options = ["defaults" "noatime" "ssd" "compress=lzo"]; - }; - "/boot" = { - device = "/dev/sda1"; - }; - }; - - environment.systemPackages = with pkgs; [ - ethtool - tinc_pre - iptables - #jack2 - - gptfdisk - ]; - - networking.wireless.enable = true; - - #services.bitlbee.enable = true; - #services.tor.client.enable = true; - #services.tor.enable = true; - - # The NixOS release to be compatible with for stateful data such as databases. - system.stateVersion = "15.09"; -} diff --git a/tv/1systems/xu/lib b/tv/1systems/xu/lib deleted file mode 120000 index dc598c56..00000000 --- a/tv/1systems/xu/lib +++ /dev/null @@ -1 +0,0 @@ -../lib \ No newline at end of file diff --git a/tv/1systems/zu/config.nix b/tv/1systems/zu/config.nix deleted file mode 100644 index 169fa6bd..00000000 --- a/tv/1systems/zu/config.nix +++ /dev/null @@ -1,51 +0,0 @@ -with import ./lib; -{ config, pkgs, ... }: { - krebs.build.host = config.krebs.hosts.zu; - - imports = [ - - - - - - - - - - - ]; - - boot.initrd.luks.devices.zuca.device = "/dev/sda2"; - - fileSystems = { - "/" = { - device = "/dev/mapper/zuvga-root"; - fsType = "btrfs"; - options = ["defaults" "noatime" "ssd" "compress=lzo"]; - }; - "/bku" = { - device = "/dev/mapper/zuvga-bku"; - fsType = "btrfs"; - options = ["defaults" "noatime" "ssd" "compress=lzo"]; - }; - "/home" = { - device = "/dev/mapper/zuvga-home"; - fsType = "btrfs"; - options = ["defaults" "noatime" "ssd" "compress=lzo"]; - }; - "/boot" = { - device = "/dev/sda1"; - }; - }; - - networking.wireless.enable = true; - - services.printing.enable = true; - - #services.bitlbee.enable = true; - #services.tor.client.enable = true; - #services.tor.enable = true; - - # The NixOS release to be compatible with for stateful data such as databases. - system.stateVersion = "15.09"; -} diff --git a/tv/2configs/autotether.nix b/tv/2configs/autotether.nix deleted file mode 100644 index 43b5575c..00000000 --- a/tv/2configs/autotether.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ config, pkgs, ... }: let - cfg.serial = "17e064850405"; -in { - systemd.services.usb_tether.serviceConfig = { - SyslogIdentifier = "usb_tether"; - ExecStartPre = "${pkgs.android-tools}/bin/adb -s ${cfg.serial} wait-for-device"; - ExecStart = "${pkgs.android-tools}/bin/adb -s ${cfg.serial} shell svc usb setFunctions rndis"; - }; - services.udev.extraRules = /* sh */ '' - ACTION=="add", SUBSYSTEM=="net", KERNEL=="usb*", NAME="android" - - ACTION=="add", SUBSYSTEM=="usb", ATTR{serial}=="${cfg.serial}", \ - TAG+="systemd", ENV{SYSTEMD_WANTS}="usb_tether.service" - ''; - systemd.network.networks.android = { - matchConfig.Name = "android"; - DHCP = "yes"; - }; -} diff --git a/tv/2configs/backup.nix b/tv/2configs/backup.nix deleted file mode 100644 index 56c04c4e..00000000 --- a/tv/2configs/backup.nix +++ /dev/null @@ -1,109 +0,0 @@ -with import ./lib; -{ config, pkgs, ... }: { - krebs.backup.plans = { - } // mapAttrs (_: recursiveUpdate { - snapshots = { - daily = { format = "%Y-%m-%d"; retain = 7; }; - weekly = { format = "%YW%W"; retain = 4; }; - monthly = { format = "%Y-%m"; retain = 12; }; - yearly = { format = "%Y"; }; - }; - }) { - bu-home-xu = { - method = "push"; - src = { host = config.krebs.hosts.bu; path = "/home"; }; - dst = { host = config.krebs.hosts.xu; path = "/bku/bu-home"; }; - startAt = "05:20"; - }; - bu-home-zu = { - method = "push"; - src = { host = config.krebs.hosts.bu; path = "/home"; }; - dst = { host = config.krebs.hosts.zu; path = "/bku/bu-home"; }; - startAt = "05:25"; - }; - nomic-home-xu = { - method = "push"; - src = { host = config.krebs.hosts.nomic; path = "/home"; }; - dst = { host = config.krebs.hosts.xu; path = "/bku/nomic-home"; }; - startAt = "05:00"; - }; - nomic-home-zu = { - method = "push"; - src = { host = config.krebs.hosts.nomic; path = "/home"; }; - dst = { host = config.krebs.hosts.zu; path = "/bku/nomic-home"; }; - startAt = "04:20"; - }; - nomic-pull-querel-home = { - method = "pull"; - src = { host = config.krebs.hosts.querel; path = "/home"; }; - dst = { host = config.krebs.hosts.nomic; path = "/fs/ponyhof/bku/querel-home"; }; - startAt = "22:00"; - }; - xu-home-bu = { - method = "push"; - src = { host = config.krebs.hosts.xu; path = "/home"; }; - dst = { host = config.krebs.hosts.bu; path = "/bku/xu-home"; }; - startAt = "04:50"; - }; - xu-home-nomic = { - method = "push"; - src = { host = config.krebs.hosts.xu; path = "/home"; }; - dst = { host = config.krebs.hosts.nomic; path = "/fs/cis3hG/bku/xu-home"; }; - startAt = "05:20"; - }; - xu-home-zu = { - method = "push"; - src = { host = config.krebs.hosts.xu; path = "/home"; }; - dst = { host = config.krebs.hosts.zu; path = "/bku/xu-home"; }; - startAt = "06:20"; - }; - xu-pull-ni-ejabberd = { - method = "pull"; - src = { host = config.krebs.hosts.ni; path = "/var/lib/ejabberd"; }; - dst = { host = config.krebs.hosts.xu; path = "/bku/ni-ejabberd"; }; - startAt = "07:00"; - }; - xu-pull-ni-home = { - method = "pull"; - src = { host = config.krebs.hosts.ni; path = "/home"; }; - dst = { host = config.krebs.hosts.xu; path = "/bku/ni-home"; }; - startAt = "07:00"; - }; - zu-home-xu = { - method = "push"; - src = { host = config.krebs.hosts.zu; path = "/home"; }; - dst = { host = config.krebs.hosts.xu; path = "/bku/zu-home"; }; - startAt = "05:00"; - }; - zu-pull-ni-ejabberd = { - method = "pull"; - src = { host = config.krebs.hosts.ni; path = "/var/lib/ejabberd"; }; - dst = { host = config.krebs.hosts.zu; path = "/bku/ni-ejabberd"; }; - startAt = "06:00"; - }; - zu-pull-ni-home = { - method = "pull"; - src = { host = config.krebs.hosts.ni; path = "/home"; }; - dst = { host = config.krebs.hosts.zu; path = "/bku/ni-home"; }; - startAt = "06:30"; - }; - } // mapAttrs (_: recursiveUpdate { - snapshots = { - minutely = { format = "%Y-%m-%dT%H:%M"; retain = 3; }; - hourly = { format = "%Y-%m-%dT%H"; retain = 3; }; - daily = { format = "%Y-%m-%d"; retain = 3; }; - }; - startAt = null; - }) { - xu-test-push-xu = { - method = "push"; - src = { host = config.krebs.hosts.xu; path = "/tmp/xu-bku-test-data"; }; - dst = { host = config.krebs.hosts.xu; path = "/bku/xu-test-push"; }; - }; - xu-test-pull-xu = { - method = "pull"; - src = { host = config.krebs.hosts.xu; path = "/tmp/xu-bku-test-data"; }; - dst = { host = config.krebs.hosts.xu; path = "/bku/xu-test-pull"; }; - }; - }; -} diff --git a/tv/2configs/bash/default.nix b/tv/2configs/bash/default.nix deleted file mode 100644 index 57801d96..00000000 --- a/tv/2configs/bash/default.nix +++ /dev/null @@ -1,67 +0,0 @@ -with import ./lib; -{ config, pkgs, ... }: { - programs.bash = { - interactiveShellInit = /* sh */ '' - HISTCONTROL='erasedups:ignorespace' - HISTSIZE=900001 - HISTFILESIZE=$HISTSIZE - HISTTIMEFORMAT= - - shopt -s checkhash - shopt -s histappend histreedit histverify - shopt -s no_empty_cmd_completion - complete -d cd - - case $UID in - ${shell.escape (toString config.krebs.users.tv.uid)}) - if test ''${SHLVL-1} = 1 && test -n "''${DISPLAY-}"; then - _CURRENT_DESKTOP_NAME=''${_CURRENT_DESKTOP_NAME-$( - ${pkgs.xorg.xprop}/bin/xprop -notype -root \ - 32i _NET_CURRENT_DESKTOP \ - 8s _NET_DESKTOP_NAMES \ - | - ${pkgs.gnused}/bin/sed -r 's/.* = //;s/"//g;s/, /\a/g' | - { - read -r _NET_CURRENT_DESKTOP - IFS=$'\a' read -ra _NET_DESKTOP_NAMES - echo "''${_NET_DESKTOP_NAMES[$_NET_CURRENT_DESKTOP]}" - } - )} - case $_CURRENT_DESKTOP_NAME in - stockholm) - cd ~/stockholm - ;; - esac - fi - - export NIX_PATH="stockholm=$HOME/stockholm:$NIX_PATH" - ;; - esac - - ${pkgs.bash-fzf-history.bind} - - if test -n "''${BASH_EXTRA_INIT-}"; then - . "$BASH_EXTRA_INIT" - fi - ''; - promptInit = /* sh */ '' - case $UID in - 0) - PS1='\[\e[1;31m\]\w\[\e[0m\] ' - ;; - ${toString config.krebs.build.user.uid}) - PS1='\[\e[1;32m\]\w\[\e[0m\] ' - ;; - *) - PS1='\[\e[1;35m\]\u \[\e[1;32m\]\w\[\e[0m\] ' - ;; - esac - if test -n "$SSH_CLIENT"; then - PS1='\[\e[35m\]\h'" $PS1" - fi - if test -n "$SSH_AGENT_PID"; then - PS1="ssh-agent[$SSH_AGENT_PID] $PS1" - fi - ''; - }; -} diff --git a/tv/2configs/bash/lib b/tv/2configs/bash/lib deleted file mode 120000 index dc598c56..00000000 --- a/tv/2configs/bash/lib +++ /dev/null @@ -1 +0,0 @@ -../lib \ No newline at end of file diff --git a/tv/2configs/binary-cache/default.nix b/tv/2configs/binary-cache/default.nix deleted file mode 100644 index 5b4e7510..00000000 --- a/tv/2configs/binary-cache/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ config, lib, pkgs, ... }: with import ./lib; -{ - environment.etc."binary-cache.pubkey".text = - config.krebs.build.host.binary-cache.pubkey; - - nixpkgs.overlays = [ - (self: super: { - nix-serve = self.haskellPackages.nix-serve-ng; - }) - ]; - - services.nix-serve = { - enable = true; - secretKeyFile = "${config.krebs.secret.directory}/nix-serve.key"; - }; - - services.nginx = { - enable = true; - virtualHosts.nix-serve = { - serverAliases = [ - "cache.${config.krebs.build.host.name}.hkw" - "cache.${config.krebs.build.host.name}.r" - ]; - locations."/".extraConfig = '' - proxy_pass http://localhost:${toString config.services.nix-serve.port}; - ''; - }; - }; -} diff --git a/tv/2configs/binary-cache/lib b/tv/2configs/binary-cache/lib deleted file mode 120000 index dc598c56..00000000 --- a/tv/2configs/binary-cache/lib +++ /dev/null @@ -1 +0,0 @@ -../lib \ No newline at end of file diff --git a/tv/2configs/br.nix b/tv/2configs/br.nix deleted file mode 100644 index 47d657c4..00000000 --- a/tv/2configs/br.nix +++ /dev/null @@ -1,49 +0,0 @@ -with import ./lib; -{ config, modulesPath, pkgs, ... }: { - - imports = [ - (modulesPath + "/services/hardware/sane_extra_backends/brscan4.nix") - ]; - - krebs.nixpkgs.allowUnfreePredicate = pkg: any (eq (packageName pkg)) [ - "brother-udev-rule-type1" - "brscan4" - "brscan4-etc-files" - "mfcl2700dnlpr" - ]; - - hardware.sane = { - enable = true; - brscan4 = { - enable = true; - netDevices = { - bra = { - model = "MFCL2700DN"; - ip = "10.23.1.214"; - }; - }; - }; - }; - - services.saned.enable = true; - - # usage: scanimage -d "$(find-scanner bra)" --batch --format=tiff --resolution 150 -x 211 -y 298 - environment.systemPackages = [ - (pkgs.writeDashBin "find-scanner" '' - set -efu - name=$1 - ${pkgs.sane-backends}/bin/scanimage -f '%m %d - ' \ - | ${pkgs.gawk}/bin/awk -v dev="*$name" '$1 == dev { print $2; exit }' \ - | ${pkgs.gnugrep}/bin/grep . - '') - ]; - - services.printing = { - enable = true; - drivers = [ - pkgs.mfcl2700dncupswrapper - ]; - }; - -} diff --git a/tv/2configs/default.nix b/tv/2configs/default.nix deleted file mode 100644 index 91aad54c..00000000 --- a/tv/2configs/default.nix +++ /dev/null @@ -1,137 +0,0 @@ -with import ./lib; -{ config, pkgs, ... }: { - boot.tmpOnTmpfs = true; - - krebs.enable = true; - - krebs.build.user = config.krebs.users.tv; - - networking.hostId = mkDefault (hashToLength 8 config.networking.hostName); - networking.hostName = config.krebs.build.host.name; - - imports = [ - ./backup.nix - ./bash - ./htop.nix - ./nets/hkw.nix - ./networkd.nix - ./nginx - ./nix.nix - ./pki - ./ssh.nix - ./sshd.nix - ./vim.nix - ./xdg.nix - { - users = { - defaultUserShell = "/run/current-system/sw/bin/bash"; - mutableUsers = false; - users = { - root = { - openssh.authorizedKeys.keys = [ - config.krebs.users.tv.pubkey - ]; - }; - tv = { - inherit (config.krebs.users.tv) home uid; - isNormalUser = true; - extraGroups = [ "tv" ]; - }; - }; - }; - } - { - i18n.defaultLocale = mkDefault "C.UTF-8"; - security.sudo.extraConfig = '' - Defaults env_keep+="SSH_CLIENT _CURRENT_DESKTOP_NAME" - Defaults mailto="${config.krebs.users.tv.mail}" - Defaults !lecture - ''; - time.timeZone = "Europe/Berlin"; - } - - { - nixpkgs.config.allowUnfree = false; - } - { - environment.homeBinInPath = true; - - environment.profileRelativeEnvVars.PATH = mkForce [ "/bin" ]; - - environment.systemPackages = with pkgs; [ - rxvt_unicode.terminfo - ]; - - environment.shellAliases = mkForce { - gp = "${pkgs.pari}/bin/gp -q"; - df = "df -h"; - du = "du -h"; - - # TODO alias cannot contain #\' - # "ps?" = "ps ax | head -n 1;ps ax | fgrep -v ' grep --color=auto ' | grep"; - - ls = "ls -h --color=auto --group-directories-first"; - dmesg = "dmesg -L --reltime"; - view = "vim -R"; - }; - - environment.variables = { - NIX_PATH = mkForce (concatStringsSep ":" [ - "secrets=/var/src/stockholm/null" - "/var/src" - ]); - }; - } - - { - services.cron.enable = false; - services.ntp.enable = false; - services.timesyncd.enable = true; - } - - { - boot.kernel.sysctl = { - # Enable IPv6 Privacy Extensions - # - # XXX use mkForce here because since NixOS 21.11 there's a collision in - # net.ipv6.conf.default.use_tempaddr, and boot.kernel.sysctl incapable - # of merging. - # - # XXX net.ipv6.conf.all.use_tempaddr is set because it was mentioned in - # https://tldp.org/HOWTO/Linux+IPv6-HOWTO/ch06s05.html - # TODO check if that is really necessary, otherwise we can rely solely - # on networking.tempAddresses in the future (when nothing is <21.11) - "net.ipv6.conf.all.use_tempaddr" = mkForce 2; - "net.ipv6.conf.default.use_tempaddr" = mkForce 2; - }; - } - - { - tv.iptables.enable = true; - tv.iptables.accept-echo-request = "internet"; - } - - { - services.journald.extraConfig = '' - SystemMaxUse=1G - RuntimeMaxUse=128M - ''; - } - - { - environment.systemPackages = [ - pkgs.field - pkgs.get - pkgs.git - pkgs.git-crypt - pkgs.git-preview - pkgs.hashPassword - pkgs.htop - pkgs.kpaste - pkgs.nix-prefetch-scripts - pkgs.ovh-zone - pkgs.push - ]; - } - ]; -} diff --git a/tv/2configs/elm-packages-proxy.nix b/tv/2configs/elm-packages-proxy.nix deleted file mode 100644 index caea1880..00000000 --- a/tv/2configs/elm-packages-proxy.nix +++ /dev/null @@ -1,359 +0,0 @@ -{ config, lib, pkgs, ... }: let - - cfg.nameserver = "1.1.1.1"; - cfg.packageDir = "/var/lib/elm-packages"; - cfg.port = 7782; - - # TODO secret files - cfg.htpasswd = "/var/lib/certs/package.elm-lang.org/htpasswd"; - cfg.sslCertificate = "/var/lib/certs/package.elm-lang.org/fullchain.pem"; - cfg.sslCertificateKey = "/var/lib/certs/package.elm-lang.org/key.pem"; - - semverRegex = - "(?0|[1-9]\\d*)\\.(?0|[1-9]\\d*)\\.(?0|[1-9]\\d*)(?:-(?(?:0|[1-9]\\d*|\\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\\.(?:0|[1-9]\\d*|\\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(?:\\+(?[0-9a-zA-Z-]+(?:\\.[0-9a-zA-Z-]+)*))?"; - -in { - services.nginx.virtualHosts."package.elm-lang.org" = { - addSSL = true; - - sslCertificate = cfg.sslCertificate; - sslCertificateKey = cfg.sslCertificateKey; - - locations."/all-packages".extraConfig = '' - proxy_pass http://127.0.0.1:${toString config.krebs.htgen.elm-packages-proxy.port}; - proxy_pass_header Server; - ''; - - locations."/all-packages/since/".extraConfig = '' - proxy_pass http://127.0.0.1:${toString config.krebs.htgen.elm-packages-proxy.port}; - proxy_pass_header Server; - ''; - - locations."~ ^/packages/(?[A-Za-z0-9-]+)/(?[A-Za-z0-9-]+)/(?${semverRegex})\$".extraConfig = '' - auth_basic "Restricted Area"; - auth_basic_user_file ${cfg.htpasswd}; - - proxy_set_header X-User $remote_user; - proxy_set_header X-Author $author; - proxy_set_header X-Package $pname; - proxy_set_header X-Version $version; - proxy_pass_header Server; - - proxy_pass http://127.0.0.1:${toString config.krebs.htgen.elm-packages-proxy.port}; - ''; - - locations."~ ^/packages/(?[A-Za-z0-9-]+)/(?[A-Za-z0-9-]+)/(?${semverRegex})/(?:zipball|elm.json|endpoint.json)\$".extraConfig = '' - set $zipball "${cfg.packageDir}/$author/$pname/$version/zipball"; - proxy_set_header X-Author $author; - proxy_set_header X-Package $pname; - proxy_set_header X-Version $version; - proxy_set_header X-Zipball $zipball; - proxy_pass_header Server; - resolver ${cfg.nameserver}; - - if (-f $zipball) { - set $new_uri http://127.0.0.1:${toString config.krebs.htgen.elm-packages-proxy.port}; - } - if (!-f $zipball) { - set $new_uri https://package.elm-lang.org$request_uri; - } - - proxy_pass $new_uri; - ''; - - locations."/search.json".extraConfig = '' - proxy_pass http://127.0.0.1:${toString config.krebs.htgen.elm-packages-proxy.port}; - proxy_pass_header Server; - ''; - }; - - krebs.htgen.elm-packages-proxy = { - port = cfg.port; - script = /* sh */ ''. ${pkgs.writeDash "elm-packages-proxy.sh" '' - PATH=${lib.makeBinPath [ - pkgs.attr - pkgs.coreutils - pkgs.curl - pkgs.findutils - pkgs.gnugrep - pkgs.jq - pkgs.p7zip - ]} - export PATH - file_response() {( - status_code=$1 - status_reason=$2 - file=$3 - content_type=$4 - - content_length=$(wc -c "$file" | cut -d\ -f1) - - printf "HTTP/1.1 $status_code $status_reason\r\n" - printf 'Connection: close\r\n' - printf 'Content-Length: %d\r\n' "$content_length" - printf 'Content-Type: %s\r\n' "$content_type" - printf 'Server: %s\r\n' "$Server" - printf '\r\n' - cat "$file" - )} - string_response() {( - status_code=$1 - status_reason=$2 - response_body=$3 - content_type=$4 - - printf "HTTP/1.1 $status_code $status_reason\r\n" - printf 'Connection: close\r\n' - printf 'Content-Length: %d\r\n' "$(expr ''${#response_body} + 1)" - printf 'Content-Type: %s\r\n' "$content_type" - printf 'Server: %s\r\n' "$Server" - printf '\r\n' - printf '%s\n' "$response_body" - )} - - case "$Method $Request_URI" in - 'GET /packages/'*) - - author=$req_x_author - pname=$req_x_package - version=$req_x_version - - zipball=${cfg.packageDir}/$author/$pname/$version/zipball - elmjson=$HOME/cache/$author%2F$pname%2F$version%2Felm.json - endpointjson=$HOME/cache/$author%2F$pname%2F$version%2Fendpoint.json - mkdir -p "$HOME/cache" - - case $(basename $Request_URI) in - zipball) - file_response 200 OK "$zipball" application/zip - exit - ;; - elm.json) - if ! test -f "$elmjson"; then - 7z x -so "$zipball" \*/elm.json > "$elmjson" - fi - file_response 200 OK "$elmjson" 'application/json; charset=UTF-8' - exit - ;; - endpoint.json) - if ! test -f "$endpointjson"; then - hash=$(sha1sum "$zipball" | cut -d\ -f1) - url=https://package.elm-lang.org/packages/$author/$pname/$version/zipball - jq -n \ - --arg hash "$hash" \ - --arg url "$url" \ - '{ $hash, $url }' \ - > "$endpointjson" - fi - file_response 200 OK "$endpointjson" 'application/json; charset=UTF-8' - exit - ;; - esac - ;; - 'POST /packages/'*) - - author=$req_x_author - pname=$req_x_package - user=$req_x_user - version=$req_x_version - - action=uploading - force=''${req_x_force-false} - zipball=${cfg.packageDir}/$author/$pname/$version/zipball - elmjson=$HOME/cache/$author%2F$pname%2F$version%2Felm.json - endpointjson=$HOME/cache/$author%2F$pname%2F$version%2Fendpoint.json - - if test -e "$zipball"; then - if test "$force" = true; then - zipball_owner=$(attr -q -g X-User "$zipball" || :) - if test "$zipball_owner" = "$req_x_user"; then - action=replacing - rm -f "$elmjson" - rm -f "$endpointjson" - else - string_response 403 Forbidden \ - "package already exists: $author/$pname@$version" \ - text/plain - exit - fi - else - string_response 409 Conflict \ - "package already exists: $author/$pname@$version" \ - text/plain - exit - fi - fi - - echo "user $user is $action package $author/$pname@$version" >&2 - # TODO check package - mkdir -p "$(dirname "$zipball")" - head -c $req_content_length > "$zipball" - - attr -q -s X-User -V "$user" "$zipball" || : - - string_response 200 OK \ - "package created: $author/$pname@$version" \ - text/plain - - exit - ;; - 'DELETE /packages/'*) - - author=$req_x_a