flake.nix

@@ -27,13 +27,12 @@
       nixpkgs,
       home-manager,
       install-system,
-      stylix,
       ...
     }@inputs:
     let
       system = "x86_64-linux";
       host = "vm";
-      profile = "desktop";
+      profile = "vm";
       username = "josh";
     in
     {
@@ -65,20 +64,20 @@
             ./hosts/${host}
           ];
         };
-      };
 
-      homeConfigurations.${username} = home-manager.lib.homeManagerConfiguration {
-          extraSpecialArgs = {
+        nixosvm = nixpkgs.lib.nixosSystem {
+          inherit system;
+          specialArgs = {
             inherit inputs;
+            inherit host;
             inherit profile;
             inherit username;
           };
-        pkgs = nixpkgs.legacyPackages.${system};
           modules = [
-          ./homes/${username}/home.nix
-          stylix.homeModules.stylix
+            ./hosts/${host}
           ];
         };
+      };
 
       devShell.${system} = nixpkgs.legacyPackages.${system}.pkgs.mkShell {
         packages = with nixpkgs.legacyPackages.${system}.pkgs; [

homes/josh/home.nix

@@ -1,37 +0,0 @@
-{
-  lib,
-  pkgs,
-  profile,
-  ...
-}:
-with lib;
-{
-  imports = [
-    ../../modules/homes
-    ../../modules/options
-    ../../profiles/${profile}
-  ];
-
-  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 = {
-    package = mkDefault pkgs.nix;
-    settings = {
-      allowed-users = [ "josh" ];
-      experimental-features = [
-        "nix-command"
-        "flakes"
-      ];
-    };
-  };
-}

hosts/vm/default.nix

@@ -5,7 +5,6 @@
 {
   imports = [
     ../../profiles/${profile}
-    ../../profiles/vm
     ../../modules/core
     ../../modules/options
 

modules/core/stylix.nix

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

modules/core/user.nix

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

modules/home/default.nix

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

modules/home/hyprland/binds.nix

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

modules/home/hyprland/hyprland.nix

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

modules/home/kitty.nix

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

modules/home/stylix.nix

@@ -15,8 +15,8 @@
         name = "Noto Color Emoji";
       };
       monospace = {
-        package = pkgs.nerd-fonts.meslo-lg;
-        name = "MesloLGS Nerd Font";
+        package = pkgs.nerd-fonts.jetbrains-mono;
+        name = "JetBrains Mono";
       };
       sansSerif = {
         package = pkgs.montserrat;

modules/home/xdg.nix

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

modules/home/zsh/completion.nix

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

modules/home/zsh/default.nix

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

modules/home/zsh/p10k.nix

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

profiles/desktop/default.nix

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

profiles/vm/default.nix

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

rebuild.sh

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