diff --git a/flake.nix b/flake.nix
index f0b79cc..4aceb5d 100644
--- a/flake.nix
+++ b/flake.nix
@@ -14,62 +14,90 @@
 
     flake-utils.url = "github:numtide/flake-utils";
 
-    utils.url = "github:gytis-ivaskevicius/flake-utils-plus";
-    utils.inputs.flake-utils.follows = "flake-utils";
+    utils = {
+      url = "github:gytis-ivaskevicius/flake-utils-plus";
+      inputs.flake-utils.follows = "flake-utils";
+    };
 
-    agenix.url = "github:ryantm/agenix";
-    agenix.inputs.nixpkgs.follows = "nixpkgs";
+    agenix = {
+      url = "github:ryantm/agenix";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
 
-    home-manager.url = "github:nix-community/home-manager";
-    home-manager.inputs.nixpkgs.follows = "nixpkgs";
-    home-manager.inputs.utils.follows = "flake-utils";
+    home-manager = {
+      url = "github:nix-community/home-manager";
+      inputs.nixpkgs.follows = "nixpkgs";
+      inputs.utils.follows = "flake-utils";
+    };
 
     # Zsh specific
-    forgit-git.url = "github:wfxr/forgit";
-    forgit-git.flake = false;
+    forgit-git = {
+      url = "github:wfxr/forgit";
+      flake = false;
+    };
 
     # Laptop Touchpad
-    asus-touchpad-numpad-driver.url = "github:MoritzBoehme/asus-touchpad-numpad-driver/german-layout";
-    asus-touchpad-numpad-driver.flake = false;
+    asus-touchpad-numpad-driver = {
+      url = "github:MoritzBoehme/asus-touchpad-numpad-driver/german-layout";
+      flake = false;
+    };
 
-    arkenfox-userjs.url = "github:arkenfox/user.js";
-    arkenfox-userjs.flake = false;
+    arkenfox-userjs = {
+      url = "github:arkenfox/user.js";
+      flake = false;
+    };
 
-    howdy.url = "sourcehut:~moritzboehme/howdy";
-    howdy.inputs.nixpkgs.follows = "nixpkgs";
+    howdy = {
+      url = "sourcehut:~moritzboehme/howdy";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
 
     emacs.url = "git+ssh://git@gitea.moritzboeh.me/moritz/emacs.git?ref=main";
 
     neovim.url = "github:neovim/neovim?dir=contrib";
 
-    nil.url = "github:oxalica/nil";
-    nil.inputs.nixpkgs.follows = "nixpkgs";
-    nil.inputs.flake-utils.follows = "flake-utils";
+    nil = {
+      url = "github:oxalica/nil";
+      inputs.nixpkgs.follows = "nixpkgs";
+      inputs.flake-utils.follows = "flake-utils";
+    };
 
     # Hyprland
     hyprland.url = "github:hyprwm/Hyprland";
     hyprpaper.url = "github:hyprwm/hyprpaper";
     hypr-contrib.url = "github:hyprwm/contrib";
 
-    nvim-treesitter-textsubjects.url = "github:RRethy/nvim-treesitter-textsubjects";
-    nvim-treesitter-textsubjects.flake = false;
+    nvim-treesitter-textsubjects = {
+      url = "github:RRethy/nvim-treesitter-textsubjects";
+      flake = false;
+    };
 
-    smartcolumn-nvim.url = "github:m4xshen/smartcolumn.nvim";
-    smartcolumn-nvim.flake = false;
+    smartcolumn-nvim = {
+      url = "github:m4xshen/smartcolumn.nvim";
+      flake = false;
+    };
 
-    copilot-lua.url = "github:zbirenbaum/copilot.lua";
-    copilot-lua.flake = false;
+    copilot-lua = {
+      url = "github:zbirenbaum/copilot.lua";
+      flake = false;
+    };
 
-    lspsaga-nvim.url = "github:glepnir/lspsaga.nvim";
-    lspsaga-nvim.flake = false;
+    lspsaga-nvim = {
+      url = "github:glepnir/lspsaga.nvim";
+      flake = false;
+    };
 
-    advanced-git-search-nvim.url = "github:aaronhallaert/advanced-git-search.nvim";
-    advanced-git-search-nvim.flake = false;
+    advanced-git-search-nvim = {
+      url = "github:aaronhallaert/advanced-git-search.nvim";
+      flake = false;
+    };
 
-    attic.url = "github:zhaofengli/attic";
-    attic.inputs.nixpkgs.follows = "nixpkgs";
-    attic.inputs.nixpkgs-stable.follows = "stable";
-    attic.inputs.flake-utils.follows = "flake-utils";
+    attic = {
+      url = "github:zhaofengli/attic";
+      inputs.nixpkgs.follows = "nixpkgs";
+      inputs.nixpkgs-stable.follows = "stable";
+      inputs.flake-utils.follows = "flake-utils";
+    };
   };
 
   outputs =
@@ -117,23 +145,23 @@
         ./modules/profiles/gaming.nix
         ./modules/profiles/desktop.nix
       ];
-
-      hostDefaults.modules = [
-        ./modules/default.nix
-        self.nixosModules.base
-        inputs.home-manager.nixosModule
-        {
-          home-manager = {
-            useGlobalPkgs = true;
-            useUserPackages = true;
-            extraSpecialArgs = { inherit inputs self; };
-          };
-        }
-        inputs.hyprland.nixosModules.default
-        inputs.agenix.nixosModules.age
-        inputs.howdy.nixosModules.default
-      ];
-
+      hostDefaults = {
+        modules = [
+          ./modules/default.nix
+          self.nixosModules.base
+          inputs.home-manager.nixosModule
+          {
+            home-manager = {
+              useGlobalPkgs = true;
+              useUserPackages = true;
+              extraSpecialArgs = { inherit inputs self; };
+            };
+          }
+          inputs.hyprland.nixosModules.default
+          inputs.agenix.nixosModules.age
+          inputs.howdy.nixosModules.default
+        ];
+      };
 
       hosts.nixos-laptop.modules = [
         ./hosts/nixos-laptop
diff --git a/hosts/nixos-laptop/hardware-configuration.nix b/hosts/nixos-laptop/hardware-configuration.nix
index 9d88a4c..0a7d47b 100644
--- a/hosts/nixos-laptop/hardware-configuration.nix
+++ b/hosts/nixos-laptop/hardware-configuration.nix
@@ -11,11 +11,9 @@
 
   boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "ahci" "rtsx_pci_sdmmc" ];
   boot.initrd.kernelModules = [ ];
-  boot.initrd.systemd.enable = true;
   boot.kernelModules = [ "kvm-amd" ];
   boot.extraModulePackages = [ ];
 
-
   fileSystems."/" = {
     device = "/dev/disk/by-uuid/4a91d3eb-1633-42d9-8304-c10e49a61154";
     fsType = "btrfs";
@@ -23,7 +21,6 @@
   };
 
   boot.initrd.luks.devices."enc".device = "/dev/disk/by-uuid/078b81ba-238e-471d-9951-b743588532b8";
-  boot.initrd.luks.devices."enc".crypttabExtraOpts = [ "fido2-device=auto" ];
 
   fileSystems."/log" = {
     device = "/dev/disk/by-uuid/4a91d3eb-1633-42d9-8304-c10e49a61154";