From 27faa64382cd55ed95e81c207609abe783044ca7 Mon Sep 17 00:00:00 2001
From: MichaelFisher1997 <contact@micahelfisher.tech>
Date: Sat, 10 May 2025 22:44:45 +0100
Subject: [PATCH] started looking at home manager

---
 flake.lock                  | 66 ++++++++++++++++++++++++++++++++++++-
 flake.nix                   | 28 ++++++++++++++--
 home/micqdf.nix             | 21 ++++++++++++
 hosts/hypr-nix/packages.nix |  2 +-
 4 files changed, 113 insertions(+), 4 deletions(-)
 create mode 100644 home/micqdf.nix

diff --git a/flake.lock b/flake.lock
index 1bd20b2..c3bf32a 100644
--- a/flake.lock
+++ b/flake.lock
@@ -1,5 +1,46 @@
 {
   "nodes": {
+    "home-manager": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1746912617,
+        "narHash": "sha256-SSw/98B3Htw7iJWCyq08fAEL5w+a/Vj+YbQq0msVFTA=",
+        "owner": "nix-community",
+        "repo": "home-manager",
+        "rev": "9ef92f1c6b77944198fd368ec805ced842352a1d",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "home-manager",
+        "type": "github"
+      }
+    },
+    "home-manager_2": {
+      "inputs": {
+        "nixpkgs": [
+          "zen-browser",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1743604125,
+        "narHash": "sha256-ZD61DNbsBt1mQbinAaaEqKaJk2RFo9R/j+eYWeGMx7A=",
+        "owner": "nix-community",
+        "repo": "home-manager",
+        "rev": "180fd43eea296e62ae68e079fcf56aba268b9a1a",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "home-manager",
+        "type": "github"
+      }
+    },
     "nixpkgs": {
       "locked": {
         "lastModified": 1746557022,
@@ -18,7 +59,30 @@
     },
     "root": {
       "inputs": {
-        "nixpkgs": "nixpkgs"
+        "home-manager": "home-manager",
+        "nixpkgs": "nixpkgs",
+        "zen-browser": "zen-browser"
+      }
+    },
+    "zen-browser": {
+      "inputs": {
+        "home-manager": "home-manager_2",
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1746901443,
+        "narHash": "sha256-fG5B8lWJqtVPgebXtjoPLhPESkzOnqsM0omKY85/A1M=",
+        "owner": "0xc000022070",
+        "repo": "zen-browser-flake",
+        "rev": "954c70bb7b27882cccf7e282d304ef894344eee8",
+        "type": "github"
+      },
+      "original": {
+        "owner": "0xc000022070",
+        "repo": "zen-browser-flake",
+        "type": "github"
       }
     }
   },
diff --git a/flake.nix b/flake.nix
index 0bb3dff..6a10ef5 100644
--- a/flake.nix
+++ b/flake.nix
@@ -1,16 +1,40 @@
 {
-  description = "NixOS configuration for hypr-nix";
+  description = "NixOS configuration for hypr-nix with Home Manager and zen-browser";
 
   inputs = {
     nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.11";
+
+    home-manager = {
+      url = "github:nix-community/home-manager";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+
+    zen-browser = {
+      url = "github:0xc000022070/zen-browser-flake";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
   };
 
-  outputs = { self, nixpkgs, ... }@inputs: {
+  outputs = { self, nixpkgs, home-manager, zen-browser, ... }: {
     nixosConfigurations.hypr-nix = nixpkgs.lib.nixosSystem {
       system = "x86_64-linux";
+
       modules = [
         ./hosts/hypr-nix/configuration.nix
+
+        # Home Manager as a NixOS module
+        home-manager.nixosModules.home-manager
+        {
+          home-manager.useGlobalPkgs = true;
+          home-manager.useUserPackages = true;
+
+          home-manager.users.micqdf = import ./home/micqdf.nix;
+        }
       ];
+
+      specialArgs = {
+        zen-browser = zen-browser;
+      };
     };
   };
 }
diff --git a/home/micqdf.nix b/home/micqdf.nix
new file mode 100644
index 0000000..aa4b402
--- /dev/null
+++ b/home/micqdf.nix
@@ -0,0 +1,21 @@
+{ config, pkgs, ... }: {
+  home.username = "micqdf";
+  home.homeDirectory = "/home/micqdf";
+  home.stateVersion = "24.11";
+
+  programs.fish.enable = true;
+
+  programs.git = {
+    enable = true;
+    userName = "MichaelFisher1997";
+  };
+
+  home.packages = with pkgs; [
+    neovim
+    firefox
+    ripgrep
+    zen-browser.packages.${pkgs.system}.twilight
+    #zen-browser.packages."${system}".twilight
+  ];
+}
+
diff --git a/hosts/hypr-nix/packages.nix b/hosts/hypr-nix/packages.nix
index 8f4426b..5308e5d 100644
--- a/hosts/hypr-nix/packages.nix
+++ b/hosts/hypr-nix/packages.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, ... }:
+{ config, pkgs, zen-browser, ... }:
 let
   unstable = import
     (builtins.fetchTarball "channel:nixos-unstable")