From 980a840b55c5fcca7d6eeebac93fce3361203280 Mon Sep 17 00:00:00 2001
From: coolneng <akasroua@gmail.com>
Date: Mon, 23 Jan 2023 23:47:16 +0100
Subject: [PATCH] Update hardware configuration

---
 modules/hardware-configuration.nix | 111 +++++++++++++++--------------
 1 file changed, 58 insertions(+), 53 deletions(-)

diff --git a/modules/hardware-configuration.nix b/modules/hardware-configuration.nix
index c43e154..8ff586d 100644
--- a/modules/hardware-configuration.nix
+++ b/modules/hardware-configuration.nix
@@ -23,23 +23,8 @@
       fsType = "vfat";
     };
 
-  fileSystems."/vault" =
-    { device = "vault";
-      fsType = "zfs";
-    };
-
-  fileSystems."/var/lib/wallabag" =
-    { device = "vault/state_directories/wallabag";
-      fsType = "zfs";
-    };
-
-  fileSystems."/var/lib/matrix-as-facebook" =
-    { device = "vault/state_directories/matrix-as-facebook";
-      fsType = "zfs";
-    };
-
-  fileSystems."/var/lib/matrix-as-signal" =
-    { device = "vault/state_directories/matrix-as-signal";
+  fileSystems."/var/lib/containers" =
+    { device = "vault/containers";
       fsType = "zfs";
     };
 
@@ -48,8 +33,28 @@
       fsType = "zfs";
     };
 
-  fileSystems."/var/lib/containers" =
-    { device = "vault/containers";
+  fileSystems."/var/lib/matrix-as-signal" =
+    { device = "vault/state_directories/matrix-as-signal";
+      fsType = "zfs";
+    };
+
+  fileSystems."/vault" =
+    { device = "vault";
+      fsType = "zfs";
+    };
+
+  fileSystems."/var/lib/matrix-as-facebook" =
+    { device = "vault/state_directories/matrix-as-facebook";
+      fsType = "zfs";
+    };
+
+  fileSystems."/var/lib/matrix-as-telegram" =
+    { device = "vault/state_directories/matrix-as-telegram";
+      fsType = "zfs";
+    };
+
+  fileSystems."/var/lib/wallabag" =
+    { device = "vault/state_directories/wallabag";
       fsType = "zfs";
     };
 
@@ -58,31 +63,6 @@
       fsType = "zfs";
     };
 
-  fileSystems."/vault/syncthing" =
-    { device = "vault/syncthing";
-      fsType = "zfs";
-    };
-
-  fileSystems."/vault/git" =
-    { device = "vault/git";
-      fsType = "zfs";
-    };
-
-  fileSystems."/vault/nextcloud" =
-    { device = "vault/nextcloud";
-      fsType = "zfs";
-    };
-
-  fileSystems."/vault/radicale" =
-    { device = "vault/radicale";
-      fsType = "zfs";
-    };
-
-  fileSystems."/vault/backups" =
-    { device = "vault/backups";
-      fsType = "zfs";
-    };
-
   fileSystems."/var/lib/containers/storage/zfs-containers/1996d0540bceeb3dea027b3e5ef9e6cd94ea527ce657bf6461286d7b4afa637f/userdata/shm" =
     { device = "shm";
       fsType = "tmpfs";
@@ -93,6 +73,36 @@
       fsType = "tmpfs";
     };
 
+  fileSystems."/var/lib/containers/storage/zfs-containers/151ec7c12d73e7e161d8df82605f911820f25e6186d655a18c54b481c4be723f/userdata/shm" =
+    { device = "shm";
+      fsType = "tmpfs";
+    };
+
+  fileSystems."/vault/git" =
+    { device = "vault/git";
+      fsType = "zfs";
+    };
+
+  fileSystems."/vault/syncthing" =
+    { device = "vault/syncthing";
+      fsType = "zfs";
+    };
+
+  fileSystems."/vault/nextcloud" =
+    { device = "vault/nextcloud";
+      fsType = "zfs";
+    };
+
+  fileSystems."/vault/backups" =
+    { device = "vault/backups";
+      fsType = "zfs";
+    };
+
+  fileSystems."/vault/radicale" =
+    { device = "vault/radicale";
+      fsType = "zfs";
+    };
+
   fileSystems."/vault/backups/zion" =
     { device = "vault/backups/zion";
       fsType = "zfs";
@@ -108,18 +118,13 @@
       fsType = "zfs";
     };
 
-  fileSystems."/var/lib/containers/storage/zfs-containers/151ec7c12d73e7e161d8df82605f911820f25e6186d655a18c54b481c4be723f/userdata/shm" =
+  fileSystems."/var/lib/containers/storage/zfs-containers/522343abee32edddd051c93a47bc7d2208e0bbcef724e4c4319cbbc49f5d361d/userdata/shm" =
     { device = "shm";
       fsType = "tmpfs";
     };
 
-  fileSystems."/var/lib/containers/storage/zfs/graph/f2a87aec02a119c5c647d9fc498868ccae1974016f1697d7eac76c3e9631782b" =
-    { device = "vault/containers/f2a87aec02a119c5c647d9fc498868ccae1974016f1697d7eac76c3e9631782b";
-      fsType = "zfs";
-    };
-
-  fileSystems."/var/lib/matrix-as-telegram" =
-    { device = "vault/state_directories/matrix-as-telegram";
+  fileSystems."/var/lib/containers/storage/zfs/graph/a2d664f5b5b3cbda9c55f28fafdbb02486330f981826ee1a2cf842fa1679c2d8" =
+    { device = "vault/containers/a2d664f5b5b3cbda9c55f28fafdbb02486330f981826ee1a2cf842fa1679c2d8";
       fsType = "zfs";
     };
 
@@ -132,7 +137,7 @@
   networking.useDHCP = lib.mkDefault true;
   # networking.interfaces.cni-podman0.useDHCP = lib.mkDefault true;
   # networking.interfaces.eth0.useDHCP = lib.mkDefault true;
-  # networking.interfaces.vethac091923.useDHCP = lib.mkDefault true;
+  # networking.interfaces.vethfa1b4afe.useDHCP = lib.mkDefault true;
   # networking.interfaces.wg0.useDHCP = lib.mkDefault true;
   # networking.interfaces.wlan0.useDHCP = lib.mkDefault true;