diff --git a/modules/hardware-configuration.nix b/modules/hardware-configuration.nix index 8ff586d..87ac5f8 100644 --- a/modules/hardware-configuration.nix +++ b/modules/hardware-configuration.nix @@ -23,21 +23,6 @@ fsType = "vfat"; }; - fileSystems."/var/lib/containers" = - { device = "vault/containers"; - fsType = "zfs"; - }; - - fileSystems."/var/lib/gitea" = - { device = "vault/state_directories/gitea"; - fsType = "zfs"; - }; - - fileSystems."/var/lib/matrix-as-signal" = - { device = "vault/state_directories/matrix-as-signal"; - fsType = "zfs"; - }; - fileSystems."/vault" = { device = "vault"; fsType = "zfs"; @@ -48,29 +33,39 @@ fsType = "zfs"; }; + fileSystems."/var/lib/matrix-as-signal" = + { device = "vault/state_directories/matrix-as-signal"; + fsType = "zfs"; + }; + fileSystems."/var/lib/matrix-as-telegram" = { device = "vault/state_directories/matrix-as-telegram"; fsType = "zfs"; }; + fileSystems."/var/lib/containers" = + { device = "vault/containers"; + fsType = "zfs"; + }; + fileSystems."/var/lib/wallabag" = { device = "vault/state_directories/wallabag"; fsType = "zfs"; }; + fileSystems."/var/lib/gitea" = + { device = "vault/state_directories/gitea"; + fsType = "zfs"; + }; + fileSystems."/var/lib/signald" = { device = "vault/state_directories/signald"; fsType = "zfs"; }; - fileSystems."/var/lib/containers/storage/zfs-containers/1996d0540bceeb3dea027b3e5ef9e6cd94ea527ce657bf6461286d7b4afa637f/userdata/shm" = - { device = "shm"; - fsType = "tmpfs"; - }; - - fileSystems."/var/lib/containers/storage/zfs-containers/737d2ce2ce884a2dffe6640ad1e0ea8fe2cf0a200f13a9490bb7f89bb19940cb/userdata/shm" = - { device = "shm"; - fsType = "tmpfs"; + fileSystems."/vault/syncthing" = + { device = "vault/syncthing"; + fsType = "zfs"; }; fileSystems."/var/lib/containers/storage/zfs-containers/151ec7c12d73e7e161d8df82605f911820f25e6186d655a18c54b481c4be723f/userdata/shm" = @@ -78,19 +73,24 @@ fsType = "tmpfs"; }; + fileSystems."/var/lib/containers/storage/zfs-containers/1996d0540bceeb3dea027b3e5ef9e6cd94ea527ce657bf6461286d7b4afa637f/userdata/shm" = + { device = "shm"; + fsType = "tmpfs"; + }; + fileSystems."/vault/git" = { device = "vault/git"; fsType = "zfs"; }; - fileSystems."/vault/syncthing" = - { device = "vault/syncthing"; - fsType = "zfs"; + fileSystems."/var/lib/containers/storage/zfs-containers/522343abee32edddd051c93a47bc7d2208e0bbcef724e4c4319cbbc49f5d361d/userdata/shm" = + { device = "shm"; + fsType = "tmpfs"; }; - fileSystems."/vault/nextcloud" = - { device = "vault/nextcloud"; - fsType = "zfs"; + fileSystems."/var/lib/containers/storage/zfs-containers/737d2ce2ce884a2dffe6640ad1e0ea8fe2cf0a200f13a9490bb7f89bb19940cb/userdata/shm" = + { device = "shm"; + fsType = "tmpfs"; }; fileSystems."/vault/backups" = @@ -118,13 +118,13 @@ fsType = "zfs"; }; - fileSystems."/var/lib/containers/storage/zfs-containers/522343abee32edddd051c93a47bc7d2208e0bbcef724e4c4319cbbc49f5d361d/userdata/shm" = + fileSystems."/var/lib/containers/storage/zfs-containers/1dece57fa7124ac19a7f9b1b97b32d1ea137775ec33a35375741f3e74be3e85e/userdata/shm" = { device = "shm"; fsType = "tmpfs"; }; - fileSystems."/var/lib/containers/storage/zfs/graph/a2d664f5b5b3cbda9c55f28fafdbb02486330f981826ee1a2cf842fa1679c2d8" = - { device = "vault/containers/a2d664f5b5b3cbda9c55f28fafdbb02486330f981826ee1a2cf842fa1679c2d8"; + fileSystems."/var/lib/containers/storage/zfs/graph/55d4a7a3d27c0581144429911443c5b08fee9f6ff23a800d6a943267dbb5cdfd" = + { device = "vault/containers/55d4a7a3d27c0581144429911443c5b08fee9f6ff23a800d6a943267dbb5cdfd"; fsType = "zfs"; }; @@ -137,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.vethfa1b4afe.useDHCP = lib.mkDefault true; + # networking.interfaces.veth3fa9be3c.useDHCP = lib.mkDefault true; # networking.interfaces.wg0.useDHCP = lib.mkDefault true; # networking.interfaces.wlan0.useDHCP = lib.mkDefault true;