From 67def2c04a8ce910033c5d4d22dda25b6fa85b7b Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Tue, 1 Aug 2017 10:47:44 +0200
Subject: tv: add krebs-pages mirror at krebs.xu.r

---
 tv/1systems/xu/config.nix | 1 +
 1 file changed, 1 insertion(+)

(limited to 'tv')

diff --git a/tv/1systems/xu/config.nix b/tv/1systems/xu/config.nix
index 2bffdddb..e7516a45 100644
--- a/tv/1systems/xu/config.nix
+++ b/tv/1systems/xu/config.nix
@@ -13,6 +13,7 @@ with import <stockholm/lib>;
     <stockholm/tv/2configs/gitrepos.nix>
     <stockholm/tv/2configs/mail-client.nix>
     <stockholm/tv/2configs/man.nix>
+    <stockholm/tv/2configs/nginx/krebs-pages.nix>
     <stockholm/tv/2configs/nginx/public_html.nix>
     <stockholm/tv/2configs/pulse.nix>
     <stockholm/tv/2configs/retiolum.nix>
-- 
cgit v1.2.3


From 8f5fc9bc4fff53936e8bba5b2a4de3d362b94f09 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Tue, 1 Aug 2017 11:28:25 +0200
Subject: tv sudo: env_keep += XMONAD_SPAWN_WORKSPACE

---
 tv/2configs/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'tv')

diff --git a/tv/2configs/default.nix b/tv/2configs/default.nix
index b5931109..420548bc 100644
--- a/tv/2configs/default.nix
+++ b/tv/2configs/default.nix
@@ -47,7 +47,7 @@ in {
     {
       security.hideProcessInformation = true;
       security.sudo.extraConfig = ''
-        Defaults env_keep+="SSH_CLIENT"
+        Defaults env_keep+="SSH_CLIENT XMONAD_SPAWN_WORKSPACE"
         Defaults mailto="${config.krebs.users.tv.mail}"
         Defaults !lecture
       '';
-- 
cgit v1.2.3


From 2f52158dec91a87cddd3e643f29870a6acc233f6 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Tue, 1 Aug 2017 11:30:16 +0200
Subject: tv: drop explicit stockholm deps

---
 tv/2configs/default.nix | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

(limited to 'tv')

diff --git a/tv/2configs/default.nix b/tv/2configs/default.nix
index 420548bc..834a8908 100644
--- a/tv/2configs/default.nix
+++ b/tv/2configs/default.nix
@@ -21,16 +21,6 @@ in {
     ./sshd.nix
     ./vim.nix
     ./xdg.nix
-    {
-      # stockholm dependencies
-      environment.systemPackages = with pkgs; [
-        git
-        gnumake
-        hashPassword
-        populate
-        whatsupnix
-      ];
-    }
     {
       users = {
         defaultUserShell = "/run/current-system/sw/bin/bash";
@@ -142,6 +132,8 @@ in {
     {
       environment.systemPackages = [
         pkgs.get
+        pkgs.git
+        pkgs.hashPassword
         pkgs.htop
         pkgs.kpaste
         pkgs.krebspaste
-- 
cgit v1.2.3


From e19b506f36c8848ece02d7796a91ff0634191609 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Tue, 1 Aug 2017 12:15:45 +0200
Subject: tv retiolum: LocalDiscovery = yes

---
 tv/2configs/retiolum.nix | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'tv')

diff --git a/tv/2configs/retiolum.nix b/tv/2configs/retiolum.nix
index a914dad4..9940b102 100644
--- a/tv/2configs/retiolum.nix
+++ b/tv/2configs/retiolum.nix
@@ -10,6 +10,9 @@ with import <stockholm/lib>;
       "ni"
       "prism"
     ];
+    extraConfig = ''
+      LocalDiscovery = yes
+    '';
     tincPackage = pkgs.tinc_pre;
   };
   tv.iptables.input-internet-accept-tcp = singleton "tinc";
-- 
cgit v1.2.3


From fc59b6c395ffd68d7cd0504d1745fdc08e521525 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Tue, 1 Aug 2017 19:56:42 +0200
Subject: tv test system: RIP

It was committed by accident.
---
 tv/1systems/test/source.nix | 3 ---
 1 file changed, 3 deletions(-)
 delete mode 100644 tv/1systems/test/source.nix

(limited to 'tv')

diff --git a/tv/1systems/test/source.nix b/tv/1systems/test/source.nix
deleted file mode 100644
index f756b858..00000000
--- a/tv/1systems/test/source.nix
+++ /dev/null
@@ -1,3 +0,0 @@
-import <stockholm/tv/source.nix> {
-  name = "test";
-}
-- 
cgit v1.2.3


From f51f58f5ede75767b27354646d055649d7e37d82 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Tue, 1 Aug 2017 20:07:17 +0200
Subject: tv: only xu is a virtualbox host

---
 tv/1systems/wu/config.nix | 2 --
 tv/1systems/xu/config.nix | 4 ++--
 tv/1systems/zu/config.nix | 2 --
 3 files changed, 2 insertions(+), 6 deletions(-)

(limited to 'tv')

diff --git a/tv/1systems/wu/config.nix b/tv/1systems/wu/config.nix
index 1e28cc78..9767f467 100644
--- a/tv/1systems/wu/config.nix
+++ b/tv/1systems/wu/config.nix
@@ -169,6 +169,4 @@ with import <stockholm/lib>;
     KERNEL=="rtc0", GROUP="audio"
     KERNEL=="hpet", GROUP="audio"
   '';
-
-  virtualisation.virtualbox.host.enable = true;
 }
diff --git a/tv/1systems/xu/config.nix b/tv/1systems/xu/config.nix
index e7516a45..2c5e827a 100644
--- a/tv/1systems/xu/config.nix
+++ b/tv/1systems/xu/config.nix
@@ -167,9 +167,9 @@ with import <stockholm/lib>;
   #services.bitlbee.enable = true;
   #services.tor.client.enable = true;
   #services.tor.enable = true;
-  #services.virtualboxHost.enable = true;
-
 
   # The NixOS release to be compatible with for stateful data such as databases.
   system.stateVersion = "15.09";
+
+  virtualisation.virtualbox.host.enable = true;
 }
diff --git a/tv/1systems/zu/config.nix b/tv/1systems/zu/config.nix
index d2aab8c5..8eb64a27 100644
--- a/tv/1systems/zu/config.nix
+++ b/tv/1systems/zu/config.nix
@@ -162,8 +162,6 @@ with import <stockholm/lib>;
   #services.bitlbee.enable = true;
   #services.tor.client.enable = true;
   #services.tor.enable = true;
-  #services.virtualboxHost.enable = true;
-
 
   # The NixOS release to be compatible with for stateful data such as databases.
   system.stateVersion = "15.09";
-- 
cgit v1.2.3


From 11a65914542870cf5326ea602926b55553362b17 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Tue, 1 Aug 2017 20:09:48 +0200
Subject: tv zu: drop test secret-file

---
 tv/1systems/zu/config.nix | 6 ------
 1 file changed, 6 deletions(-)

(limited to 'tv')

diff --git a/tv/1systems/zu/config.nix b/tv/1systems/zu/config.nix
index 8eb64a27..272fba88 100644
--- a/tv/1systems/zu/config.nix
+++ b/tv/1systems/zu/config.nix
@@ -6,12 +6,6 @@ with import <stockholm/lib>;
   krebs.build.host = config.krebs.hosts.zu;
 
   imports = [
-    {
-      options.tv.test.sercret-file = mkOption {
-        type = types.secret-file;
-        default = {};
-      };
-    }
     <stockholm/tv>
     <stockholm/tv/2configs/hw/x220.nix>
     <stockholm/tv/2configs/exim-retiolum.nix>
-- 
cgit v1.2.3


From e749d26c4fd2401b7f8e0293aaf780b4700af3c1 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Tue, 1 Aug 2017 20:11:14 +0200
Subject: tv public_html: add server aliases for gg23

---
 tv/2configs/nginx/public_html.nix | 1 +
 1 file changed, 1 insertion(+)

(limited to 'tv')

diff --git a/tv/2configs/nginx/public_html.nix b/tv/2configs/nginx/public_html.nix
index a686d281..cc7a3989 100644
--- a/tv/2configs/nginx/public_html.nix
+++ b/tv/2configs/nginx/public_html.nix
@@ -9,6 +9,7 @@ with import <stockholm/lib>;
       serverAliases = [
         "localhost"
         "${config.krebs.build.host.name}"
+        "${config.krebs.build.host.name}.gg23"
         "${config.krebs.build.host.name}.r"
       ];
       locations."~ ^/~(.+?)(/.*)?\$".extraConfig = ''
-- 
cgit v1.2.3


From 06d2c2d773559c0c059768e1ab8a350ae2a82c0e Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Tue, 1 Aug 2017 20:12:04 +0200
Subject: tv vim: colorize search results

---
 tv/2configs/vim.nix | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'tv')

diff --git a/tv/2configs/vim.nix b/tv/2configs/vim.nix
index f0b1cf52..85283238 100644
--- a/tv/2configs/vim.nix
+++ b/tv/2configs/vim.nix
@@ -70,6 +70,8 @@ let {
         hi diffSubname  ctermfg=207
         hi diffAdded    ctermfg=010
         hi diffRemoved  ctermfg=009
+
+        hi Search       cterm=NONE ctermbg=216
       '';
     })))
     ((rtp: rtp // { inherit rtp; }) (pkgs.writeTextFile (let
-- 
cgit v1.2.3


From 5aad878c525c16e98922858bbc85eade10365526 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Tue, 1 Aug 2017 20:13:30 +0200
Subject: tv vim: relaxt sh.extraStart for variable names

---
 tv/2configs/vim.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'tv')

diff --git a/tv/2configs/vim.nix b/tv/2configs/vim.nix
index 85283238..ca471864 100644
--- a/tv/2configs/vim.nix
+++ b/tv/2configs/vim.nix
@@ -229,7 +229,7 @@ let {
           lua = {};
           sed.extraStart = ''writeSed[^ \t\r\n]*[ \t\r\n]*"[^"]*"'';
           sh.extraStart = concatStringsSep ''\|'' [
-            ''write\(Ba\|Da\)sh[^ \t\r\n]*[ \t\r\n]*"[^"]*"''
+            ''write\(Ba\|Da\)sh[^ \t\r\n]*[ \t\r\n]*\("[^"]*"\|[a-z]\+\)''
             ''[a-z]*Phase[ \t\r\n]*=''
           ];
           yaml = {};
-- 
cgit v1.2.3


From ad0f78278968b3cd0656a72be8db9a287bd6398a Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Tue, 1 Aug 2017 20:27:36 +0200
Subject: tv djbdns: RIP

---
 tv/5pkgs/simple/djbdns/default.nix | 20 --------------------
 1 file changed, 20 deletions(-)
 delete mode 100644 tv/5pkgs/simple/djbdns/default.nix

(limited to 'tv')

diff --git a/tv/5pkgs/simple/djbdns/default.nix b/tv/5pkgs/simple/djbdns/default.nix
deleted file mode 100644
index ad5a530b..00000000
--- a/tv/5pkgs/simple/djbdns/default.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-{ coreutils, gawk, fetchurl, stdenv, ... }:
-
-with stdenv.lib;
-
-stdenv.mkDerivation rec {
-  name = "djbdns-1.05";
-  src = fetchurl {
-    url = "http://cr.yp.to/djbdns/djbdns-1.05.tar.gz";
-    sha256 = "0j3baf92vkczr5fxww7rp1b7gmczxmmgrqc8w2dy7kgk09m85k9w";
-  };
-  configurePhase = ''
-    echo $out > conf-home
-    echo gcc -O2 -include errno.h > conf-cc
-  '';
-  patchPhase = ''
-    sed -i 's:c("/","etc","dnsroots.global",-1,-1,0644);:// &:' hier.c
-    sed -i '1s@^@PATH=${makeBinPath [ coreutils gawk ]}\n@' dnstracesort.sh
-  '';
-  installTargets = "setup check";
-}
-- 
cgit v1.2.3


From 24a515c4a0069828bc84ac60d239f88f9b637524 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Tue, 1 Aug 2017 22:22:10 +0200
Subject: tv {wu,zu}: remove extra systemPackages

---
 tv/1systems/wu/config.nix | 92 ---------------------------------------------
 tv/1systems/zu/config.nix | 96 -----------------------------------------------
 2 files changed, 188 deletions(-)

(limited to 'tv')

diff --git a/tv/1systems/wu/config.nix b/tv/1systems/wu/config.nix
index 9767f467..5ec6a462 100644
--- a/tv/1systems/wu/config.nix
+++ b/tv/1systems/wu/config.nix
@@ -17,91 +17,6 @@ with import <stockholm/lib>;
     <stockholm/tv/2configs/pulse.nix>
     <stockholm/tv/2configs/retiolum.nix>
     <stockholm/tv/2configs/xserver>
-    {
-      environment.systemPackages = with pkgs; [
-        # root
-        cryptsetup
-
-        # tv
-        bc
-        bind # dig
-        cac-api
-        dic
-        file
-        get
-        gnupg1compat
-        haskellPackages.hledger
-        jq
-        mkpasswd
-        netcat
-        nix-repl
-        nmap
-        p7zip
-        push
-        qrencode
-        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
-        #neovim
-        #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
-        #wvdial
-        #xdotool
-        #xkill
-        #xl2tpd
-        #xsel
-
-        unison
-      ];
-    }
   ];
 
   boot.initrd.luks = {
@@ -143,13 +58,6 @@ with import <stockholm/lib>;
   hardware.enableRedistributableFirmware= true;
   hardware.opengl.driSupport32Bit = true;
 
-  environment.systemPackages = with pkgs; [
-    ethtool
-    tinc_pre
-    iptables
-    #jack2
-  ];
-
   security.wrappers = {
     sendmail.source = "${pkgs.exim}/bin/sendmail"; # for cron
   };
diff --git a/tv/1systems/zu/config.nix b/tv/1systems/zu/config.nix
index 272fba88..5936ddfe 100644
--- a/tv/1systems/zu/config.nix
+++ b/tv/1systems/zu/config.nix
@@ -16,93 +16,6 @@ with import <stockholm/lib>;
     <stockholm/tv/2configs/pulse.nix>
     <stockholm/tv/2configs/retiolum.nix>
     <stockholm/tv/2configs/xserver>
-    {
-      environment.systemPackages = with pkgs; [
-
-        # root
-        cryptsetup
-
-        # tv
-        bc
-        bind # dig
-        cac-api
-        dic
-        file
-        gnupg1compat
-        haskellPackages.hledger
-        jq
-        mkpasswd
-        netcat
-        nix-repl
-        nmap
-        p7zip
-        pass
-        q
-        qrencode
-        # XXX fails at systemd.services.dbus.unitConfig
-        #texlive
-        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
-        #wvdial
-        #xdotool
-        #xkill
-        #xl2tpd
-        #xsel
-
-        unison
-      ];
-    }
   ];
 
   boot.initrd.luks = {
@@ -133,15 +46,6 @@ with import <stockholm/lib>;
     };
   };
 
-  environment.systemPackages = with pkgs; [
-    ethtool
-    tinc_pre
-    iptables
-    #jack2
-
-    gptfdisk
-  ];
-
   security.wrappers = {
     sendmail.source = "${pkgs.exim}/bin/sendmail"; # for cron
   };
-- 
cgit v1.2.3


From 0b4d3edff8f3e0e33756355f1b3121cf311bafdb Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Tue, 1 Aug 2017 22:32:14 +0200
Subject: tv: boot.tmpOnTmpfs = true

---
 tv/1systems/mu/config.nix    | 10 ----------
 tv/1systems/nomic/config.nix |  3 ---
 tv/1systems/wu/config.nix    | 10 ----------
 tv/1systems/xu/config.nix    | 10 ----------
 tv/1systems/zu/config.nix    | 10 ----------
 tv/2configs/default.nix      |  2 ++
 6 files changed, 2 insertions(+), 43 deletions(-)

(limited to 'tv')

diff --git a/tv/1systems/mu/config.nix b/tv/1systems/mu/config.nix
index 4c6d1632..01de9ee6 100644
--- a/tv/1systems/mu/config.nix
+++ b/tv/1systems/mu/config.nix
@@ -50,11 +50,6 @@ with import <stockholm/lib>;
     "/boot" = {
       device = "/dev/sda1";
     };
-    "/tmp" = {
-      device = "tmpfs";
-      fsType = "tmpfs";
-      options = [ "nosuid" "nodev" "noatime" ];
-    };
   };
 
   swapDevices =[ ];
@@ -152,9 +147,4 @@ with import <stockholm/lib>;
       "networkmanager"
     ];
   };
-
-  # see tmpfiles.d(5)
-  systemd.tmpfiles.rules = [
-    "d /tmp 1777 root root - -" # does this work with mounted /tmp?
-  ];
 }
diff --git a/tv/1systems/nomic/config.nix b/tv/1systems/nomic/config.nix
index d0144986..64cccde0 100644
--- a/tv/1systems/nomic/config.nix
+++ b/tv/1systems/nomic/config.nix
@@ -52,9 +52,6 @@ with import <stockholm/lib>;
 
   swapDevices = [ ];
 
-  # TODO base
-  boot.tmpOnTmpfs = true;
-
   environment.systemPackages = with pkgs; [
     (writeDashBin "play" ''
       set -euf
diff --git a/tv/1systems/wu/config.nix b/tv/1systems/wu/config.nix
index 5ec6a462..cdcaa98d 100644
--- a/tv/1systems/wu/config.nix
+++ b/tv/1systems/wu/config.nix
@@ -45,11 +45,6 @@ with import <stockholm/lib>;
     "/boot" = {
       device = "/dev/sda1";
     };
-    "/tmp" = {
-      device = "tmpfs";
-      fsType = "tmpfs";
-      options = ["nosuid" "nodev" "noatime"];
-    };
   };
 
   krebs.nixpkgs.allowUnfreePredicate = pkg: hasPrefix "nvidia-x11-" pkg.name;
@@ -64,11 +59,6 @@ with import <stockholm/lib>;
 
   services.printing.enable = true;
 
-  # see tmpfiles.d(5)
-  systemd.tmpfiles.rules = [
-    "d /tmp 1777 root root - -" # does this work with mounted /tmp?
-  ];
-
   services.udev.extraRules = ''
     SUBSYSTEM=="net", ATTR{address}=="00:90:f5:da:aa:c3", NAME="en0"
     SUBSYSTEM=="net", ATTR{address}=="a0:88:b4:1b:ae:6c", NAME="wl0"
diff --git a/tv/1systems/xu/config.nix b/tv/1systems/xu/config.nix
index 2c5e827a..0525be85 100644
--- a/tv/1systems/xu/config.nix
+++ b/tv/1systems/xu/config.nix
@@ -137,11 +137,6 @@ with import <stockholm/lib>;
     "/boot" = {
       device = "/dev/sda1";
     };
-    "/tmp" = {
-      device = "tmpfs";
-      fsType = "tmpfs";
-      options = ["nosuid" "nodev" "noatime"];
-    };
   };
 
   environment.systemPackages = with pkgs; [
@@ -159,11 +154,6 @@ with import <stockholm/lib>;
 
   services.printing.enable = true;
 
-  # see tmpfiles.d(5)
-  systemd.tmpfiles.rules = [
-    "d /tmp 1777 root root - -" # does this work with mounted /tmp?
-  ];
-
   #services.bitlbee.enable = true;
   #services.tor.client.enable = true;
   #services.tor.enable = true;
diff --git a/tv/1systems/zu/config.nix b/tv/1systems/zu/config.nix
index 5936ddfe..7267bbc9 100644
--- a/tv/1systems/zu/config.nix
+++ b/tv/1systems/zu/config.nix
@@ -39,11 +39,6 @@ with import <stockholm/lib>;
     "/boot" = {
       device = "/dev/sda1";
     };
-    "/tmp" = {
-      device = "tmpfs";
-      fsType = "tmpfs";
-      options = ["nosuid" "nodev" "noatime"];
-    };
   };
 
   security.wrappers = {
@@ -52,11 +47,6 @@ with import <stockholm/lib>;
 
   services.printing.enable = true;
 
-  # see tmpfiles.d(5)
-  systemd.tmpfiles.rules = [
-    "d /tmp 1777 root root - -" # does this work with mounted /tmp?
-  ];
-
   #services.bitlbee.enable = true;
   #services.tor.client.enable = true;
   #services.tor.enable = true;
diff --git a/tv/2configs/default.nix b/tv/2configs/default.nix
index 834a8908..c58525e9 100644
--- a/tv/2configs/default.nix
+++ b/tv/2configs/default.nix
@@ -4,6 +4,8 @@ with import <stockholm/lib>;
               then "buildbot"
               else "tv";
 in {
+  boot.tmpOnTmpfs = true;
+
   krebs.enable = true;
 
   krebs.build.user = config.krebs.users.tv;
-- 
cgit v1.2.3


From f58b49aa82769b4f3eca5ee0e63de407224c7dd9 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Tue, 1 Aug 2017 22:34:14 +0200
Subject: tv config: drop unused "builder" variable

---
 tv/2configs/default.nix | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

(limited to 'tv')

diff --git a/tv/2configs/default.nix b/tv/2configs/default.nix
index c58525e9..730b055a 100644
--- a/tv/2configs/default.nix
+++ b/tv/2configs/default.nix
@@ -1,9 +1,6 @@
 with import <stockholm/lib>;
-{ config, lib, pkgs, ... }: let
-  builder = if getEnv "dummy_secrets" == "true"
-              then "buildbot"
-              else "tv";
-in {
+{ config, pkgs, ... }: {
+
   boot.tmpOnTmpfs = true;
 
   krebs.enable = true;
-- 
cgit v1.2.3


From 9b62b9d74ba298b10823d5b71aa46d6ea46f0e13 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Tue, 1 Aug 2017 22:37:41 +0200
Subject: tv systems: normalize head

---
 tv/1systems/alnus/config.nix | 4 +---
 tv/1systems/mu/config.nix    | 4 +---
 tv/1systems/nomic/config.nix | 4 +---
 tv/1systems/wu/config.nix    | 4 +---
 tv/1systems/xu/config.nix    | 4 +---
 tv/1systems/zu/config.nix    | 4 +---
 6 files changed, 6 insertions(+), 18 deletions(-)

(limited to 'tv')

diff --git a/tv/1systems/alnus/config.nix b/tv/1systems/alnus/config.nix
index dd9e594f..b53a8ea9 100644
--- a/tv/1systems/alnus/config.nix
+++ b/tv/1systems/alnus/config.nix
@@ -1,8 +1,6 @@
-{ config, pkgs, ... }:
-
 with import <stockholm/lib>;
+{ config, pkgs, ... }: {
 
-{
   imports = [
     <stockholm/tv>
     <stockholm/tv/2configs/hw/x220.nix>
diff --git a/tv/1systems/mu/config.nix b/tv/1systems/mu/config.nix
index 01de9ee6..11715c14 100644
--- a/tv/1systems/mu/config.nix
+++ b/tv/1systems/mu/config.nix
@@ -1,8 +1,6 @@
-{ config, pkgs, ... }:
-
 with import <stockholm/lib>;
+{ config, pkgs, ... }: {
 
-{
   imports = [
     <stockholm/krebs>
     <stockholm/tv/2configs>
diff --git a/tv/1systems/nomic/config.nix b/tv/1systems/nomic/config.nix
index 64cccde0..e9669980 100644
--- a/tv/1systems/nomic/config.nix
+++ b/tv/1systems/nomic/config.nix
@@ -1,8 +1,6 @@
-{ config, lib, pkgs, ... }:
-
 with import <stockholm/lib>;
+{ config, pkgs, ... }: {
 
-{
   krebs.build.host = config.krebs.hosts.nomic;
 
   imports = [
diff --git a/tv/1systems/wu/config.nix b/tv/1systems/wu/config.nix
index cdcaa98d..24a1141b 100644
--- a/tv/1systems/wu/config.nix
+++ b/tv/1systems/wu/config.nix
@@ -1,8 +1,6 @@
-{ config, lib, pkgs, ... }:
-
 with import <stockholm/lib>;
+{ config, pkgs, ... }: {
 
-{
   krebs.build.host = config.krebs.hosts.wu;
 
   imports = [
diff --git a/tv/1systems/xu/config.nix b/tv/1systems/xu/config.nix
index 0525be85..0444b95c 100644
--- a/tv/1systems/xu/config.nix
+++ b/tv/1systems/xu/config.nix
@@ -1,8 +1,6 @@
-{ config, lib, pkgs, ... }:
-
 with import <stockholm/lib>;
+{ config, pkgs, ... }: {
 
-{
   krebs.build.host = config.krebs.hosts.xu;
 
   imports = [
diff --git a/tv/1systems/zu/config.nix b/tv/1systems/zu/config.nix
index 7267bbc9..1a924a47 100644
--- a/tv/1systems/zu/config.nix
+++ b/tv/1systems/zu/config.nix
@@ -1,8 +1,6 @@
-{ config, lib, pkgs, ... }:
-
 with import <stockholm/lib>;
+{ config, pkgs, ... }: {
 
-{
   krebs.build.host = config.krebs.hosts.zu;
 
   imports = [
-- 
cgit v1.2.3


From 91e48fae045a8b00239ae65bb027143ef9fcc50c Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Tue, 1 Aug 2017 22:47:08 +0200
Subject: tv: drop redundant swapDevices defs

---
 tv/1systems/alnus/config.nix | 2 --
 tv/1systems/mu/config.nix    | 2 --
 tv/1systems/nomic/config.nix | 2 --
 3 files changed, 6 deletions(-)

(limited to 'tv')

diff --git a/tv/1systems/alnus/config.nix b/tv/1systems/alnus/config.nix
index b53a8ea9..71302d59 100644
--- a/tv/1systems/alnus/config.nix
+++ b/tv/1systems/alnus/config.nix
@@ -79,8 +79,6 @@ with import <stockholm/lib>;
     };
   };
 
-  swapDevices =[ ];
-
   users.users.dv = {
     inherit (config.krebs.users.dv) home uid;
     isNormalUser = true;
diff --git a/tv/1systems/mu/config.nix b/tv/1systems/mu/config.nix
index 11715c14..0c1e7923 100644
--- a/tv/1systems/mu/config.nix
+++ b/tv/1systems/mu/config.nix
@@ -50,8 +50,6 @@ with import <stockholm/lib>;
     };
   };
 
-  swapDevices =[ ];
-
   nixpkgs.config.allowUnfree = true;
   hardware.opengl.driSupport32Bit = true;
 
diff --git a/tv/1systems/nomic/config.nix b/tv/1systems/nomic/config.nix
index e9669980..996a5e7e 100644
--- a/tv/1systems/nomic/config.nix
+++ b/tv/1systems/nomic/config.nix
@@ -48,8 +48,6 @@ with import <stockholm/lib>;
       fsType = "btrfs";
     };
 
-  swapDevices = [ ];
-
   environment.systemPackages = with pkgs; [
     (writeDashBin "play" ''
       set -euf
-- 
cgit v1.2.3


From 4580d831a889b6260210ec2abb01ca387f35f801 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Tue, 1 Aug 2017 22:55:16 +0200
Subject: tv zu: add fileSystems."/bku"

---
 tv/1systems/zu/config.nix | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'tv')

diff --git a/tv/1systems/zu/config.nix b/tv/1systems/zu/config.nix
index 1a924a47..05c14299 100644
--- a/tv/1systems/zu/config.nix
+++ b/tv/1systems/zu/config.nix
@@ -29,6 +29,11 @@ with import <stockholm/lib>;
       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";
-- 
cgit v1.2.3


From 51042442288c2d27a2fb7ce073801932c5457813 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Tue, 1 Aug 2017 23:28:21 +0200
Subject: tv: drop security.wrappers.sendmail

---
 tv/1systems/mu/config.nix | 1 -
 tv/1systems/wu/config.nix | 4 ----
 tv/1systems/xu/config.nix | 4 ----
 tv/1systems/zu/config.nix | 4 ----
 4 files changed, 13 deletions(-)

(limited to 'tv')

diff --git a/tv/1systems/mu/config.nix b/tv/1systems/mu/config.nix
index 0c1e7923..95b01bff 100644
--- a/tv/1systems/mu/config.nix
+++ b/tv/1systems/mu/config.nix
@@ -88,7 +88,6 @@ with import <stockholm/lib>;
   programs.ssh.startAgent = false;
 
   security.wrappers = {
-    sendmail.source = "${pkgs.exim}/bin/sendmail"; # for cron
     slock.source = "${pkgs.slock}/bin/slock";
   };
 
diff --git a/tv/1systems/wu/config.nix b/tv/1systems/wu/config.nix
index 24a1141b..79b5aa26 100644
--- a/tv/1systems/wu/config.nix
+++ b/tv/1systems/wu/config.nix
@@ -51,10 +51,6 @@ with import <stockholm/lib>;
   hardware.enableRedistributableFirmware= true;
   hardware.opengl.driSupport32Bit = true;
 
-  security.wrappers = {
-    sendmail.source = "${pkgs.exim}/bin/sendmail"; # for cron
-  };
-
   services.printing.enable = true;
 
   services.udev.extraRules = ''
diff --git a/tv/1systems/xu/config.nix b/tv/1systems/xu/config.nix
index 0444b95c..0abd544c 100644
--- a/tv/1systems/xu/config.nix
+++ b/tv/1systems/xu/config.nix
@@ -146,10 +146,6 @@ with import <stockholm/lib>;
     gptfdisk
   ];
 
-  security.wrappers = {
-    sendmail.source = "${pkgs.exim}/bin/sendmail"; # for cron
-  };
-
   services.printing.enable = true;
 
   #services.bitlbee.enable = true;
diff --git a/tv/1systems/zu/config.nix b/tv/1systems/zu/config.nix
index 05c14299..414d2f22 100644
--- a/tv/1systems/zu/config.nix
+++ b/tv/1systems/zu/config.nix
@@ -44,10 +44,6 @@ with import <stockholm/lib>;
     };
   };
 
-  security.wrappers = {
-    sendmail.source = "${pkgs.exim}/bin/sendmail"; # for cron
-  };
-
   services.printing.enable = true;
 
   #services.bitlbee.enable = true;
-- 
cgit v1.2.3


From 13b161949cee6f1fb97781fcfa0a700ac4f5b352 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Wed, 2 Aug 2017 00:22:49 +0200
Subject: tv mu: drop boot.extraModprobeConfig

---
 tv/1systems/mu/config.nix | 4 ----
 1 file changed, 4 deletions(-)

(limited to 'tv')

diff --git a/tv/1systems/mu/config.nix b/tv/1systems/mu/config.nix
index 95b01bff..32143f37 100644
--- a/tv/1systems/mu/config.nix
+++ b/tv/1systems/mu/config.nix
@@ -31,10 +31,6 @@ with import <stockholm/lib>;
   boot.kernelModules = [ "fbcon" "kvm-intel" ];
   boot.extraModulePackages = [ ];
 
-  boot.extraModprobeConfig = ''
-    options kvm_intel nested=1
-  '';
-
   fileSystems = {
     "/" = {
       device = "/dev/vgmu1/nixroot";
-- 
cgit v1.2.3


From 26b88c04c59ed05ae29b9a65563322aa01527b96 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Wed, 2 Aug 2017 02:13:21 +0200
Subject: tv: add x0vncserver module

---
 tv/3modules/default.nix     |  1 +
 tv/3modules/x0vncserver.nix | 52 +++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 53 insertions(+)
 create mode 100644 tv/3modules/x0vncserver.nix

(limited to 'tv')

diff --git a/tv/3modules/default.nix b/tv/3modules/default.nix
index 397ee8e8..83dc212a 100644
--- a/tv/3modules/default.nix
+++ b/tv/3modules/default.nix
@@ -6,5 +6,6 @@ _:
     ./ejabberd
     ./hosts.nix
     ./iptables.nix
+    ./x0vncserver.nix
   ];
 }
diff --git a/tv/3modules/x0vncserver.nix b/tv/3modules/x0vncserver.nix
new file mode 100644
index 00000000..44fed590
--- /dev/null
+++ b/tv/3modules/x0vncserver.nix
@@ -0,0 +1,52 @@
+with import <stockholm/lib>;
+{ config, pkgs, ... }: let
+
+  cfg = config.tv.x0vncserver;
+
+in {
+  options.tv.x0vncserver = {
+    display = mkOption {
+      default = ":${toString config.services.xserver.display}";
+      type = types.str;
+    };
+    enable = mkEnableOption "tv.x0vncserver";
+    pwfile = mkOption {
+      default = {
+        owner = cfg.user;
+        path = "${cfg.user.home}/.vncpasswd";
+        source-path = toString <secrets> + "/vncpasswd";
+      };
+      description = ''
+        Use vncpasswd to edit pwfile.
+        See: nix-shell -p tigervnc --run 'man vncpasswd'
+      '';
+      type = types.secret-file;
+    };
+    rfbport = mkOption {
+      default = 5900;
+      type = types.int;
+    };
+    user = mkOption {
+      default = config.krebs.build.user;
+      type = types.user;
+    };
+  };
+  config = mkIf cfg.enable {
+    krebs.secret.files = {
+      x0vncserver-pwfile = cfg.pwfile;
+    };
+    systemd.services.x0vncserver = {
+      after = [ "graphical.target" "secret.service" ];
+      requires = [ "graphical.target" "secret.service" ];
+      serviceConfig = {
+        ExecStart = "${pkgs.tigervnc}/bin/x0vncserver ${toString [
+          "-display ${cfg.display}"
+          "-passwordfile ${cfg.pwfile.path}"
+          "-rfbport ${toString cfg.rfbport}"
+        ]}";
+        User = cfg.user.name;
+      };
+    };
+    tv.iptables.input-retiolum-accept-tcp = singleton (toString cfg.rfbport);
+  };
+}
-- 
cgit v1.2.3


From f607ba46109e11466988b980ff36e395aa0c4049 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Wed, 2 Aug 2017 02:13:57 +0200
Subject: tv mu: drop udev extraRules

---
 tv/1systems/mu/config.nix | 10 ----------
 1 file changed, 10 deletions(-)

(limited to 'tv')

diff --git a/tv/1systems/mu/config.nix b/tv/1systems/mu/config.nix
index 32143f37..42fcfdb2 100644
--- a/tv/1systems/mu/config.nix
+++ b/tv/1systems/mu/config.nix
@@ -12,16 +12,6 @@ with import <stockholm/lib>;
   krebs.build.host = config.krebs.hosts.mu;
   krebs.build.user = mkForce config.krebs.users.vv;
 
-  services.udev.extraRules = ''
-    SUBSYSTEM=="net", ATTR{address}=="00:90:f5:da:aa:c3", NAME="en0"
-    SUBSYSTEM=="net", ATTR{address}=="a0:88:b4:1b:ae:6c", NAME="wl0"
-
-    # for jack
-    KERNEL=="rtc0", GROUP="audio"
-    KERNEL=="hpet", GROUP="audio"
-  '';
-
-
   # hardware configuration
   boot.initrd.luks.devices = [
     { name = "vgmu1"; device = "/dev/sda2"; }
-- 
cgit v1.2.3


From d97d86eddec8002a7a7e5b01320e33121a6ff27f Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Wed, 2 Aug 2017 02:14:23 +0200
Subject: tv mu: boot.loader.{gummiboot => systemd-boot}

---
 tv/1systems/mu/config.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'tv')

diff --git a/tv/1systems/mu/config.nix b/tv/1systems/mu/config.nix
index 42fcfdb2..96ccd321 100644
--- a/tv/1systems/mu/config.nix
+++ b/tv/1systems/mu/config.nix
@@ -43,8 +43,8 @@ with import <stockholm/lib>;
 
   hardware.enableRedistributableFirmware = true;
 
-  boot.loader.gummiboot.enable = true;
   boot.loader.efi.canTouchEfiVariables = true;
+  boot.loader.systemd-boot.enable = true;
 
   networking.networkmanager.enable = true;
 
-- 
cgit v1.2.3


From 87c7d8dcf933c2de783098dfe9b6f1b383062daf Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Wed, 2 Aug 2017 02:14:49 +0200
Subject: tv mu: enable x0vncserver

---
 tv/1systems/mu/config.nix | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'tv')

diff --git a/tv/1systems/mu/config.nix b/tv/1systems/mu/config.nix
index 96ccd321..08948187 100644
--- a/tv/1systems/mu/config.nix
+++ b/tv/1systems/mu/config.nix
@@ -12,6 +12,8 @@ with import <stockholm/lib>;
   krebs.build.host = config.krebs.hosts.mu;
   krebs.build.user = mkForce config.krebs.users.vv;
 
+  tv.x0vncserver.enable = true;
+
   # hardware configuration
   boot.initrd.luks.devices = [
     { name = "vgmu1"; device = "/dev/sda2"; }
-- 
cgit v1.2.3