From f51f58f5ede75767b27354646d055649d7e37d82 Mon Sep 17 00:00:00 2001 From: tv Date: Tue, 1 Aug 2017 20:07:17 +0200 Subject: tv: only xu is a virtualbox host --- tv/1systems/zu/config.nix | 2 -- 1 file changed, 2 deletions(-) (limited to 'tv/1systems/zu/config.nix') diff --git a/tv/1systems/zu/config.nix b/tv/1systems/zu/config.nix index d2aab8c51..8eb64a27b 100644 --- a/tv/1systems/zu/config.nix +++ b/tv/1systems/zu/config.nix @@ -162,8 +162,6 @@ with import ; #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 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/1systems/zu/config.nix') diff --git a/tv/1systems/zu/config.nix b/tv/1systems/zu/config.nix index 8eb64a27b..272fba880 100644 --- a/tv/1systems/zu/config.nix +++ b/tv/1systems/zu/config.nix @@ -6,12 +6,6 @@ with import ; krebs.build.host = config.krebs.hosts.zu; imports = [ - { - options.tv.test.sercret-file = mkOption { - type = types.secret-file; - default = {}; - }; - } -- cgit v1.2.3 From 24a515c4a0069828bc84ac60d239f88f9b637524 Mon Sep 17 00:00:00 2001 From: tv Date: Tue, 1 Aug 2017 22:22:10 +0200 Subject: tv {wu,zu}: remove extra systemPackages --- tv/1systems/zu/config.nix | 96 ----------------------------------------------- 1 file changed, 96 deletions(-) (limited to 'tv/1systems/zu/config.nix') diff --git a/tv/1systems/zu/config.nix b/tv/1systems/zu/config.nix index 272fba880..5936ddfe1 100644 --- a/tv/1systems/zu/config.nix +++ b/tv/1systems/zu/config.nix @@ -16,93 +16,6 @@ with import ; - { - 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 ; }; }; - 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 Date: Tue, 1 Aug 2017 22:32:14 +0200 Subject: tv: boot.tmpOnTmpfs = true --- tv/1systems/zu/config.nix | 10 ---------- 1 file changed, 10 deletions(-) (limited to 'tv/1systems/zu/config.nix') diff --git a/tv/1systems/zu/config.nix b/tv/1systems/zu/config.nix index 5936ddfe1..7267bbc9e 100644 --- a/tv/1systems/zu/config.nix +++ b/tv/1systems/zu/config.nix @@ -39,11 +39,6 @@ with import ; "/boot" = { device = "/dev/sda1"; }; - "/tmp" = { - device = "tmpfs"; - fsType = "tmpfs"; - options = ["nosuid" "nodev" "noatime"]; - }; }; security.wrappers = { @@ -52,11 +47,6 @@ with import ; 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; -- cgit v1.2.3 From 9b62b9d74ba298b10823d5b71aa46d6ea46f0e13 Mon Sep 17 00:00:00 2001 From: tv Date: Tue, 1 Aug 2017 22:37:41 +0200 Subject: tv systems: normalize head --- tv/1systems/zu/config.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'tv/1systems/zu/config.nix') diff --git a/tv/1systems/zu/config.nix b/tv/1systems/zu/config.nix index 7267bbc9e..1a924a477 100644 --- a/tv/1systems/zu/config.nix +++ b/tv/1systems/zu/config.nix @@ -1,8 +1,6 @@ -{ config, lib, pkgs, ... }: - with import ; +{ config, pkgs, ... }: { -{ krebs.build.host = config.krebs.hosts.zu; imports = [ -- cgit v1.2.3 From 4580d831a889b6260210ec2abb01ca387f35f801 Mon Sep 17 00:00:00 2001 From: tv 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/1systems/zu/config.nix') diff --git a/tv/1systems/zu/config.nix b/tv/1systems/zu/config.nix index 1a924a477..05c14299c 100644 --- a/tv/1systems/zu/config.nix +++ b/tv/1systems/zu/config.nix @@ -29,6 +29,11 @@ with import ; 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 Date: Tue, 1 Aug 2017 23:28:21 +0200 Subject: tv: drop security.wrappers.sendmail --- tv/1systems/zu/config.nix | 4 ---- 1 file changed, 4 deletions(-) (limited to 'tv/1systems/zu/config.nix') diff --git a/tv/1systems/zu/config.nix b/tv/1systems/zu/config.nix index 05c14299c..414d2f226 100644 --- a/tv/1systems/zu/config.nix +++ b/tv/1systems/zu/config.nix @@ -44,10 +44,6 @@ with import ; }; }; - security.wrappers = { - sendmail.source = "${pkgs.exim}/bin/sendmail"; # for cron - }; - services.printing.enable = true; #services.bitlbee.enable = true; -- cgit v1.2.3 [cgit] Unable to lock slot /tmp/cgit/30000000.lock: No such file or directory (2)