From 3a48ca63cb790af32d92ca10570367552d7476d2 Mon Sep 17 00:00:00 2001
From: coolneng <akasroua@gmail.com>
Date: Mon, 2 Jan 2023 13:54:40 +0100
Subject: [PATCH] Update hardware configuration

---
 modules/hardware-configuration.nix | 57 ++++++++++++++----------------
 1 file changed, 26 insertions(+), 31 deletions(-)

diff --git a/modules/hardware-configuration.nix b/modules/hardware-configuration.nix
index 4132176..7319a7a 100644
--- a/modules/hardware-configuration.nix
+++ b/modules/hardware-configuration.nix
@@ -23,13 +23,8 @@
       fsType = "vfat";
     };
 
-  fileSystems."/vault" =
-    { device = "vault";
-      fsType = "zfs";
-    };
-
-  fileSystems."/var/lib/matrix-as-signal" =
-    { device = "vault/state_directories/matrix-as-signal";
+  fileSystems."/var/lib/containers" =
+    { device = "vault/containers";
       fsType = "zfs";
     };
 
@@ -43,13 +38,13 @@
       fsType = "zfs";
     };
 
-  fileSystems."/var/lib/matrix-as-telegram" =
-    { device = "vault/state_directories/matrix-as-telegram";
+  fileSystems."/var/lib/signald" =
+    { device = "vault/state_directories/signald";
       fsType = "zfs";
     };
 
-  fileSystems."/var/lib/signald" =
-    { device = "vault/state_directories/signald";
+  fileSystems."/var/lib/matrix-as-telegram" =
+    { device = "vault/state_directories/matrix-as-telegram";
       fsType = "zfs";
     };
 
@@ -58,13 +53,13 @@
       fsType = "zfs";
     };
 
-  fileSystems."/vault/git" =
-    { device = "vault/git";
+  fileSystems."/vault" =
+    { device = "vault";
       fsType = "zfs";
     };
 
-  fileSystems."/vault/nextcloud" =
-    { device = "vault/nextcloud";
+  fileSystems."/var/lib/matrix-as-signal" =
+    { device = "vault/state_directories/matrix-as-signal";
       fsType = "zfs";
     };
 
@@ -78,6 +73,21 @@
       fsType = "zfs";
     };
 
+  fileSystems."/vault/nextcloud" =
+    { device = "vault/nextcloud";
+      fsType = "zfs";
+    };
+
+  fileSystems."/vault/git" =
+    { device = "vault/git";
+      fsType = "zfs";
+    };
+
+  fileSystems."/vault/syncthing" =
+    { device = "vault/syncthing";
+      fsType = "zfs";
+    };
+
   fileSystems."/vault/backups/zion" =
     { device = "vault/backups/zion";
       fsType = "zfs";
@@ -93,26 +103,11 @@
       fsType = "zfs";
     };
 
-  fileSystems."/vault/syncthing" =
-    { device = "vault/syncthing";
-      fsType = "zfs";
-    };
-
-  fileSystems."/var/lib/containers" =
-    { device = "vault/containers";
-      fsType = "zfs";
-    };
-
   fileSystems."/var/lib/containers/storage/zfs-containers/1996d0540bceeb3dea027b3e5ef9e6cd94ea527ce657bf6461286d7b4afa637f/userdata/shm" =
     { device = "shm";
       fsType = "tmpfs";
     };
 
-  fileSystems."/var/lib/containers/storage/zfs/graph/0dc5c84e61d9dccc2f00f9ab164cd1df2ee6e6bf642b99e7d25638ee5e4fe994" =
-    { device = "vault/containers/0dc5c84e61d9dccc2f00f9ab164cd1df2ee6e6bf642b99e7d25638ee5e4fe994";
-      fsType = "zfs";
-    };
-
   swapDevices = [ ];
 
   # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
@@ -122,7 +117,7 @@
   networking.useDHCP = lib.mkDefault true;
   # networking.interfaces.cni-podman0.useDHCP = lib.mkDefault true;
   # networking.interfaces.eth0.useDHCP = lib.mkDefault true;
-  # networking.interfaces.vethefb4a13e.useDHCP = lib.mkDefault true;
+  # networking.interfaces.veth0c5bb8a0.useDHCP = lib.mkDefault true;
   # networking.interfaces.wg0.useDHCP = lib.mkDefault true;
   # networking.interfaces.wlan0.useDHCP = lib.mkDefault true;