diff --git a/hosts/ymir/configuration.nix b/hosts/ymir/configuration.nix
index cad9bc1..dcc3948 100644
--- a/hosts/ymir/configuration.nix
+++ b/hosts/ymir/configuration.nix
@@ -108,20 +108,17 @@
   users.users.crony = {
     isNormalUser = true;
     description = "Crony";
-    hashedPasswordFile = "${config.age.secrets.crony-passwd.path}";
+    # hashedPasswordFile = "${config.age.secrets.crony-passwd.path}";
     extraGroups = ["networkmanager" "wheel" "video" "input" "audio" "gamemode" "seat"];
   };
 
-  users.users.root.hashedPasswordFile = "${config.age.secrets.root-passwd.path}";
+  # users.users.root.hashedPasswordFile = "${config.age.secrets.root-passwd.path}";
 
-  users.mutableUsers = false;
+  # users.mutableUsers = false;
 
   # Allow unfree packages
   nixpkgs.config.allowUnfree = true;
 
-  # Enable my flake specific settings
-  crony.secrets.enable = true;
-
   # List packages installed in system profile
   environment.systemPackages = with pkgs; [
     neovim
diff --git a/hosts/ymir/disk-config.nix b/hosts/ymir/disk-config.nix
index a496f62..f061911 100644
--- a/hosts/ymir/disk-config.nix
+++ b/hosts/ymir/disk-config.nix
@@ -22,7 +22,11 @@
               content = {
                 type = "luks";
                 name = "crypt";
-                settings.allowDiscards = true;
+                passwordFile = "/tmp/secret.key"; # Interactive
+                settings = {
+                  allowDiscards = true;
+                  keyFile = "/tmp/secret.key";
+                };
                 content = {
                   type = "btrfs";
                   extraArgs = ["-f"];
diff --git a/hosts/ymir/hardware-configuration.nix b/hosts/ymir/hardware-configuration.nix
index d45cece..e0970af 100644
--- a/hosts/ymir/hardware-configuration.nix
+++ b/hosts/ymir/hardware-configuration.nix
@@ -17,6 +17,19 @@
   boot.kernelModules = ["kvm-amd"];
   boot.extraModulePackages = [];
 
+  fileSystems."/" = {
+    device = "/dev/disk/by-uuid/0fbf752d-9234-42bd-9e04-8246de85e8d6";
+    fsType = "ext4";
+  };
+
+  fileSystems."/boot" = {
+    device = "/dev/disk/by-uuid/3156-31B6";
+    fsType = "vfat";
+    options = ["fmask=0077" "dmask=0077"];
+  };
+
+  swapDevices = [];
+
   # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
   # (the default) this is the recommended approach. When using systemd-networkd it's
   # still possible to use this option, but it's recommended to use it in conjunction
diff --git a/modules/cross-platform/home-manager/neovim.nix b/modules/cross-platform/home-manager/neovim.nix
index 64683ec..d8f77c0 100644
--- a/modules/cross-platform/home-manager/neovim.nix
+++ b/modules/cross-platform/home-manager/neovim.nix
@@ -131,10 +131,10 @@ in {
                 server = "nixd";
                 options = {
                   nixos = {
-                    expr = ''(builtins.getFlake "/home/crony/repos/nixos").nixosConfigurations.CONFIGNAME.options'';
+                    expr = ''(builtins.getFlake "/home/crony/Repos/nixos").nixosConfigurations.CONFIGNAME.options'';
                   };
                   home_manager = {
-                    expr = ''(builtins.getFlake "/home/crony/repos/nixos").homeConfigurations.CONFIGNAME.options'';
+                    expr = ''(builtins.getFlake "/home/crony/Repos/nixos").homeConfigurations.CONFIGNAME.options'';
                   };
                 };
               };
diff --git a/modules/linux/nixos/nh.nix b/modules/linux/nixos/nh.nix
index 05b4e72..a2275dd 100644
--- a/modules/linux/nixos/nh.nix
+++ b/modules/linux/nixos/nh.nix
@@ -11,7 +11,7 @@
     # Install nh
     programs.nh = {
       enable = true;
-      flake = "/home/crony/repos/nixos";
+      flake = "/home/crony/Repos/nixos";
       clean = {
         enable = true;
         extraArgs = "--keep 5 --keep-since 3d";