Cleaned up some files (#14)

spietras · Feb 5, 2024 · 335a970 · 335a970
1 parent 0112e8a
commit 335a970
Show file tree

Hide file tree

Showing 4 changed files with 52 additions and 30 deletions.
diff --git a/src/hosts/xenon/modules/motd/default.nix b/src/hosts/xenon/modules/motd/default.nix
@@ -4,6 +4,17 @@
   pkgs,
   ...
 }: {
+  environment = {
+    persistence = {
+      "/softstate" = {
+        files = [
+          # MOTD
+          "/etc/motd"
+        ];
+      };
+    };
+  };
+
   systemd = {
     services = {
       # Create a service for changing the MOTD

diff --git a/src/hosts/xenon/modules/network/default.nix b/src/hosts/xenon/modules/network/default.nix
@@ -4,6 +4,17 @@
   pkgs,
   ...
 }: {
+  environment = {
+    persistence = {
+      "/softstate" = {
+        directories = [
+          # Network connections
+          "/etc/NetworkManager/system-connections/"
+        ];
+      };
+    };
+  };
+
   networking = {
     dhcpcd = {
       # Disable dhcpcd, we use NetworkManager which has its own DHCP client

diff --git a/src/hosts/xenon/modules/ssh/default.nix b/src/hosts/xenon/modules/ssh/default.nix
@@ -1,25 +1,15 @@
 # SSH server configuration
 {
+  config,
   lib,
   pkgs,
   ...
 }: {
-  users = {
-    users = {
-      spietras = {
-        openssh = {
-          authorizedKeys = {
-            # Take public keys from GitHub
-            keys = lib.strings.splitString "\n" (
-              builtins.readFile (
-                pkgs.fetchurl {
-                  url = "https://github.com/spietras.keys";
-                  sha256 = "sha256-gtXwzFGet2t8scHAP8lAZqFx2FjfYxAc+zqLecv+8Ik=";
-                }
-              )
-            );
-          };
-        };
+  environment = {
+    persistence = {
+      "/softstate" = {
+        # SSH host keys
+        files = map (key: key.path) config.services.openssh.hostKeys;
       };
     };
   };
@@ -55,4 +45,24 @@
       enable = true;
     };
   };
+
+  users = {
+    users = {
+      spietras = {
+        openssh = {
+          authorizedKeys = {
+            # Take public keys from GitHub
+            keys = lib.strings.splitString "\n" (
+              builtins.readFile (
+                pkgs.fetchurl {
+                  url = "https://github.com/spietras.keys";
+                  sha256 = "sha256-gtXwzFGet2t8scHAP8lAZqFx2FjfYxAc+zqLecv+8Ik=";
+                }
+              )
+            );
+          };
+        };
+      };
+    };
+  };
 }
diff --git a/src/hosts/xenon/modules/storage/default.nix b/src/hosts/xenon/modules/storage/default.nix
@@ -20,9 +20,6 @@
       # State that should be preserved but it's okay to lose
       "/softstate" = {
         directories = [
-          # Network connections
-          "/etc/NetworkManager/system-connections/"
-
           # Cache that should be preserved
           "/var/cache/"
 
@@ -39,17 +36,10 @@
           "/var/tmp/"
         ];
 
-        files =
-          [
-            # Machine ID should be preserved and not changed
-            "/etc/machine-id"
-
-            # MOTD
-            "/etc/motd"
-          ]
-          ++
-          # SSH host keys
-          map (key: key.path) config.services.openssh.hostKeys;
+        files = [
+          # Machine ID should be preserved and not changed
+          "/etc/machine-id"
+        ];
 
         # Don't display as mounts to reduce clutter
         hideMounts = true;