Merge branch 'flake-home-manager' into flake

1 files changed, 8 insertions, 7 deletions

diff --git a/flake.nix b/flake.nix
index 6ad632a..33b2044 100644
--- a/flake.nix
+++ b/flake.nix
@@ -1,6 +1,6 @@
 {
   inputs = {
-    my-nixpkgs.url = "git+file:///home/qaristote/code/nix/my-nixpkgs";
+    my-nixpkgs.url = "github:qaristote/my-nixpkgs";
   };
 
   outputs = { self, nixpkgs, my-nixpkgs, nixos-hardware, home-manager }:
@@ -9,18 +9,19 @@
       overlays-module = { ... }: {
         nixpkgs.overlays = [ my-nixpkgs.overlays.personal ];
       };
+      homeModules = [ my-nixpkgs.homeModules.personal ./home ];
+      nixosModules =
+        [ overlays-module my-nixpkgs.nixosModules.personal ./nixos ];
     in {
       nixosConfigurations.latitude-7490 = nixpkgs.lib.nixosSystem {
         inherit system;
-        specialArgs = {
-          inherit nixos-hardware home-manager;
-          home.qaristote = import ./home;
-        };
-        modules = [ overlays-module my-nixpkgs.nixosModules.personal ./nixos ];
+        specialArgs = { inherit nixos-hardware home-manager homeModules; };
+        modules = nixosModules;
       };
+
       homeConfigurations.qaristote = home-manager.lib.homeManagerConfiguration {
         pkgs = nixpkgs.legacyPackages."${system}";
-        modules = [ overlays-module ./home ];
+        modules = homeModules;
       };
     };
 }