fix home-manager modules

flake.nix

@@ -33,7 +33,7 @@
     let
       system = "x86_64-linux";
       host = "vm";
-      profile = "vm";
+      profile = "desktop";
       username = "josh";
     in
     {
@@ -43,7 +43,6 @@
           specialArgs = {
             inherit inputs;
             inherit host;
-            inherit profile;
             inherit username;
           };
           modules = [
@@ -56,7 +55,6 @@
           specialArgs = {
             inherit inputs;
             inherit host;
-            inherit profile;
             inherit username;
           };
           modules = [
@@ -65,19 +63,6 @@
             ./hosts/${host}
           ];
         };
-
-        nixosvm = nixpkgs.lib.nixosSystem {
-          inherit system;
-          specialArgs = {
-            inherit inputs;
-            inherit host;
-            inherit profile;
-            inherit username;
-          };
-          modules = [
-            ./hosts/${host}
-          ];
-        };
       };
 
       homeConfigurations.${username} = home-manager.lib.homeManagerConfiguration {
@@ -87,7 +72,8 @@
           };
         pkgs = nixpkgs.legacyPackages.${system};
         modules = [
-          ./modules/home
+          ./profiles/${profile}
+          ./homes/${username}
           stylix.homeModules.stylix
         ];
       };

homes/josh/home.nix

@@ -0,0 +1,23 @@
+{
+  ...
+}:
+{
+  imports = [
+    ../../modules/homes
+    ../../modules/options
+  ];
+
+  modules.zsh.enable = true;
+  modules.shell.defaultShell = "zsh";
+
+  home = {
+    username = "josh";
+    homeDirectory = "/home/josh";
+    stateVersion = "25.11";
+  };
+
+  # Let Home Manager install and manage itself
+  programs.home-manager.enable = true;
+
+  nix.settings.allowed-users = [ "josh" ];
+}

hosts/vm/default.nix

@@ -1,10 +1,10 @@
 {
-  profile,
   ...
 }:
 {
   imports = [
-    ../../profiles/${profile}
+    ../../profiles/desktop
+    ../../profiles/vm
     ../../modules/core
     ../../modules/options
 

modules/core/stylix.nix

@@ -1,10 +1,8 @@
 {
   inputs,
-  lib,
   pkgs,
   ...
 }:
-with lib;
 {
   imports = [ inputs.stylix.nixosModules.stylix ];
 

modules/core/user.nix

@@ -26,12 +26,7 @@ in
         ;
     };
     users.${username} = {
-      imports = [ ./../home ];
+      imports = [ ../../homes/${username}/home.nix ];
-      home = {
-        username = "${username}";
-        homeDirectory = "/home/${username}";
-        stateVersion = "25.05";
-      };
     };
   };
 
@@ -57,6 +52,4 @@ in
   environment.pathsToLink =
     [ ]
     ++ (if zshCfg.enable then [ "/share/zsh" ] else [ ]);
-
-  nix.settings.allowed-users = [ "${username}" ];
 }

modules/homes/default.nix

@@ -5,7 +5,6 @@
   imports = [
     ./direnv.nix
     ./fzf.nix
-    ./home.nix
     ./hyprland
     ./kitty.nix
     ./overlays.nix

modules/homes/home.nix

@@ -1,11 +0,0 @@
-{
-  username,
-  ...
-}:
-{
-  home = {
-    username = "${username}";
-    homeDirectory = "/home/${username}";
-    stateVersion = "25.11";
-  };
-}

modules/homes/hyprland/binds.nix

@@ -1,9 +1,9 @@
 {
-  osConfig,
+  config,
   ...
 }:
 let
-  cfg = osConfig.modules.hyprland;
+  cfg = config.modules.hyprland;
 in
 {
   wayland.windowManager.hyprland.settings = {

modules/homes/hyprland/hyprland.nix

@@ -1,12 +1,12 @@
 {
+  config,
   lib,
-  osConfig,
   pkgs,
   ...
 }:
 with lib;
 let
-  cfg = osConfig.modules.hyprland;
+  cfg = config.modules.hyprland;
 in
 {
   wayland.windowManager.hyprland = {

modules/homes/kitty.nix

@@ -1,13 +1,13 @@
 {
+  config,
   lib,
-  osConfig,
   pkgs,
   ...
 }:
 with lib;
 let
-  hyprlandCfg = osConfig.modules.hyprland;
+  hyprlandCfg = config.modules.hyprland;
-  zshCfg = osConfig.modules.zsh;
+  zshCfg = config.modules.zsh;
 in
 {
   config = mkIf (hyprlandCfg.terminal == "kitty") {

modules/homes/xdg.nix

@@ -1,19 +1,21 @@
 {
-  osConfig,
+  config,
+  lib,
   pkgs,
   ...
 }:
+with lib;
 let
-  hyprlandCfg = osConfig.modules.hyprland;
+  hyprlandCfg = config.modules.hyprland;
-  pipewireCfg = osConfig.modules.pipewire;
+  pipewireCfg = config.modules.pipewire;
-  plasmaCfg = osConfig.modules.plasma;
+  plasmaCfg = config.modules.plasma;
 in
 {
   xdg = {
     enable = true;
     mime.enable = true;
     mimeApps.enable = true;
-    portal = {
+    portal = mkIf (hyprlandCfg.enable or plasmaCfg.enable) {
       enable = true;
       extraPortals =
         [ ]

modules/homes/zsh/completion.nix

@@ -1,12 +1,11 @@
 {
   config,
   lib,
-  osConfig,
   ...
 }:
 with lib;
 let
-  cfg = osConfig.modules.zsh;
+  cfg = config.modules.zsh;
   xdgCfg = config.xdg;
 in
 {

modules/homes/zsh/default.nix

@@ -1,13 +1,12 @@
 {
   config,
   lib,
-  osConfig,
   pkgs,
   ...
 }:
 with lib;
 let
-  cfg = osConfig.modules.zsh;
+  cfg = config.modules.zsh;
   xdgCfg = config.xdg;
 in
 {

modules/homes/zsh/p10k.nix

@@ -1,12 +1,11 @@
 {
   config,
   lib,
-  osConfig,
   ...
 }:
 with lib;
 let
-  cfg = osConfig.modules.zsh;
+  cfg = config.modules.zsh;
   xdgCfg = config.xdg;
 in
 {

profiles/desktop/default.nix

@@ -0,0 +1,10 @@
+{
+  ...
+}:
+{
+  imports = [ ../../modules/options ];
+
+  modules.hyprland = {
+    enable = true;
+  };
+}

profiles/vm/default.nix

@@ -1,5 +1,4 @@
 {
-  vm,
   ...
 }:
 {

rebuild.sh

@@ -4,7 +4,7 @@ echo "Removing old qcow2 disk ..."
 rm -f ./vm.qcow2
 
 echo "Building new VM ..."
-nix build .#nixosConfigurations.nixosvm.config.system.build.vm
+nix build .#nixosConfigurations.nixos.config.system.build.vm
 
 if [ $? -ne 0 ]; then
     echo "Failed to build VM"