From 762be96a711bde20b951253f5f8ff6473de16c28 Mon Sep 17 00:00:00 2001
From: Matt Nish-Lapidus <matt@emenel.ca>
Date: Fri, 7 Feb 2025 19:45:24 -0500
Subject: [PATCH] playing with home-manager as nixos module

---
 flake.nix                     | 48 ++++++++++++++++++++++++-----------
 homes/emenel/default.nix      | 12 ---------
 hosts/eddie/configuration.nix |  2 --
 3 files changed, 33 insertions(+), 29 deletions(-)

diff --git a/flake.nix b/flake.nix
index 636f430..a2ec9a4 100644
--- a/flake.nix
+++ b/flake.nix
@@ -139,25 +139,43 @@
             inputs.musnix.nixosModules.musnix
             inputs.niri.nixosModules.niri
             ./hosts/eddie/configuration.nix
+
+            home-manager.nixosModules.home-manager
+
+            {
+              home-manager = {
+                useGlobalPkgs = true;
+                useUserPackages = true;
+                sharedModules = [
+                  inputs.nix-flatpak.homeManagerModules.nix-flatpak
+                  inputs.sops-nix.homeManagerModules.sops
+                ];
+                extraSpecialArgs = {
+                  inherit inputs;
+                  nix-config = self;
+                };
+                users.emenel = import ./homes/emenel/default.nix;
+              };
+            }
           ];
         };
       };
 
-      homeConfigurations = {
-        "emenel" = home-manager.lib.homeManagerConfiguration {
-          pkgs = nixpkgs.legacyPackages.x86_64-linux; # Home-manager requires 'pkgs' instance
-          extraSpecialArgs = {
-            inherit inputs;
-            nix-config = self;
-          };
+      # homeConfigurations = {
+      #   "emenel" = home-manager.lib.homeManagerConfiguration {
+      #     pkgs = nixpkgs.legacyPackages.x86_64-linux; # Home-manager requires 'pkgs' instance
+      #     extraSpecialArgs = {
+      #       inherit inputs;
+      #       nix-config = self;
+      #     };
 
-          modules = [
-            inputs.nix-flatpak.homeManagerModules.nix-flatpak
-            inputs.sops-nix.homeManagerModules.sops
-            inputs.niri.homeModules.niri
-            ./homes/emenel/default.nix
-          ];
-        };
-      };
+      #     modules = [
+      #       inputs.nix-flatpak.homeManagerModules.nix-flatpak
+      #       inputs.sops-nix.homeManagerModules.sops
+      #       inputs.niri.homeModules.niri
+      #       ./homes/emenel/default.nix
+      #     ];
+      #   };
+      # };
     };
 }
diff --git a/homes/emenel/default.nix b/homes/emenel/default.nix
index 5a551e3..bb6aa1e 100644
--- a/homes/emenel/default.nix
+++ b/homes/emenel/default.nix
@@ -1,17 +1,5 @@
 { nix-config, config, lib, pkgs, inputs, ... }:
 {
-  nixpkgs = {
-    config = {
-      allowUnfree = true;
-    };
-    overlays = builtins.attrValues nix-config.overlays
-               ++ [
-                 inputs.emacs-overlay.overlays.default
-                 inputs.audio.overlays.default
-                 inputs.nix-rice.overlays.default
-                 inputs.niri.overlays.niri
-               ];
-  };
 
   imports = with nix-config.homeModules; [
     mako
diff --git a/hosts/eddie/configuration.nix b/hosts/eddie/configuration.nix
index 4b0f731..686b6fe 100644
--- a/hosts/eddie/configuration.nix
+++ b/hosts/eddie/configuration.nix
@@ -26,8 +26,6 @@
                ];
   };
 
-  # environment.etc."nix/inputs/nixpkgs".source = "${nixpkgs}";
-
   nix = {
     # registry.nixpkgs.flake = nixpkgs;
     # channel.enable = false;