From 82dfb95bde106cfbf645c52d0e4c8e9ab822eb35 Mon Sep 17 00:00:00 2001
From: John Lancaster <32917998+jsl12@users.noreply.github.com>
Date: Fri, 4 Jul 2025 10:55:46 -0500
Subject: [PATCH] moved logic for default home manager

---
 flake.nix                      | 28 ----------------------------
 homeManagerModules/default.nix | 25 +++++++++++++++++++++++++
 2 files changed, 25 insertions(+), 28 deletions(-)

diff --git a/flake.nix b/flake.nix
index bddaac9..b869176 100644
--- a/flake.nix
+++ b/flake.nix
@@ -44,35 +44,7 @@
 
       homeManagerModules.default = { ... }: {
         imports = [
-          # ./nixosModules/options.nix
           ./homeManagerModules
-          inputs._1password-shell-plugins.hmModules.default
-        ];
-        nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [
-          "1password-cli"
-          "discord"
-          "spotify"
-          "steam"
-          "steam-original"
-          "steam-unwrapped"
-          "steam-run"
-          "sublimetext4"
-          "vscode"
-          "vscode-extension-mhutchie-git-graph"
-          "vscode-extension-ms-vscode-remote-vscode-remote-extensionpack"
-          "vscode-extension-MS-python-vscode-pylance"
-          "vscode-extension-github-copilot"
-        ];
-
-        nixpkgs.config.permittedInsecurePackages = [
-          "openssl-1.1.1w"
-        ];
-        
-        home.packages = with pkgs; [
-          (writeShellScriptBin "nhmu" ''
-            nix flake update --flake ~/.config/home-manager
-            nix run home-manager -- switch --flake ~/.config/home-manager
-          '')
         ];
       };
 
diff --git a/homeManagerModules/default.nix b/homeManagerModules/default.nix
index 7985762..be2396b 100644
--- a/homeManagerModules/default.nix
+++ b/homeManagerModules/default.nix
@@ -10,6 +10,27 @@
     ./vscode.nix
 
     ../nixosModules/options.nix
+    inputs._1password-shell-plugins.hmModules.default
+  ];
+
+  nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [
+    "1password-cli"
+    "discord"
+    "spotify"
+    "steam"
+    "steam-original"
+    "steam-unwrapped"
+    "steam-run"
+    "sublimetext4"
+    "vscode"
+    "vscode-extension-mhutchie-git-graph"
+    "vscode-extension-ms-vscode-remote-vscode-remote-extensionpack"
+    "vscode-extension-MS-python-vscode-pylance"
+    "vscode-extension-github-copilot"
+  ];
+
+  nixpkgs.config.permittedInsecurePackages = [
+    "openssl-1.1.1w"
   ];
 
   # Home Manager needs a bit of information about you and the paths it should
@@ -32,6 +53,10 @@
     btop
     yazi
     sops
+    (writeShellScriptBin "nhmu" ''
+      nix flake update --flake ~/.config/home-manager
+      nix run home-manager -- switch --flake ~/.config/home-manager
+    '')
     # # It is sometimes useful to fine-tune packages, for example, by applying
     # # overrides. You can do that directly here, just don't forget the
     # # parentheses. Maybe you want to install Nerd Fonts with a limited number of