From ebd8b871f4abefae8a65734388a054fa5c6ac318 Mon Sep 17 00:00:00 2001 From: Daniel Olsen Date: Fri, 8 May 2026 01:08:48 +0200 Subject: [PATCH] skrott: yeetus deletus --- README.md | 2 +- flake.nix | 42 ------- .../monitoring/prometheus/machines.nix | 2 - hosts/skrott/configuration.nix | 112 ------------------ topology/default.nix | 1 - values.nix | 4 - 6 files changed, 1 insertion(+), 162 deletions(-) delete mode 100644 hosts/skrott/configuration.nix diff --git a/README.md b/README.md index e3fdd5b..c138a80 100644 --- a/README.md +++ b/README.md @@ -43,7 +43,7 @@ revert the changes on the next nightly rebuild (tends to happen when everybody i | [kommode][kom] | Virtual | Gitea + Gitea pages | | [lupine][lup] | Physical | Gitea CI/CD runners | | shark | Virtual | Test host for authentication, absolutely horrendous | -| [skrot/skrott][skr] | Physical | Kiosk, snacks and soda | +| [skrot][skr] | Physical | Kiosk, snacks and soda | | [wenche][wen] | Virtual | Nix-builders, general purpose compute | ## Documentation diff --git a/flake.nix b/flake.nix index 336bbc2..81ec169 100644 --- a/flake.nix +++ b/flake.nix @@ -240,38 +240,6 @@ }; } // - (let - skrottConfig = { - modules = [ - (nixpkgs + "/nixos/modules/installer/sd-card/sd-image-aarch64.nix") - inputs.dibbler.nixosModules.default - ]; - overlays = [ - inputs.dibbler.overlays.default - (final: prev: { - # NOTE: Yeetus (these break crosscompile ¯\_(ツ)_/¯) - atool = prev.emptyDirectory; - micro = prev.emptyDirectory; - ncdu = prev.emptyDirectory; - }) - ]; - }; - in { - skrott = self.nixosConfigurations.skrott-native; - skrott-native = stableNixosConfig "skrott" (skrottConfig // { - localSystem = "aarch64-linux"; - crossSystem = "aarch64-linux"; - }); - skrott-cross = stableNixosConfig "skrott" (skrottConfig // { - localSystem = "x86_64-linux"; - crossSystem = "aarch64-linux"; - }); - skrott-x86_64 = stableNixosConfig "skrott" (skrottConfig // { - localSystem = "x86_64-linux"; - crossSystem = "x86_64-linux"; - }); - }) - // (let machineNames = map (i: "lupine-${toString i}") (lib.range 1 5); stableLupineNixosConfig = name: extraArgs: @@ -342,16 +310,6 @@ lib.genAttrs allMachines (machine: self.nixosConfigurations.${machine}.config.system.build.toplevel) // - # Skrott is exception - { - skrott = self.packages.${system}.skrott-native-sd; - skrott-native = self.nixosConfigurations.skrott-native.config.system.build.toplevel; - skrott-native-sd = self.nixosConfigurations.skrott-native.config.system.build.sdImage; - skrott-cross = self.nixosConfigurations.skrott-cross.config.system.build.toplevel; - skrott-cross-sd = self.nixosConfigurations.skrott-cross.config.system.build.sdImage; - skrott-x86_64 = self.nixosConfigurations.skrott-x86_64.config.system.build.toplevel; - } - // # Nix-topology (let topology' = import inputs.nix-topology { diff --git a/hosts/ildkule/services/monitoring/prometheus/machines.nix b/hosts/ildkule/services/monitoring/prometheus/machines.nix index 4967bc2..9f6a5c2 100644 --- a/hosts/ildkule/services/monitoring/prometheus/machines.nix +++ b/hosts/ildkule/services/monitoring/prometheus/machines.nix @@ -30,8 +30,6 @@ in { (mkHostScrapeConfig "ustetind" [ defaultNodeExporterPort defaultSystemdExporterPort defaultNixosExporterPort ]) (mkHostScrapeConfig "wenche" [ defaultNodeExporterPort defaultSystemdExporterPort defaultNixosExporterPort ]) - (mkHostScrapeConfig "skrott" [ defaultNodeExporterPort defaultSystemdExporterPort ]) - (mkHostScrapeConfig "hildring" [ defaultNodeExporterPort ]) (mkHostScrapeConfig "isvegg" [ defaultNodeExporterPort ]) (mkHostScrapeConfig "microbel" [ defaultNodeExporterPort ]) diff --git a/hosts/skrott/configuration.nix b/hosts/skrott/configuration.nix deleted file mode 100644 index b946e1f..0000000 --- a/hosts/skrott/configuration.nix +++ /dev/null @@ -1,112 +0,0 @@ -{ config, pkgs, lib, modulesPath, fp, values, ... }: { - imports = [ - (modulesPath + "/profiles/perlless.nix") - - (fp /base) - ]; - - # Disable import of a bunch of tools we don't need from nixpkgs. - disabledModules = [ "profiles/base.nix" ]; - - sops.defaultSopsFile = fp /secrets/skrott/skrott.yaml; - - boot = { - consoleLogLevel = 0; - enableContainers = false; - loader.grub.enable = false; - loader.systemd-boot.enable = false; - kernelPackages = pkgs.linuxPackages; - }; - - hardware = { - enableAllHardware = lib.mkForce false; - firmware = [ pkgs.raspberrypiWirelessFirmware ]; - }; - - # Now turn off a bunch of stuff lol - # TODO: can we reduce further? - # See also https://nixcademy.com/posts/minimizing-nixos-images/ - system.autoUpgrade.enable = lib.mkForce false; - services.irqbalance.enable = lib.mkForce false; - services.logrotate.enable = lib.mkForce false; - services.nginx.enable = lib.mkForce false; - services.postfix.enable = lib.mkForce false; - services.smartd.enable = lib.mkForce false; - services.udisks2.enable = lib.mkForce false; - services.thermald.enable = lib.mkForce false; - services.promtail.enable = lib.mkForce false; - # There aren't really that many firmware updates for rbpi3 anyway - services.fwupd.enable = lib.mkForce false; - - documentation.enable = lib.mkForce false; - - environment.enableAllTerminfo = lib.mkForce false; - - programs.neovim.enable = lib.mkForce false; - programs.zsh.enable = lib.mkForce false; - programs.git.package = pkgs.gitMinimal; - - nix.registry = lib.mkForce { }; - nix.nixPath = lib.mkForce [ ]; - - sops.secrets = { - "dibbler/postgresql/password" = { - owner = "dibbler"; - group = "dibbler"; - }; - }; - - # zramSwap.enable = true; - - networking = { - hostName = "skrott"; - defaultGateway = values.hosts.gateway; - defaultGateway6 = values.hosts.gateway6; - interfaces.eth0 = { - useDHCP = false; - ipv4.addresses = [{ - address = values.hosts.skrott.ipv4; - prefixLength = 25; - }]; - ipv6.addresses = [{ - address = values.hosts.skrott.ipv6; - prefixLength = 25; - }]; - }; - }; - - services.dibbler = { - enable = true; - kioskMode = true; - limitScreenWidth = 80; - limitScreenHeight = 42; - - settings = { - general.quit_allowed = false; - database = { - type = "postgresql"; - postgresql = { - username = "pvv_vv"; - dbname = "pvv_vv"; - host = "postgres.pvv.ntnu.no"; - password_file = config.sops.secrets."dibbler/postgresql/password".path; - }; - }; - }; - }; - - # https://github.com/NixOS/nixpkgs/issues/84105 - boot.kernelParams = lib.mkIf (!config.virtualisation.isVmVariant) [ - "console=ttyUSB0,9600" - # "console=tty1" # Already part of the module - ]; - systemd.services."serial-getty@ttyUSB0" = lib.mkIf (!config.virtualisation.isVmVariant) { - enable = true; - wantedBy = [ "getty.target" ]; # to start at boot - serviceConfig.Restart = "always"; # restart when session is closed - }; - - # Don't change (even during upgrades) unless you know what you are doing. - # See https://search.nixos.org/options?show=system.stateVersion - system.stateVersion = "25.11"; -} diff --git a/topology/default.nix b/topology/default.nix index 7611e63..51cd0d2 100644 --- a/topology/default.nix +++ b/topology/default.nix @@ -228,7 +228,6 @@ in { (mkConnection "demiurgen" "eno1") (mkConnection "sanctuary" "ethernet_0") (mkConnection "torskas" "eth0") - (mkConnection "skrott" "eth0") (mkConnection "homeassistant" "eth0") (mkConnection "orchid" "eth0") (mkConnection "principal" "em0") diff --git a/values.nix b/values.nix index 98edfe6..e256df9 100644 --- a/values.nix +++ b/values.nix @@ -81,10 +81,6 @@ in rec { ipv4 = pvv-ipv4 234; ipv6 = pvv-ipv6 234; }; - skrott = { - ipv4 = pvv-ipv4 235; - ipv6 = pvv-ipv6 235; - }; skrot = { ipv4 = pvv-ipv4 237; ipv6 = pvv-ipv6 237;