diff --git a/flake.nix b/flake.nix
index ea99242..f6508ee 100644
--- a/flake.nix
+++ b/flake.nix
@@ -77,6 +77,8 @@
       }
     );
 
+    homeManagerModules = import ./modules/home-manager;
+
     # NixOS configuration entrypoint
     # Available through 'nixos-rebuild --flake .#your-hostname'
     nixosConfigurations = {
diff --git a/roles/home-manager/minimal-terminal.nix b/roles/home-manager/minimal-terminal.nix
index fad9e35..b2e2525 100644
--- a/roles/home-manager/minimal-terminal.nix
+++ b/roles/home-manager/minimal-terminal.nix
@@ -12,8 +12,8 @@
   ];
 
   user = {
-    git.enable = true;
-    nvim.enable = true;
+    git.enable = lib.mkDefault true;
+    nvim.enable = lib.mkDefault true;
   };
 
   home.packages = with pkgs; [
diff --git a/roles/home-manager/terminal.nix b/roles/home-manager/terminal.nix
index bf5b77f..49e1777 100644
--- a/roles/home-manager/terminal.nix
+++ b/roles/home-manager/terminal.nix
@@ -13,8 +13,8 @@
 
   user = {
     nvim = {
-      enable-lsp = true;
-      enable-treesitter = true;
+      enable-lsp = lib.mkDefault true;
+      enable-treesitter = lib.mkDefault true;
     };
   };