From 179bf31d5edc90c826dacf0b06b149469d8d14fa Mon Sep 17 00:00:00 2001
From: Kleidi Bujari <mail@4kb.net>
Date: Sat, 5 Apr 2025 14:58:10 -0400
Subject: automate hosts gen and bump nixpkgs

---
 machines/iridium.nix         | 32 ++++++++++++++++++++
 machines/iridium/default.nix | 31 -------------------
 machines/iso.nix             | 33 ++++++++++++++++++++
 machines/iso/default.nix     | 32 --------------------
 machines/natest.nix          | 13 ++++++++
 machines/radon/default.nix   |  1 +
 machines/t1.nix              | 71 ++++++++++++++++++++++++++++++++++++++++++++
 machines/t1/default.nix      | 68 ------------------------------------------
 machines/t480.nix            | 42 ++++++++++++++++++++++++++
 machines/t480/default.nix    | 41 -------------------------
 10 files changed, 192 insertions(+), 172 deletions(-)
 create mode 100644 machines/iridium.nix
 delete mode 100644 machines/iridium/default.nix
 create mode 100644 machines/iso.nix
 delete mode 100644 machines/iso/default.nix
 create mode 100644 machines/natest.nix
 create mode 100644 machines/t1.nix
 delete mode 100644 machines/t1/default.nix
 create mode 100644 machines/t480.nix
 delete mode 100644 machines/t480/default.nix

(limited to 'machines')

diff --git a/machines/iridium.nix b/machines/iridium.nix
new file mode 100644
index 0000000..03727d7
--- /dev/null
+++ b/machines/iridium.nix
@@ -0,0 +1,32 @@
+{ inputs, ... }:
+let
+  inherit (inputs.nixos-hardware.nixosModules)
+    common-cpu-intel
+    common-gpu-intel
+    ;
+in
+{
+  nixpkgs.hostPlatform.system = "x86_64-linux";
+  system.stateVersion = "25.05";
+  networking.hostName = "iridium";
+
+  imports = [ common-cpu-intel common-gpu-intel ];
+
+  xnet = {
+    disk = {
+      enable = true;
+      device = "/dev/nvme0n1";
+    };
+    net = {
+      sshd.enable = true;
+      interface = "enp1s0";
+      join = [ "plaza" "kubenet" ];
+    };
+    nginx.enable = true;
+    monitoring.hostGrafana = true;
+    gitServer = {
+      enable = true;
+      gitweb.enable = true;
+    };
+  };
+}
diff --git a/machines/iridium/default.nix b/machines/iridium/default.nix
deleted file mode 100644
index 3cbfc89..0000000
--- a/machines/iridium/default.nix
+++ /dev/null
@@ -1,31 +0,0 @@
-{ inputs, ... }:
-let
-  inherit (inputs.nixos-hardware.nixosModules)
-    common-cpu-intel
-    common-gpu-intel
-    ;
-in
-{
-  system.stateVersion = "25.05";
-  networking.hostName = "iridium";
-
-  imports = [ common-cpu-intel common-gpu-intel ];
-
-  xnet = {
-    disk = {
-      enable = true;
-      device = "/dev/nvme0n1";
-    };
-    net = {
-      sshd.enable = true;
-      interface = "enp1s0";
-      join = [ "plaza" "kubenet" ];
-    };
-    nginx.enable = true;
-    monitoring.hostGrafana = true;
-    gitServer = {
-      enable = true;
-      gitweb.enable = true;
-    };
-  };
-}
diff --git a/machines/iso.nix b/machines/iso.nix
new file mode 100644
index 0000000..d3ca992
--- /dev/null
+++ b/machines/iso.nix
@@ -0,0 +1,33 @@
+{ modulesPath, pkgs, ... }: {
+  imports = [
+    (modulesPath + "/installer/cd-dvd/installation-cd-minimal.nix")
+    (modulesPath + "/installer/cd-dvd/channel.nix")
+  ];
+
+  nixpkgs.hostPlatform.system = "x86_64-linux";
+  nix.settings = {
+    experimental-features = [ "nix-command" "flakes" ];
+  };
+
+  environment.systemPackages = with pkgs; [
+    bash
+    git
+    gum
+    jq
+    (writeShellScriptBin "xinstall" ''
+      set -euo pipefail
+
+      FLAKE="github:kbujari/depot/xnet"
+
+      TARGET=$(
+        nix flake show "$FLAKE" --json 2>/dev/null \
+          | jq -r '.["nixosConfigurations"] | keys[] | select(. != "iso")' \
+          | gum choose
+      )
+
+      gum confirm --default=false "This will erase the selected disk, confirm:"
+
+      echo selected "$FLAKE"#"$TARGET"
+    '')
+  ];
+}
diff --git a/machines/iso/default.nix b/machines/iso/default.nix
deleted file mode 100644
index d27b26e..0000000
--- a/machines/iso/default.nix
+++ /dev/null
@@ -1,32 +0,0 @@
-{ modulesPath, pkgs, ... }: {
-  imports = [
-    (modulesPath + "/installer/cd-dvd/installation-cd-minimal.nix")
-    (modulesPath + "/installer/cd-dvd/channel.nix")
-  ];
-
-  nix.settings = {
-    experimental-features = [ "nix-command" "flakes" ];
-  };
-
-  environment.systemPackages = with pkgs; [
-    bash
-    git
-    gum
-    jq
-    (writeShellScriptBin "xinstall" ''
-      set -euo pipefail
-
-      FLAKE="github:kbujari/depot/xnet"
-
-      TARGET=$(
-        nix flake show "$FLAKE" --json 2>/dev/null \
-          | jq -r '.["nixosConfigurations"] | keys[] | select(. != "iso")' \
-          | gum choose
-      )
-
-      gum confirm --default=false "This will erase the selected disk, confirm:"
-
-      echo selected "$FLAKE"#"$TARGET"
-    '')
-  ];
-}
diff --git a/machines/natest.nix b/machines/natest.nix
new file mode 100644
index 0000000..1623bd3
--- /dev/null
+++ b/machines/natest.nix
@@ -0,0 +1,13 @@
+{ flake, modulesPath, perSystem, ... }: {
+  imports = [
+    flake.outputs.nixosModules.disk
+    (modulesPath + "/installer/cd-dvd/installation-cd-minimal.nix")
+    (modulesPath + "/profiles/qemu-guest.nix")
+  ];
+
+  nixpkgs.hostPlatform = "x86_64-linux";
+  system.stateVersion = "24.11";
+
+  environment.systemPackages = [ perSystem.self.partitioner ];
+  virtualisation.diskSize = 16384;
+}
diff --git a/machines/radon/default.nix b/machines/radon/default.nix
index 7615be8..e4dc09a 100644
--- a/machines/radon/default.nix
+++ b/machines/radon/default.nix
@@ -19,6 +19,7 @@ in
     ./pxeboot.nix
   ];
 
+  nixpkgs.hostPlatform.system = "x86_64-linux";
   system.stateVersion = "24.11";
   networking.hostName = "radon";
 
diff --git a/machines/t1.nix b/machines/t1.nix
new file mode 100644
index 0000000..200d1b4
--- /dev/null
+++ b/machines/t1.nix
@@ -0,0 +1,71 @@
+{ inputs, flake, pkgs, perSystem, ... }:
+
+let
+  inherit (inputs.nixos-hardware.nixosModules)
+    common-cpu-amd
+    common-gpu-amd
+    ;
+
+  inherit (import flake.outputs.nixosModules.users { inherit perSystem pkgs; })
+    kle;
+in
+{
+  imports = [
+    common-cpu-amd
+    common-gpu-amd
+    flake.outputs.nixosModules.disk
+  ];
+
+  nixpkgs.hostPlatform = "x86_64-linux";
+  system.stateVersion = "24.11";
+
+  users.users.kle = kle;
+
+  xnet = {
+    desktop.enable = true;
+    net = {
+      interface = "enp5s0";
+      join = [ "plaza" ];
+      sshd.enable = true;
+    };
+    disk = {
+      enable = true;
+      device = "/dev/nvme0n1";
+    };
+  };
+
+  networking.hostName = "t1";
+
+  programs = {
+    steam.enable = true;
+    steam.extraCompatPackages = [ pkgs.proton-ge-bin ];
+    corectrl = {
+      enable = true;
+      gpuOverclock.enable = true;
+    };
+  };
+
+  fileSystems = {
+    "/mnt/media" = {
+      device = "radon:/radon/media";
+      fsType = "nfs";
+      options = [ "noauto" "x-systemd.automount" "x-systemd.idle-timeout=600" ];
+    };
+
+    "/mnt/gammix" = {
+      device = "/dev/disk/by-uuid/bbbb4579-fac9-412e-a831-3034f7d27e04";
+      fsType = "ext4";
+      options = [ "users" "nofail" "noatime" ];
+    };
+  };
+
+  services.udev.packages = [ pkgs.ddcutil ];
+  environment.shellAliases.b = "${pkgs.ddcutil}/bin/ddcutil setvcp 10";
+  boot.kernelModules = [ "i2c-dev" ];
+
+  environment.systemPackages = with pkgs; [
+    ddcutil
+    prismlauncher
+    spotify
+  ];
+}
diff --git a/machines/t1/default.nix b/machines/t1/default.nix
deleted file mode 100644
index 7f375a1..0000000
--- a/machines/t1/default.nix
+++ /dev/null
@@ -1,68 +0,0 @@
-{ inputs, flake, pkgs, perSystem, ... }:
-
-let
-  inherit (inputs.nixos-hardware.nixosModules)
-    common-cpu-amd
-    common-gpu-amd
-    ;
-
-  inherit (import flake.outputs.nixosModules.users { inherit perSystem pkgs; }) kle;
-in
-{
-  imports = [
-    common-cpu-amd
-    common-gpu-amd
-  ];
-
-  system.stateVersion = "24.11";
-
-  users.users.kle = kle;
-
-  xnet = {
-    desktop.enable = true;
-    net = {
-      interface = "enp5s0";
-      join = [ "plaza" ];
-      sshd.enable = true;
-    };
-    disk = {
-      enable = true;
-      device = "/dev/nvme0n1";
-    };
-  };
-
-  networking.hostName = "t1";
-
-  programs = {
-    steam.enable = true;
-    steam.extraCompatPackages = [ pkgs.proton-ge-bin ];
-    corectrl = {
-      enable = true;
-      gpuOverclock.enable = true;
-    };
-  };
-
-  fileSystems = {
-    "/mnt/media" = {
-      device = "radon:/radon/media";
-      fsType = "nfs";
-      options = [ "noauto" "x-systemd.automount" "x-systemd.idle-timeout=600" ];
-    };
-
-    "/mnt/gammix" = {
-      device = "/dev/disk/by-uuid/bbbb4579-fac9-412e-a831-3034f7d27e04";
-      fsType = "ext4";
-      options = [ "users" "nofail" "noatime" ];
-    };
-  };
-
-  services.udev.packages = [ pkgs.ddcutil ];
-  environment.shellAliases.b = "${pkgs.ddcutil}/bin/ddcutil setvcp 10";
-  boot.kernelModules = [ "i2c-dev" ];
-
-  environment.systemPackages = with pkgs; [
-    ddcutil
-    prismlauncher
-    spotify
-  ];
-}
diff --git a/machines/t480.nix b/machines/t480.nix
new file mode 100644
index 0000000..2588bdc
--- /dev/null
+++ b/machines/t480.nix
@@ -0,0 +1,42 @@
+{ inputs, flake, perSystem, pkgs, ... }:
+let
+  inherit (inputs.nixos-hardware.nixosModules)
+    lenovo-thinkpad-t480
+    ;
+
+  inherit (import flake.outputs.nixosModules.users { inherit perSystem pkgs; }) kle;
+in
+{
+  imports = [
+    lenovo-thinkpad-t480
+  ];
+
+  nixpkgs.hostPlatform.system = "x86_64-linux";
+  system.stateVersion = "24.05";
+
+  xnet = {
+    desktop.enable = true;
+    disk = {
+      enable = true;
+      device = "/dev/nvme0n1";
+    };
+  };
+
+  users.users.kle = kle;
+
+  networking = {
+    hostName = "t480";
+    useDHCP = false;
+    dhcpcd.enable = false;
+    networkmanager = {
+      enable = true;
+      # dns = "none";
+      wifi.powersave = true;
+    };
+  };
+
+  programs.nm-applet.enable = true;
+  services.fwupd.enable = true;
+
+  xnet.persist = [ "/etc/NetworkManager/system-connections" ];
+}
diff --git a/machines/t480/default.nix b/machines/t480/default.nix
deleted file mode 100644
index 24b6bc6..0000000
--- a/machines/t480/default.nix
+++ /dev/null
@@ -1,41 +0,0 @@
-{ inputs, flake, perSystem, pkgs, ... }:
-let
-  inherit (inputs.nixos-hardware.nixosModules)
-    lenovo-thinkpad-t480
-    ;
-
-  inherit (import flake.outputs.nixosModules.users { inherit perSystem pkgs; }) kle;
-in
-{
-  imports = [
-    lenovo-thinkpad-t480
-  ];
-
-  system.stateVersion = "24.05";
-
-  xnet = {
-    desktop.enable = true;
-    disk = {
-      enable = true;
-      device = "/dev/nvme0n1";
-    };
-  };
-
-  users.users.kle = kle;
-
-  networking = {
-    hostName = "t480";
-    useDHCP = false;
-    dhcpcd.enable = false;
-    networkmanager = {
-      enable = true;
-      # dns = "none";
-      wifi.powersave = true;
-    };
-  };
-
-  programs.nm-applet.enable = true;
-  services.fwupd.enable = true;
-
-  xnet.persist = [ "/etc/NetworkManager/system-connections" ];
-}
-- 
cgit v1.3.1