diff options
| -rw-r--r-- | tv/1systems/wu/config.nix | 42 | ||||
| l--------- | tv/1systems/wu/lib | 1 | ||||
| -rw-r--r-- | tv/2configs/backup.nix | 29 | ||||
| -rw-r--r-- | tv/2configs/exim-smarthost.nix | 1 | ||||
| -rw-r--r-- | tv/2configs/hw/w110er.nix | 70 | ||||
| -rw-r--r-- | tv/2configs/nets/hkw.nix | 13 | 
6 files changed, 0 insertions, 156 deletions
| diff --git a/tv/1systems/wu/config.nix b/tv/1systems/wu/config.nix deleted file mode 100644 index 4d45f6d..0000000 --- a/tv/1systems/wu/config.nix +++ /dev/null @@ -1,42 +0,0 @@ -with import ../lib; -{ config, pkgs, ... }: { -  krebs.build.host = config.krebs.hosts.wu; - -  imports = [ -    <stockholm/tv> -    <stockholm/tv/2configs/hw/w110er.nix> -    <stockholm/tv/2configs/exim-retiolum.nix> -    <stockholm/tv/2configs/pulse.nix> -    <stockholm/tv/2configs/retiolum.nix> -    <stockholm/tv/2configs/xserver> -  ]; - -  boot.initrd.luks.devices.wuca.device = "/dev/sda2"; - -  fileSystems = { -    "/" = { -      device = "/dev/mapper/wuvga-root"; -      fsType = "ext4"; -    }; -    "/bku" = { -      device = "/dev/mapper/wuvga-bku"; -      fsType = "ext4"; -    }; -    "/home" = { -      device = "/dev/mapper/wuvga-home"; -      fsType = "ext4"; -    }; -    "/boot" = { -      device = "/dev/sda1"; -    }; -  }; - -  networking.wireless.enable = true; -  networking.wireless.interfaces = [ -    "wlp3s0" -  ]; -  networking.interfaces.enp4s0f2.useDHCP = true; -  networking.interfaces.wlp3s0.useDHCP = true; -  networking.useDHCP = false; - -} diff --git a/tv/1systems/wu/lib b/tv/1systems/wu/lib deleted file mode 120000 index dc598c5..0000000 --- a/tv/1systems/wu/lib +++ /dev/null @@ -1 +0,0 @@ -../lib
\ No newline at end of file diff --git a/tv/2configs/backup.nix b/tv/2configs/backup.nix index c8ab73b..56c04c4 100644 --- a/tv/2configs/backup.nix +++ b/tv/2configs/backup.nix @@ -9,12 +9,6 @@ with import ./lib;        yearly   = { format = "%Y";                    };      };    }) { -    bu-home-wu = { -      method = "push"; -      src = { host = config.krebs.hosts.bu; path = "/home"; }; -      dst = { host = config.krebs.hosts.wu; path = "/bku/bu-home"; }; -      startAt = "05:15"; -    };      bu-home-xu = {        method = "push";        src = { host = config.krebs.hosts.bu; path = "/home"; }; @@ -45,18 +39,6 @@ with import ./lib;        dst = { host = config.krebs.hosts.nomic; path = "/fs/ponyhof/bku/querel-home"; };        startAt = "22:00";      }; -    wu-home-xu = { -      method = "push"; -      src = { host = config.krebs.hosts.wu; path = "/home"; }; -      dst = { host = config.krebs.hosts.xu; path = "/bku/wu-home"; }; -      startAt = "05:00"; -    }; -    wu-home-zu = { -      method = "push"; -      src = { host = config.krebs.hosts.wu; path = "/home"; }; -      dst = { host = config.krebs.hosts.zu; path = "/bku/wu-home"; }; -      startAt = "05:20"; -    };      xu-home-bu = {        method = "push";        src = { host = config.krebs.hosts.xu; path = "/home"; }; @@ -69,12 +51,6 @@ with import ./lib;        dst = { host = config.krebs.hosts.nomic; path = "/fs/cis3hG/bku/xu-home"; };        startAt = "05:20";      }; -    xu-home-wu = { -      method = "push"; -      src = { host = config.krebs.hosts.xu; path = "/home"; }; -      dst = { host = config.krebs.hosts.wu; path = "/bku/xu-home"; }; -      startAt = "06:00"; -    };      xu-home-zu = {        method = "push";        src = { host = config.krebs.hosts.xu; path = "/home"; }; @@ -129,10 +105,5 @@ with import ./lib;        src = { host = config.krebs.hosts.xu; path = "/tmp/xu-bku-test-data"; };        dst = { host = config.krebs.hosts.xu; path = "/bku/xu-test-pull"; };      }; -    xu-test-push-wu = { -      method = "push"; -      src = { host = config.krebs.hosts.xu; path = "/tmp/xu-bku-test-data"; }; -      dst = { host = config.krebs.hosts.wu; path = "/bku/xu-test-push"; }; -    };    };  } diff --git a/tv/2configs/exim-smarthost.nix b/tv/2configs/exim-smarthost.nix index e905536..6750d9a 100644 --- a/tv/2configs/exim-smarthost.nix +++ b/tv/2configs/exim-smarthost.nix @@ -15,7 +15,6 @@ with import ./lib;      ];      relay_from_hosts = concatMap (host: host.nets.retiolum.addrs) [        config.krebs.hosts.nomic -      config.krebs.hosts.wu        config.krebs.hosts.xu      ];      internet-aliases = with config.krebs.users; [ diff --git a/tv/2configs/hw/w110er.nix b/tv/2configs/hw/w110er.nix deleted file mode 100644 index bf749a9..0000000 --- a/tv/2configs/hw/w110er.nix +++ /dev/null @@ -1,70 +0,0 @@ -with import ./lib; -{ pkgs, ... }: { -  imports = [ -    ../smartd.nix -    { -      # nvidia doesn't build despite -      #  https://github.com/NixOS/nixpkgs/issues/33284 -      #hardware.bumblebee.enable = true; -      #hardware.bumblebee.group = "video"; -      #hardware.enableRedistributableFirmware= true; -      #krebs.nixpkgs.allowUnfreePredicate = pkg: any (eq (packageName pkg)) [ -      #  "nvidia-x11" -      #  "nvidia-persistenced" -      #  "nvidia-settings" -      #]; -    } - -    { -      nix.buildCores = 4; -      nix.maxJobs = 4; -    } -    (if lib.versionAtLeast (lib.versions.majorMinor lib.version) "21.11" then { -      nix.daemonCPUSchedPolicy = "batch"; -      nix.daemonIOSchedPriority = 1; -    } else { -      nix.daemonIONiceLevel = 1; -      nix.daemonNiceLevel = 1; -    }) -  ]; - -  boot.extraModprobeConfig = '' -    options kvm_intel nested=1 -  ''; - -  boot.initrd.availableKernelModules = [ "ahci" ]; -  boot.kernelModules = [ "kvm-intel" ]; - -  boot.loader.systemd-boot.enable = true; -  boot.loader.efi.canTouchEfiVariables = true; - -  hardware.enableRedistributableFirmware = true; - -  hardware.opengl.driSupport32Bit = true; -  hardware.opengl.extraPackages = [ pkgs.vaapiIntel ]; - -  networking.wireless.enable = true; - -  services.logind.extraConfig = '' -    HandleHibernateKey=ignore -    HandleLidSwitch=ignore -    HandlePowerKey=ignore -    HandleSuspendKey=ignore -  ''; - -  system.activationScripts.powertopTunables = '' -    echo 1 > /sys/module/snd_hda_intel/parameters/power_save -    echo 1500 > /proc/sys/vm/dirty_writeback_centisecs -    (cd /sys/bus/pci/devices -      for i in *; do -        echo auto > $i/power/control # defaults to 'on' -      done) -  ''; - -  services.xserver = { -    videoDriver = "intel"; -  }; - -  tv.hw.screens.primary.width = 1366; -  tv.hw.screens.primary.height = 768; -} diff --git a/tv/2configs/nets/hkw.nix b/tv/2configs/nets/hkw.nix index c3acde1..51a8a73 100644 --- a/tv/2configs/nets/hkw.nix +++ b/tv/2configs/nets/hkw.nix @@ -38,19 +38,6 @@            ];          };        }; -      wu = { -        nets.hkw = { -          ip4 = { -            addr = "10.23.1.37"; -            prefix = "10.23.1.0/24"; -          }; -          aliases = [ -            "wu.hkw" -            "cache.wu.hkw" -          ]; -          ssh.port = 11423; -        }; -      };        xu = {          nets.hkw = {            ip4 = { | 
