fix up remote 109-199-104-83

9 files changed, 62 insertions, 61 deletions

diff --git a/flake.nix b/flake.nix
index 0b3eafa..b82efd8 100644
--- a/flake.nix
+++ b/flake.nix
@@ -64,6 +64,7 @@
           ++ [
             ./users.nix
             ./secrets.nix
+            ./modules/nixos/common.nix
             impermanence.nixosModules.impermanence
             agenix.nixosModules.default
             nixos-mailserver.nixosModule
diff --git a/machines.nix b/machines.nix
index be8023e..853a402 100644
--- a/machines.nix
+++ b/machines.nix
@@ -9,7 +9,7 @@
 
       # hardware configuration
       # includes `system.stateVersion`
-      ./machines/lenovo.nix
+      ./modules/nixos/machines/lenovo.nix
 
       # boot process
       # systemd-boot
@@ -18,9 +18,6 @@
       # networking
       ./modules/nixos/laptop.nix
 
-      # boilerplate settings
-      ./modules/nixos/common.nix
-
       # ly display manager
       ./modules/nixos/ly.nix
 
@@ -41,7 +38,7 @@
 
       # hardware configuration
       # verbatim as `nixos-generate-config` AND `system.stateVersion`
-      ./machines/109-199-104-83.nix
+      ./modules/nixos/machines/109-199-104-83.nix
 
       # boot process
       # grub boot on /dev/sda
@@ -49,6 +46,7 @@
 
       # networking
       ./modules/nixos/networking/domains/galaxious.de.nix
+      # uses cloud-init to network
       ./modules/nixos/networking/networks/109-199-104-83.nix
 
       # ssh through port 5522 among other things
@@ -57,9 +55,6 @@
       ./modules/nixos/networking/ssh-as-root.nix
       ({config, ...}: {users.users.root.openssh.authorizedKeys.keys = [config.pub-keys.ssh.andromeda];})
 
-      # boilerplate settings
-      ./modules/nixos/common.nix
-
       # simple-nixos-mailserver email server
       # mail.domain
       ./modules/nixos/mailserver.nix
diff --git a/machines/109-199-104-83.nix b/machines/109-199-104-83.nix
deleted file mode 100644
index 9b61ca4..0000000
--- a/machines/109-199-104-83.nix
+++ /dev/null
@@ -1,35 +0,0 @@
-# Do not modify this file!  It was generated by ‘nixos-generate-config’
-# and may be overwritten by future invocations.  Please make changes
-# to /etc/nixos/configuration.nix instead.
-{
-  config,
-  lib,
-  pkgs,
-  modulesPath,
-  ...
-}: {
-  imports = [
-    (modulesPath + "/profiles/qemu-guest.nix")
-  ];
-
-  boot.initrd.availableKernelModules = ["ata_piix" "uhci_hcd" "virtio_pci" "virtio_scsi" "sd_mod"];
-  boot.initrd.kernelModules = [];
-  boot.kernelModules = [];
-  boot.extraModulePackages = [];
-
-  fileSystems."/" = {
-    device = "/dev/disk/by-uuid/159e6a69-b4e2-49c3-a6f0-5fcba0ea6a59";
-    fsType = "ext4";
-  };
-
-  fileSystems."/efi" = {
-    device = "systemd-1";
-    fsType = "autofs";
-  };
-
-  swapDevices = [];
-
-  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
-
-  system.stateVersion = "25.11";
-}
diff --git a/modules/nixos/boot/109-199-104-83.nix b/modules/nixos/boot/109-199-104-83.nix
index ec2def1..d54de8e 100644
--- a/modules/nixos/boot/109-199-104-83.nix
+++ b/modules/nixos/boot/109-199-104-83.nix
@@ -1,3 +1,7 @@
 {
-  boot.loader.grub.device = "/dev/sda";
+  boot.loader.grub = {
+    devices = ["/dev/sda"];
+    efiSupport = true;
+    efiInstallAsRemovable = true;
+  };
 }
diff --git a/modules/nixos/impermanence.nix b/modules/nixos/impermanence.nix
index 7f0062b..91e0dd7 100644
--- a/modules/nixos/impermanence.nix
+++ b/modules/nixos/impermanence.nix
@@ -7,6 +7,7 @@
       "/var/log"
       "/var/lib/nixos"
       "/var/lib/systemd/coredump"
+      "/etc/ssh"
     ];
     files = [
       "/etc/machine-id"
diff --git a/modules/nixos/laptop.nix b/modules/nixos/laptop.nix
index 9002c49..314fead 100644
--- a/modules/nixos/laptop.nix
+++ b/modules/nixos/laptop.nix
@@ -33,7 +33,5 @@
     "/var/lib/bluetooth"
     # wifi connections
     "/etc/NetworkManager/system-connections"
-    # machine ssh keys
-    "/etc/ssh"
   ];
 }
diff --git a/modules/nixos/machines/109-199-104-83.nix b/modules/nixos/machines/109-199-104-83.nix
new file mode 100644
index 0000000..85399e9
--- /dev/null
+++ b/modules/nixos/machines/109-199-104-83.nix
@@ -0,0 +1,49 @@
+# Do not modify this file!  It was generated by ‘nixos-generate-config’
+# and may be overwritten by future invocations.  Please make changes
+# to /etc/nixos/configuration.nix instead.
+{
+  config,
+  lib,
+  pkgs,
+  modulesPath,
+  ...
+}: {
+  imports = [
+    (modulesPath + "/profiles/qemu-guest.nix")
+  ];
+
+  boot.initrd.availableKernelModules = ["ata_piix" "uhci_hcd" "virtio_pci" "virtio_scsi" "sd_mod" "sr_mod"];
+  boot.initrd.kernelModules = [];
+  boot.kernelModules = [];
+  boot.extraModulePackages = [];
+
+  fileSystems."/" = {
+    device = "tmpfs";
+    fsType = "tmpfs";
+    options = ["defaults" "mode=755"];
+  };
+
+  fileSystems."/nix" = {
+    device = "/dev/disk/by-uuid/3457e181-b01d-4712-809d-c8b65e863992";
+    fsType = "btrfs";
+    options = ["subvol=nix"];
+  };
+
+  fileSystems."/persist" = {
+    device = "/dev/disk/by-uuid/3457e181-b01d-4712-809d-c8b65e863992";
+    fsType = "btrfs";
+    options = ["subvol=persist"];
+  };
+
+  fileSystems."/boot" = {
+    device = "/dev/disk/by-uuid/05FB-0941";
+    fsType = "vfat";
+    options = ["fmask=0022" "dmask=0022"];
+  };
+
+  swapDevices = [];
+
+  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
+
+  system.stateVersion = "26.05";
+}
diff --git a/machines/lenovo.nix b/modules/nixos/machines/lenovo.nix
index 86255b1..86255b1 100644
--- a/machines/lenovo.nix
+++ b/modules/nixos/machines/lenovo.nix
diff --git a/modules/nixos/networking/networks/109-199-104-83.nix b/modules/nixos/networking/networks/109-199-104-83.nix
index 2cacb55..ad599b1 100644
--- a/modules/nixos/networking/networks/109-199-104-83.nix
+++ b/modules/nixos/networking/networks/109-199-104-83.nix
@@ -1,7 +1,6 @@
 {
   networking = {
-    useNetworkd = true;
-    usePredictableInterfaceNames = true;
+    useDHCP = false;
     hostName = "109-199-104-83";
     firewall = {
       enable = true;
@@ -9,19 +8,8 @@
       allowedUDPPorts = [80 443];
     };
   };
-  systemd.network = {
+  services.cloud-init = {
     enable = true;
-    networks."40-wan" = {
-      matchConfig.Name = "enx0050565f4fff";
-      address = ["2a02:c207:2299:8419::1/64" "109.199.104.83/20"];
-      routes = [
-        {
-          Gateway = "109.199.96.1";
-          GatewayOnLink = true;
-        }
-        {Gateway = "fe80::1";}
-      ];
-      dns = ["2620:fe::fe" "9.9.9.9"];
-    };
+    network.enable = true;
   };
 }