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/wu/config.nix | 2 -- 1 file changed, 2 deletions(-) (limited to 'tv/1systems/wu/config.nix') diff --git a/tv/1systems/wu/config.nix b/tv/1systems/wu/config.nix index 1e28cc78a..9767f467a 100644 --- a/tv/1systems/wu/config.nix +++ b/tv/1systems/wu/config.nix @@ -169,6 +169,4 @@ with import ; KERNEL=="rtc0", GROUP="audio" KERNEL=="hpet", GROUP="audio" ''; - - virtualisation.virtualbox.host.enable = true; } -- 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/wu/config.nix | 92 ----------------------------------------------- 1 file changed, 92 deletions(-) (limited to 'tv/1systems/wu/config.nix') diff --git a/tv/1systems/wu/config.nix b/tv/1systems/wu/config.nix index 9767f467a..5ec6a462e 100644 --- a/tv/1systems/wu/config.nix +++ b/tv/1systems/wu/config.nix @@ -17,91 +17,6 @@ with import ; - { - 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 ; 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 }; -- 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/wu/config.nix | 10 ---------- 1 file changed, 10 deletions(-) (limited to 'tv/1systems/wu/config.nix') diff --git a/tv/1systems/wu/config.nix b/tv/1systems/wu/config.nix index 5ec6a462e..cdcaa98d9 100644 --- a/tv/1systems/wu/config.nix +++ b/tv/1systems/wu/config.nix @@ -45,11 +45,6 @@ with import ; "/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 ; 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" -- 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/wu/config.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'tv/1systems/wu/config.nix') diff --git a/tv/1systems/wu/config.nix b/tv/1systems/wu/config.nix index cdcaa98d9..24a1141ba 100644 --- a/tv/1systems/wu/config.nix +++ b/tv/1systems/wu/config.nix @@ -1,8 +1,6 @@ -{ config, lib, pkgs, ... }: - with import ; +{ config, pkgs, ... }: { -{ krebs.build.host = config.krebs.hosts.wu; imports = [ -- 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/wu/config.nix | 4 ---- 1 file changed, 4 deletions(-) (limited to 'tv/1systems/wu/config.nix') diff --git a/tv/1systems/wu/config.nix b/tv/1systems/wu/config.nix index 24a1141ba..79b5aa269 100644 --- a/tv/1systems/wu/config.nix +++ b/tv/1systems/wu/config.nix @@ -51,10 +51,6 @@ with import ; hardware.enableRedistributableFirmware= true; hardware.opengl.driSupport32Bit = true; - security.wrappers = { - sendmail.source = "${pkgs.exim}/bin/sendmail"; # for cron - }; - services.printing.enable = true; services.udev.extraRules = '' -- cgit v1.2.3