From b38c892d764b9d1f723fa8f92f62121943c4ac12 Mon Sep 17 00:00:00 2001 From: coolneng Date: Mon, 2 Jan 2023 14:40:18 +0100 Subject: [PATCH] fixup! Update hardware configuration --- modules/hardware-configuration.nix | 36 +++++++++++++++++++----------- 1 file changed, 23 insertions(+), 13 deletions(-) diff --git a/modules/hardware-configuration.nix b/modules/hardware-configuration.nix index 7319a7a..a3b23e3 100644 --- a/modules/hardware-configuration.nix +++ b/modules/hardware-configuration.nix @@ -23,8 +23,8 @@ fsType = "vfat"; }; - fileSystems."/var/lib/containers" = - { device = "vault/containers"; + fileSystems."/vault" = + { device = "vault"; fsType = "zfs"; }; @@ -43,6 +43,11 @@ fsType = "zfs"; }; + fileSystems."/var/lib/containers" = + { device = "vault/containers"; + fsType = "zfs"; + }; + fileSystems."/var/lib/matrix-as-telegram" = { device = "vault/state_directories/matrix-as-telegram"; fsType = "zfs"; @@ -53,18 +58,13 @@ fsType = "zfs"; }; - fileSystems."/vault" = - { device = "vault"; - fsType = "zfs"; - }; - fileSystems."/var/lib/matrix-as-signal" = { device = "vault/state_directories/matrix-as-signal"; fsType = "zfs"; }; - fileSystems."/vault/backups" = - { device = "vault/backups"; + fileSystems."/vault/git" = + { device = "vault/git"; fsType = "zfs"; }; @@ -78,8 +78,8 @@ fsType = "zfs"; }; - fileSystems."/vault/git" = - { device = "vault/git"; + fileSystems."/vault/backups" = + { device = "vault/backups"; fsType = "zfs"; }; @@ -88,6 +88,11 @@ fsType = "zfs"; }; + fileSystems."/var/lib/containers/storage/zfs-containers/1996d0540bceeb3dea027b3e5ef9e6cd94ea527ce657bf6461286d7b4afa637f/userdata/shm" = + { device = "shm"; + fsType = "tmpfs"; + }; + fileSystems."/vault/backups/zion" = { device = "vault/backups/zion"; fsType = "zfs"; @@ -103,11 +108,16 @@ fsType = "zfs"; }; - fileSystems."/var/lib/containers/storage/zfs-containers/1996d0540bceeb3dea027b3e5ef9e6cd94ea527ce657bf6461286d7b4afa637f/userdata/shm" = + fileSystems."/var/lib/containers/storage/zfs-containers/737d2ce2ce884a2dffe6640ad1e0ea8fe2cf0a200f13a9490bb7f89bb19940cb/userdata/shm" = { device = "shm"; fsType = "tmpfs"; }; + fileSystems."/var/lib/containers/storage/zfs/graph/2b2e937f15fc061c5d36b703db6b6c3aa38a39390462cb486f5a6eaa8a8ab2c0" = + { device = "vault/containers/2b2e937f15fc061c5d36b703db6b6c3aa38a39390462cb486f5a6eaa8a8ab2c0"; + fsType = "zfs"; + }; + swapDevices = [ ]; # Enables DHCP on each ethernet and wireless interface. In case of scripted networking @@ -117,7 +127,7 @@ networking.useDHCP = lib.mkDefault true; # networking.interfaces.cni-podman0.useDHCP = lib.mkDefault true; # networking.interfaces.eth0.useDHCP = lib.mkDefault true; - # networking.interfaces.veth0c5bb8a0.useDHCP = lib.mkDefault true; + # networking.interfaces.vethae13c274.useDHCP = lib.mkDefault true; # networking.interfaces.wg0.useDHCP = lib.mkDefault true; # networking.interfaces.wlan0.useDHCP = lib.mkDefault true;