diff --git a/config/dolly/config.nix b/config/dolly/config.nix
deleted file mode 100644
index 12d1607ed3ee6cd3bb6e019c2dde7cce5e13a105..0000000000000000000000000000000000000000
--- a/config/dolly/config.nix
+++ /dev/null
@@ -1,39 +0,0 @@
-{config, pkgs, lib, inputs, modulesPath, flake, ...}:
-{
-  config.desktop.enable = true;
-  config.desktop.default_session = "plasmawayland";
-  config.desktop.dm_use_wayland = true;
-  config.laptop.enable = false;
-  config.screens.primary = "eDP-1";
-  config.screens.primary_orientation = "normal";
-  config.screens.primary_pos = "0 0 res 1920x1200";
-  #config.screens.secondary = "";
-  #config.screens.secondary_orientation = "";
-  #config.screens.secondary_pos = "";
-  config.screens.has_secondary = false;
-
-  config.swaybar.font_size = 12.0;
-  config.sway.inner_gap = 10;
-  config.sway.outer_gap = 10;
-
-  imports = [
-    ../common.nix
-    ../../users/myself/regina
-    ../../pkgs/desktop
-    ../../pkgs/security
-    ../../pkgs/dev
-    ../../pkgs/editor
-    ../../pkgs/web_browser
-    ../../pkgs/terminal
-    ../../pkgs/shell
-    ../../pkgs/util
-    ../../pkgs/communication
-    ../../pkgs/multimedia
-    ../../pkgs/gaming
-    ../../pkgs/disk
-    ../../pkgs/database
-    ../../pkgs/social_media
-    ../../pkgs/virtualisation
-    ../../pkgs/productivity
-  ];
-}
diff --git a/config/dolly/default.nix b/config/dolly/default.nix
deleted file mode 100644
index d4b61907e3b86f022cf89b2e56a841ba4afe686a..0000000000000000000000000000000000000000
--- a/config/dolly/default.nix
+++ /dev/null
@@ -1,72 +0,0 @@
-{ config, pkgs, lib, inputs, modulesPath, flake, ... }:
-
-{
-  imports =
-    [
-      ./config.nix
-      ../../pkgs/hardware/location/rehovot
-      ../../pkgs/hardware/locale/en_il
-      ../../pkgs/hardware/common
-    ];
-
-  networking.hostName = "dolly";
-
-  boot.kernelModules = [ "kvm-intel" "v4l2loopback" ];
-  boot.extraModulePackages = with pkgs; [ config.boot.kernelPackages.v4l2loopback.out ];
-
-  fileSystems."/" =
-    { device = "/dev/mapper/vg_main-root";
-      fsType = "btrfs";
-      options = [ "subvol=root" ];
-    };
-
-  fileSystems."/home" =
-    { device = "/dev/mapper/vg_main-root";
-      fsType = "btrfs";
-      options = [ "subvol=home" ];
-    };
-
-  fileSystems."/boot/efi" =
-    { device = "/dev/disk/by-uuid/D24A-CE7B";
-      fsType = "vfat";
-    };
-
-  swapDevices =
-    [ { device = "/dev/mapper/vg_main-swap"; }
-    ];
-
-  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
-  hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
-
-  system.stateVersion = "23.05";
-
-  boot.initrd = {
-    availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usb_storage" "usbhid" "sd_mod" ];
-    # Required to open the EFI partition and Yubikey
-    kernelModules = [ "vfat" "nls_cp437" "nls_iso8859-1" "usbhid" "dm-snapshot" ];
-
-
-    luks = {
-      # Support for Yubikey PBA
-      yubikeySupport = true;
-
-      devices."pv_main" = {
-        device = "/dev/disk/by-uuid/5973dd89-20a9-4e14-b7b2-491bb0e5ff7b"; #  nvme0n1p2
-        preLVM = true; # You may want to set this to false if you need to start a network service first
-        yubikey = {
-          slot = 2;
-          twoFactor = true; # Set to false for 1FA
-          #gracePeriod = 30; # Time in seconds to wait for Yubikey to be inserted
-          keyLength = 64; # Set to $KEY_LENGTH/8
-          saltLength = 16; # Set to $SALT_LENGTH
-
-          storage = {
-            device = "/dev/disk/by-uuid/D24A-CE7B"; #nvme0n1p1
-            fsType = "vfat";
-            path = "/crypt-storage/default";
-          };
-        };
-      };
-    };
-  };
-}
diff --git a/config/hermes/config.nix b/config/hermes/config.nix
deleted file mode 100644
index d71dd207e6e9b61544483482741cdd5af2c1c2c9..0000000000000000000000000000000000000000
--- a/config/hermes/config.nix
+++ /dev/null
@@ -1,39 +0,0 @@
-{config, pkgs, lib, inputs, modulesPath, flake, ...}:
-{
-  config.desktop.enable = true;
-  config.desktop.default_session = "plasmawayland";
-  config.desktop.dm_use_wayland = true;
-  config.laptop.enable = true;
-  config.screens.primary = "eDP-1";
-  config.screens.primary_orientation = "normal";
-  config.screens.primary_pos = "0 0 res 1920x1200";
-  #config.screens.secondary = "";
-  #config.screens.secondary_orientation = "";
-  #config.screens.secondary_pos = "";
-  config.screens.has_secondary = false;
-
-  config.swaybar.font_size = 12.0;
-  config.sway.inner_gap = 10;
-  config.sway.outer_gap = 10;
-
-  imports = [
-    ../common.nix
-    ../../users/myself/shmuelr
-    ../../pkgs/desktop
-    ../../pkgs/security
-    ../../pkgs/dev
-    ../../pkgs/editor
-    ../../pkgs/web_browser
-    ../../pkgs/terminal
-    ../../pkgs/shell
-    ../../pkgs/util
-    ../../pkgs/communication
-    ../../pkgs/multimedia
-    ../../pkgs/gaming
-    ../../pkgs/disk
-    ../../pkgs/database
-    ../../pkgs/social_media
-    ../../pkgs/virtualisation
-    ../../pkgs/productivity
-  ];
-}
diff --git a/config/hermes/default.nix b/config/hermes/default.nix
deleted file mode 100644
index dd1f35a3b57124de02033f7439e9f0c34a90709d..0000000000000000000000000000000000000000
--- a/config/hermes/default.nix
+++ /dev/null
@@ -1,73 +0,0 @@
-{ config, pkgs, lib, inputs, modulesPath, flake, ... }:
-
-{
-  imports =
-    [
-      ./config.nix
-      ../../pkgs/hardware/location/rehovot
-      ../../pkgs/hardware/locale/en_il
-      ../../pkgs/hardware/common
-      ../../pkgs/hardware/common/laptop
-    ];
-
-  networking.hostName = "hermes";
-
-  boot.kernelModules = [ "kvm-intel" "v4l2loopback" ];
-  boot.extraModulePackages = with pkgs; [ config.boot.kernelPackages.v4l2loopback.out ];
-
-  fileSystems."/" =
-    { device = "/dev/mapper/vg_main-root";
-      fsType = "btrfs";
-      options = [ "subvol=root" ];
-    };
-
-  fileSystems."/home" =
-    { device = "/dev/mapper/vg_main-root";
-      fsType = "btrfs";
-      options = [ "subvol=home" ];
-    };
-
-  fileSystems."/boot/efi" =
-    { device = "/dev/disk/by-uuid/4CAA-0DA3";
-      fsType = "vfat";
-    };
-
-  swapDevices =
-    [ { device = "/dev/mapper/vg_main-swap"; }
-    ];
-
-  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
-  hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
-
-  system.stateVersion = "23.05";
-
-  boot.initrd = {
-    availableKernelModules = [ "xhci_pci" "thunderbolt" "nvme" "usb_storage" "usbhid" "sd_mod" ];
-    # Required to open the EFI partition and Yubikey
-    kernelModules = [ "vfat" "nls_cp437" "nls_iso8859-1" "usbhid" "dm-snapshot" ];
-
-
-    luks = {
-      # Support for Yubikey PBA
-      yubikeySupport = true;
-
-      devices."pv_main" = {
-        device = "/dev/disk/by-uuid/c4805374-e37e-4a9b-8a50-fe86626c44fd"; #  nvme0n1p2
-        preLVM = true; # You may want to set this to false if you need to start a network service first
-        yubikey = {
-          slot = 2;
-          twoFactor = true; # Set to false for 1FA
-          #gracePeriod = 30; # Time in seconds to wait for Yubikey to be inserted
-          keyLength = 64; # Set to $KEY_LENGTH/8
-          saltLength = 16; # Set to $SALT_LENGTH
-
-          storage = {
-            device = "/dev/disk/by-uuid/4CAA-0DA3"; #nvme0n1p1
-            fsType = "vfat";
-            path = "/crypt-storage/default";
-          };
-        };
-      };
-    };
-  };
-}
diff --git a/config/hyperion/config.nix b/config/hyperion/config.nix
deleted file mode 100644
index 4e2e0d4746fbda254ae8496cb0f91c26c9c660d6..0000000000000000000000000000000000000000
--- a/config/hyperion/config.nix
+++ /dev/null
@@ -1,39 +0,0 @@
-{config, pkgs, lib, inputs, modulesPath, flake, ...}:
-{
-  config.desktop.enable = true;
-  config.desktop.default_session = "plasmawayland";
-  config.desktop.dm_use_wayland = true;
-  config.laptop.enable = false;
-  config.screens.primary = "eDP-1";
-  config.screens.primary_orientation = "normal";
-  config.screens.primary_pos = "0 0 res 1920x1080";
-  config.screens.secondary = "DP-3";
-  config.screens.secondary_orientation = "normal";
-  config.screens.secondary_pos = "0 1080 res 1920x515";
-  config.screens.has_secondary = true;
-
-  config.swaybar.font_size = 12.0;
-  config.sway.inner_gap = 10;
-  config.sway.outer_gap = 10;
-
-  imports = [
-    ../common.nix
-    ../../users/myself/henf
-    ../../pkgs/desktop
-    ../../pkgs/security
-    ../../pkgs/dev
-    ../../pkgs/editor
-    ../../pkgs/web_browser
-    ../../pkgs/terminal
-    ../../pkgs/shell
-    ../../pkgs/util
-    ../../pkgs/communication
-    ../../pkgs/multimedia
-    ../../pkgs/gaming
-    ../../pkgs/disk
-    ../../pkgs/database
-    ../../pkgs/social_media
-    ../../pkgs/virtualisation
-    ../../pkgs/productivity
-  ];
-}
diff --git a/config/hyperion/default.nix b/config/hyperion/default.nix
deleted file mode 100644
index dcc42bb689976790726814cda18b7e031e9b83c3..0000000000000000000000000000000000000000
--- a/config/hyperion/default.nix
+++ /dev/null
@@ -1,44 +0,0 @@
-{ config, pkgs, lib, inputs, modulesPath, flake, ... }:
-
-{
-  imports =
-    [
-      ./config.nix
-      ../../pkgs/hardware/location/rehovot
-      ../../pkgs/hardware/locale/en_il
-      ../../pkgs/hardware/common
-      ../../pkgs/hardware/common/desktop
-    ];
-
-  networking.hostName = "hyperion";
-
-  boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usbhid" "usb_storage" "sd_mod"  ];
-  boot.initrd.kernelModules = [ ];
-  boot.kernelModules = [ "kvm-intel" "v4l2loopback" ];
-  boot.extraModulePackages = with pkgs; [ config.boot.kernelPackages.v4l2loopback.out ];
-
-  # Setup keyfile
-  boot.initrd.secrets = {
-    "/crypto_keyfile.bin" = null;
-  };
-
-  fileSystems."/" =
-    { device = "/dev/disk/by-uuid/e686b7b4-e2e0-47b1-9621-80d3e140abfc";
-      fsType = "btrfs";
-      options = [ "subvol=@" ];
-    };
-
-  boot.initrd.luks.devices."luks-ff7a2647-e4e8-4fd5-961f-2c60b8bad0a5".device = "/dev/disk/by-uuid/ff7a2647-e4e8-4fd5-961f-2c60b8bad0a5";
-
-  fileSystems."/boot/efi" =
-    { device = "/dev/disk/by-uuid/9F37-D8D3";
-      fsType = "vfat";
-    };
-
-  swapDevices = [ ];
-
-  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
-  hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
-
-  system.stateVersion = "23.05";
-}
diff --git a/config/kinnara/config.nix b/config/kinnara/config.nix
deleted file mode 100644
index f5f3ebdb051ab47d8ecf45cf25e5528de188b33d..0000000000000000000000000000000000000000
--- a/config/kinnara/config.nix
+++ /dev/null
@@ -1,39 +0,0 @@
-{config, pkgs, lib, inputs, modulesPath, flake, ...}:
-{
-  config.desktop.enable = true;
-  config.desktop.default_session = "plasmawayland";
-  config.desktop.dm_use_wayland = true;
-  config.laptop.enable = false;
-  config.screens.primary = "eDP-1";
-  config.screens.primary_orientation = "normal";
-  config.screens.primary_pos = "0 0 res 1920x1200";
-  #config.screens.secondary = "";
-  #config.screens.secondary_orientation = "";
-  #config.screens.secondary_pos = "";
-  config.screens.has_secondary = false;
-
-  config.swaybar.font_size = 12.0;
-  config.sway.inner_gap = 10;
-  config.sway.outer_gap = 10;
-
-  imports = [
-    ../common.nix
-    ../../users/myself/hazem
-    ../../pkgs/desktop
-    ../../pkgs/security
-    ../../pkgs/dev
-    ../../pkgs/editor
-    ../../pkgs/web_browser
-    ../../pkgs/terminal
-    ../../pkgs/shell
-    ../../pkgs/util
-    ../../pkgs/communication
-    ../../pkgs/multimedia
-    ../../pkgs/gaming
-    ../../pkgs/disk
-    ../../pkgs/database
-    ../../pkgs/social_media
-    ../../pkgs/virtualisation
-    ../../pkgs/productivity
-  ];
-}
diff --git a/config/kinnara/default.nix b/config/kinnara/default.nix
deleted file mode 100644
index d951c921a3437cb191a8bb9d739f7e4fe1e0f62b..0000000000000000000000000000000000000000
--- a/config/kinnara/default.nix
+++ /dev/null
@@ -1,72 +0,0 @@
-{ config, pkgs, lib, inputs, modulesPath, flake, ... }:
-
-{
-  imports =
-    [
-      ./config.nix
-      ../../pkgs/hardware/location/rehovot
-      ../../pkgs/hardware/locale/en_il
-      ../../pkgs/hardware/common
-    ];
-
-  networking.hostName = "kinnara";
-
-  boot.kernelModules = [ "kvm-intel" "v4l2loopback" ];
-  boot.extraModulePackages = with pkgs; [ config.boot.kernelPackages.v4l2loopback.out ];
-
-  fileSystems."/" =
-    { device = "/dev/mapper/vg_main-root";
-      fsType = "btrfs";
-      options = [ "subvol=root" ];
-    };
-
-  fileSystems."/home" =
-    { device = "/dev/mapper/vg_main-root";
-      fsType = "btrfs";
-      options = [ "subvol=home" ];
-    };
-
-  fileSystems."/boot/efi" =
-    { device = "/dev/disk/by-uuid/C23B-AE9F";
-      fsType = "vfat";
-    };
-
-  swapDevices =
-    [ { device = "/dev/mapper/vg_main-swap"; }
-    ];
-
-  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
-  hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
-
-  system.stateVersion = "23.05";
-
-  boot.initrd = {
-    availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usb_storage" "usbhid" "sd_mod" ];
-    # Required to open the EFI partition and Yubikey
-    kernelModules = [ "vfat" "nls_cp437" "nls_iso8859-1" "usbhid" "dm-snapshot" ];
-
-
-    luks = {
-      # Support for Yubikey PBA
-      yubikeySupport = true;
-
-      devices."pv_main" = {
-        device = "/dev/disk/by-uuid/70b216db-cc94-4f93-b061-d4b871ebcb64"; #  nvme0n1p2
-        preLVM = true; # You may want to set this to false if you need to start a network service first
-        yubikey = {
-          slot = 2;
-          twoFactor = true; # Set to false for 1FA
-          #gracePeriod = 30; # Time in seconds to wait for Yubikey to be inserted
-          keyLength = 64; # Set to $KEY_LENGTH/8
-          saltLength = 16; # Set to $SALT_LENGTH
-
-          storage = {
-            device = "/dev/disk/by-uuid/C23B-AE9F"; #nvme0n1p1
-            fsType = "vfat";
-            path = "/crypt-storage/default";
-          };
-        };
-      };
-    };
-  };
-}
diff --git a/config/macaria/config.nix b/config/macaria/config.nix
deleted file mode 100755
index 2877bb04a14d5464644b26b7c513fe261e063809..0000000000000000000000000000000000000000
--- a/config/macaria/config.nix
+++ /dev/null
@@ -1,39 +0,0 @@
-{config, pkgs, lib, inputs, modulesPath, flake, ...}:
-{
-  config.desktop.enable = true;
-  config.desktop.default_session = "plasmawayland";
-  config.desktop.dm_use_wayland = true;
-  config.laptop.enable = false;
-  config.screens.primary = "eDP-1";
-  config.screens.primary_orientation = "normal";
-  config.screens.primary_pos = "0 0 res 1920x1080";
-  #config.screens.secondary = "DP-3";
-  #config.screens.secondary_orientation = "normal";
-  #config.screens.secondary_pos = "0 1080 res 1920x515";
-  config.screens.has_secondary = false;
-
-  config.swaybar.font_size = 12.0;
-  config.sway.inner_gap = 10;
-  config.sway.outer_gap = 10;
-
-  imports = [
-    ../common.nix
-    ../../users/myself/henf
-    ../../pkgs/desktop
-    ../../pkgs/security
-    ../../pkgs/dev
-    ../../pkgs/editor
-    ../../pkgs/web_browser
-    ../../pkgs/terminal
-    ../../pkgs/shell
-    ../../pkgs/util
-    ../../pkgs/communication
-    ../../pkgs/multimedia
-    ../../pkgs/gaming
-    ../../pkgs/disk
-    ../../pkgs/database
-    ../../pkgs/social_media
-    ../../pkgs/virtualisation
-    ../../pkgs/productivity
-  ];
-}
diff --git a/config/macaria/default.nix b/config/macaria/default.nix
deleted file mode 100755
index 7cdb3ed9ceb6659bac5a8cb5bf9405dc9d6a0283..0000000000000000000000000000000000000000
--- a/config/macaria/default.nix
+++ /dev/null
@@ -1,73 +0,0 @@
-{ config, pkgs, lib, inputs, modulesPath, flake, ... }:
-
-{
-  imports =
-    [
-      ./config.nix
-      ../../pkgs/hardware/location/rehovot
-      ../../pkgs/hardware/locale/en_il
-      ../../pkgs/hardware/common
-      ../../pkgs/hardware/common/laptop
-    ];
-
-  networking.hostName = "macaria";
-
-  boot.kernelModules = [ "kvm-intel" "v4l2loopback" ];
-  boot.extraModulePackages = with pkgs; [ config.boot.kernelPackages.v4l2loopback.out ];
-
-  fileSystems."/" =
-    { device = "/dev/disk/by-uuid/9d9ec7da-9912-4814-a41a-3cc4a4a73b3e";
-      fsType = "btrfs";
-      options = [ "subvol=root" ];
-    };
-
-  fileSystems."/home" =
-    { device = "/dev/disk/by-uuid/9d9ec7da-9912-4814-a41a-3cc4a4a73b3e";
-      fsType = "btrfs";
-      options = [ "subvol=home" ];
-    };
-
-  fileSystems."/boot/efi" =
-    { device = "/dev/disk/by-uuid/2EE3-6AE9";
-      fsType = "vfat";
-    };
-
-  swapDevices =
-    [ { device = "/dev/disk/by-uuid/4a1bd029-f25e-4f94-bf49-c82e077c72af"; }
-    ];
-
-  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
-  hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
-
-  system.stateVersion = "23.05";
-
-  boot.initrd = {
-    availableKernelModules = [ "xhci_pci" "vmd" "nvme" "usbhid" "usb_storage" "sd_mod" "rtsx_pci_sdmmc" ];
-    # Required to open the EFI partition and Yubikey
-    kernelModules = [ "vfat" "nls_cp437" "nls_iso8859-1" "usbhid" "dm-snapshot" ];
-
-
-    luks = {
-      # Support for Yubikey PBA
-      yubikeySupport = true;
-
-      devices."pv_main" = {
-        device = "/dev/disk/by-uuid/ea7dc339-24ad-4abf-84db-4588ea8a760c"; #  nvme0n1p2
-        preLVM = true; # You may want to set this to false if you need to start a network service first
-        yubikey = {
-          slot = 2;
-          twoFactor = true; # Set to false for 1FA
-          #gracePeriod = 30; # Time in seconds to wait for Yubikey to be inserted
-          keyLength = 64; # Set to $KEY_LENGTH/8
-          saltLength = 16; # Set to $SALT_LENGTH
-
-          storage = {
-            device = "/dev/disk/by-uuid/2EE3-6AE9"; #nvme0n1p1
-            fsType = "vfat";
-            path = "/crypt-storage/default";
-          };
-        };
-      };
-    };
-  };
-}
diff --git a/config/ramos/config.nix b/config/ramos/config.nix
deleted file mode 100755
index b0e2bc5179622d67bebf14de7b1584f710d4645c..0000000000000000000000000000000000000000
--- a/config/ramos/config.nix
+++ /dev/null
@@ -1,39 +0,0 @@
-{config, pkgs, lib, inputs, modulesPath, flake, ...}:
-{
-  config.desktop.enable = true;
-  config.desktop.default_session = "plasmawayland";
-  config.desktop.dm_use_wayland = true;
-  config.laptop.enable = true;
-  config.screens.primary = "eDP-1";
-  config.screens.primary_orientation = "normal";
-  config.screens.primary_pos = "0 0 res 1920x1080";
-  #config.screens.secondary = "DP-3";
-  #config.screens.secondary_orientation = "normal";
-  #config.screens.secondary_pos = "0 1080 res 1920x515";
-  config.screens.has_secondary = false;
-
-  config.swaybar.font_size = 12.0;
-  config.sway.inner_gap = 10;
-  config.sway.outer_gap = 10;
-
-  imports = [
-    ../common.nix
-    ../../users/myself/shahar
-    ../../pkgs/desktop
-    ../../pkgs/security
-    ../../pkgs/dev
-    ../../pkgs/editor
-    ../../pkgs/web_browser
-    ../../pkgs/terminal
-    ../../pkgs/shell
-    ../../pkgs/util
-    ../../pkgs/communication
-    ../../pkgs/multimedia
-    ../../pkgs/gaming
-    ../../pkgs/disk
-    ../../pkgs/database
-    ../../pkgs/social_media
-    ../../pkgs/virtualisation
-    ../../pkgs/productivity
-  ];
-}
diff --git a/config/ramos/default.nix b/config/ramos/default.nix
deleted file mode 100644
index 5843560ed6ffebe9cfe823bf1060bba060f2a941..0000000000000000000000000000000000000000
--- a/config/ramos/default.nix
+++ /dev/null
@@ -1,73 +0,0 @@
-{ config, pkgs, lib, inputs, modulesPath, flake, ... }:
-
-{
-  imports =
-    [
-      ./config.nix
-      ../../pkgs/hardware/location/rehovot
-      ../../pkgs/hardware/locale/en_il
-      ../../pkgs/hardware/common
-      ../../pkgs/hardware/common/laptop
-    ];
-
-  networking.hostName = "ramos";
-
-  boot.kernelModules = [ "kvm-intel" "v4l2loopback" ];
-  boot.extraModulePackages = with pkgs; [ config.boot.kernelPackages.v4l2loopback.out ];
-
-  fileSystems."/" =
-    { device = "/dev/disk/by-uuid/03666e2d-146d-4c1f-8a62-403ada388339";
-      fsType = "btrfs";
-      options = [ "subvol=root" ];
-    };
-
-  fileSystems."/home" =
-    { device = "/dev/disk/by-uuid/03666e2d-146d-4c1f-8a62-403ada388339";
-      fsType = "btrfs";
-      options = [ "subvol=home" ];
-    };
-
-  fileSystems."/boot/efi" =
-    { device = "/dev/disk/by-uuid/0275-1F90";
-      fsType = "vfat";
-    };
-
-  swapDevices =
-    [ { device = "/dev/disk/by-uuid/1344458a-7afd-490e-8f38-e7dbd37dbf34"; }
-    ];
-
-  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
-  hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
-
-  system.stateVersion = "23.05";
-
-  boot.initrd = {
-    availableKernelModules = [ "xhci_pci" "thunderbolt" "nvme" "usbhid" "usb_storage" "sd_mod" ];
-    # Required to open the EFI partition and Yubikey
-    kernelModules = [ "vfat" "nls_cp437" "nls_iso8859-1" "usbhid" "dm-snapshot" ];
-
-
-    luks = {
-      # Support for Yubikey PBA
-      yubikeySupport = true;
-
-      devices."pv_main" = {
-        device = "/dev/disk/by-uuid/00417004-32ff-46e2-9faf-779b039f570a"; #  nvme0n1p2
-        preLVM = true; # You may want to set this to false if you need to start a network service first
-        yubikey = {
-          slot = 2;
-          twoFactor = true; # Set to false for 1FA
-          #gracePeriod = 30; # Time in seconds to wait for Yubikey to be inserted
-          keyLength = 64; # Set to $KEY_LENGTH/8
-          saltLength = 16; # Set to $SALT_LENGTH
-
-          storage = {
-            device = "/dev/disk/by-uuid/0275-1F90"; #nvme0n1p1
-            fsType = "vfat";
-            path = "/crypt-storage/default";
-          };
-        };
-      };
-    };
-  };
-}