diff --git a/README.md b/README.md
index b3dcf410..73076c3f 100644
--- a/README.md
+++ b/README.md
@@ -10,7 +10,7 @@ echo 'LUKSEncryptionKeyHere' >> /tmp/secret.key
 nix run github:nix-community/disko -- --mode disko /tmp/disks.nix
 mkdir -p /mnt/etc/nixos/
 git clone https://git.sysctl.io/albert/nix /etc/nixos/git
-nixos-install --flake /etc/nixos/git#${HOSTNAME} -v --show-trace
+nixos-install --flake /etc/nixos/git#${HOSTNAME} -v --show-trace --no-root-password
 ```
 
 ![Gruv'd Hyprland](./screenshot.png "Hyprland with a Gruvboxy theme")
diff --git a/lib/default.nix b/lib/default.nix
index 77570252..ce1d2799 100644
--- a/lib/default.nix
+++ b/lib/default.nix
@@ -51,10 +51,10 @@
       ../nixos
       inputs.sops-nix.nixosModules.sops
       inputs.lanzaboote.nixosModules.lanzaboote
-      # inputs.home-manager.nixosModules.home-manager {
-      #   home-manager.extraSpecialArgs  = { inherit inputs outputs desktop hostname username hmStateVersion stateVersion gpu platform theme format; };
-      #   home-manager.users."${username}" = import ../home-manager;
-      # }
+      inputs.home-manager.nixosModules.home-manager {
+        home-manager.extraSpecialArgs  = { inherit inputs outputs desktop hostname username hmStateVersion stateVersion gpu platform theme format; };
+        home-manager.users."${username}" = import ../home-manager;
+      }
     ];
   };
 
@@ -77,10 +77,6 @@
       ../nixos/minimal.nix
       inputs.sops-nix.nixosModules.sops
       inputs.lanzaboote.nixosModules.lanzaboote
-      # inputs.home-manager.nixosModules.home-manager {
-      #   home-manager.extraSpecialArgs  = { inherit inputs outputs desktop hostname username hmStateVersion stateVersion gpu platform theme format; };
-      #   home-manager.users."${username}" = import ../home-manager;
-      # }
     ];
   };
 
diff --git a/nixos/common/modules/secureboot.nix b/nixos/common/modules/secureboot.nix
index c2bb5c6c..ea404570 100644
--- a/nixos/common/modules/secureboot.nix
+++ b/nixos/common/modules/secureboot.nix
@@ -1,18 +1,4 @@
 { lib, config, pkgs, ...}: {
-  # Bootloader
-  boot.loader.efi.canTouchEfiVariables = true;
-  boot.tmp.cleanOnBoot = true;
-
-  # Plymouth splash screen 
-  boot.plymouth.enable = true;
-  # https://github.com/adi1090x/plymouth-themes
-  boot.plymouth.theme = "red_loader";
-  boot.plymouth.themePackages = [ pkgs.adi1090x-plymouth-themes ];
-  boot.initrd.systemd.enable = true;
-  boot.kernelParams = ["quiet"];
-
-  # SecureBoot
-  boot.loader.systemd-boot.enable = lib.mkForce false;
   boot.lanzaboote.enable = true;
   boot.lanzaboote.pkiBundle = "/etc/secureboot";
 }
\ No newline at end of file
diff --git a/nixos/default.nix b/nixos/default.nix
index 1c1832d0..2fa6d8d4 100644
--- a/nixos/default.nix
+++ b/nixos/default.nix
@@ -24,6 +24,21 @@
       ./hosts/${hostname}
     ] ++ lib.optional (builtins.isString desktop) ./common/desktops/${desktop};
 
+    # Bootloader
+    boot.loader.efi.canTouchEfiVariables = true;
+    boot.tmp.cleanOnBoot = true;
+
+    # Plymouth splash screen 
+    boot.plymouth.enable = true;
+    # https://github.com/adi1090x/plymouth-themes
+    boot.plymouth.theme = "red_loader";
+    boot.plymouth.themePackages = [ pkgs.adi1090x-plymouth-themes ];
+    boot.initrd.systemd.enable = true;
+    boot.kernelParams = ["quiet"];
+
+    # SecureBoot
+    boot.loader.systemd-boot.enable = lib.mkForce false;
+
   # List packages installed in system profile
   environment.systemPackages = with pkgs; [
     sbctl