From ab30a93005db16ace079c5b11aa578920e49d53f Mon Sep 17 00:00:00 2001
From: MichaelFisher1997 <contact@micahelfisher.tech>
Date: Sun, 11 May 2025 00:35:27 +0100
Subject: [PATCH] moved home manager to module

---
 home/micqdf.nix                 |  8 ++++----
 hosts/hypr-nix/home-manager.nix | 20 +++++++-------------
 2 files changed, 11 insertions(+), 17 deletions(-)

diff --git a/home/micqdf.nix b/home/micqdf.nix
index 5477839..88c9065 100644
--- a/home/micqdf.nix
+++ b/home/micqdf.nix
@@ -5,10 +5,10 @@
 
   programs.fish.enable = true;
 
-  programs.git = {
-    enable = true;
-    userName = "MichaelFisher1997";
-  };
+  #programs.git = {
+  #  enable = true;
+  #  userName = "MichaelFisher1997";
+  #};
 
   home.packages = with pkgs; [
     jdk8
diff --git a/hosts/hypr-nix/home-manager.nix b/hosts/hypr-nix/home-manager.nix
index fc5b32a..2223105 100644
--- a/hosts/hypr-nix/home-manager.nix
+++ b/hosts/hypr-nix/home-manager.nix
@@ -1,18 +1,12 @@
-{ config, pkgs, ... }:
-let
-  home-manager = builtins.fetchTarball "https://github.com/nix-community/home-manager/archive/master.tar.gz";
-in
+{ pkgs, ... }:
 {
   imports = [
-    (import "${home-manager}/nixos")
+    # Home Manager module from nixpkgs (not flake)
+    "${pkgs.path}/nixos/modules/programs/home-manager.nix"
   ];
 
-  home-manager.users.my_username = {
-    /* The home.stateVersion option does not have a default and must be set */
-    home.username = "micqdf";
-    home.homeDirectory = "/home/micqdf";
-    home.stateVersion = "24.11";
-    /* Here goes the rest of your home-manager config, e.g. home.packages = [ pkgs.foo ]; */
-    home.packages = [ pkgs.jdk8 ];
-  };
+  home-manager.useGlobalPkgs = true;
+  home-manager.useUserPackages = true;
+
+  home-manager.users.micqdf = import ../../home/micqdf.nix;
 }