diff --git a/lib/default.nix b/lib/default.nix
index 718b0bf9..00674e20 100644
--- a/lib/default.nix
+++ b/lib/default.nix
@@ -160,17 +160,7 @@ lib
         inputs.api.nixosModules.default
         inputs.wsl.nixosModules.wsl
         { imports = (nixFiles ../platforms/nixos); }
-        module
-        # (builtins.removeAttrs module [ "home-manager" ])
-        {
-          home-manager = {
-            extraSpecialArgs = {
-              inherit colorscheme;
-            }
-            // specialArgs;
-          }
-          // homeModule.home-manager;
-        }
+        (builtins.removeAttrs module [ "home-manager" ])
       ];
     };
 
diff --git a/platforms/nixos/modules/nmasur/profiles/base.nix b/platforms/nixos/modules/nmasur/profiles/base.nix
index b8619ac7..3a429c75 100644
--- a/platforms/nixos/modules/nmasur/profiles/base.nix
+++ b/platforms/nixos/modules/nmasur/profiles/base.nix
@@ -29,7 +29,7 @@ in
       };
     };
 
-    programs.fish.enable = lib.mkDefault config.home-manager.users.${username}.programs.fish.enable;
+    programs.fish.enable = lib.mkDefault (config.home-manager.users.${username}.programs.fish.enable or true);
 
     # Allows us to declaritively set password
     users.mutableUsers = lib.mkDefault false;
@@ -62,7 +62,7 @@ in
     #   serviceConfig.TimeoutStartSec = lib.mkForce "45m";
     # };
 
-    allowUnfreePackages = config.home-manager.users.${username}.allowUnfreePackages;
+    allowUnfreePackages = config.home-manager.users.${username}.allowUnfreePackages or [];
 
     wsl.enable = lib.mkDefault false;