From e5303bd4fd1b678bc5c4c68b825ba8979c18a618 Mon Sep 17 00:00:00 2001
From: Devin Finlinson <devin.finlinson@pm.me>
Date: Wed, 30 Aug 2023 23:49:23 +0200
Subject:

---
 flake.nix | 51 +++++++++++++++++++++++++++------------------------
 1 file changed, 27 insertions(+), 24 deletions(-)

(limited to 'flake.nix')

diff --git a/flake.nix b/flake.nix
index c4771dd..f846d86 100644
--- a/flake.nix
+++ b/flake.nix
@@ -11,32 +11,25 @@
     hyprland.url = "github:hyprwm/Hyprland";
   };
 
-  # outputs = { self, nixpkgs }: {
-  outputs = { self, nixpkgs, nixpkgs-unstable, home-manager, hyprland, ... }: let
+  outputs = { self, nixpkgs, nixpkgs-unstable, home-manager, hyprland, ... }: {
+  # outputs = { self, nixpkgs, nixpkgs-unstable, home-manager, hyprland, ... }: let
        
-    defFlakeSystem = baseCfg: nixpkgs.lib.nixosSystem {
-    # defFlakeSystem = nixpkgs.lib.nixosSystem {
-        modules = [({ ... }: {
-          imports = [
-            baseCfg
-            home-manager.nixosModules.home-manager {
-              # home-manager.useGlobalPkgs = true;
-              home-manager.useUserpackages = true;
-              # home-manager.users.defin = import ./home-manager/home.nix { inherit pkgs unstable; };
-              home-manager.users.defin = import ./home-manager/home.nix;
-              # Optionally, use home-manager.extraSpecialArgs to pass
-              # arguments to home.nix
-            }
-          ];
-          # Let 'nixos-version --json' know the Git revision of this flake.
-          system.configurationRevision = nixpkgs.lib.mkIf (self ? rev) self.rev;
-          nix.registry.nixpkgs.flake = nixpkgs;
-        })];
-    };
-  in {
+  #   defFlakeSystem = baseCfg: nixpkgs.lib.nixosSystem {
+  #   # defFlakeSystem = nixpkgs.lib.nixosSystem {
+  #       modules = [({ ... }: {
+  #         imports = [
+  #           baseCfg
+  #         ];
+  #         # Let 'nixos-version --json' know the Git revision of this flake.
+  #         system.configurationRevision = nixpkgs.lib.mkIf (self ? rev) self.rev;
+  #         nix.registry.nixpkgs.flake = nixpkgs;
+  #       })];
+  #   };
+  # in {
 
     nixosConfigurations = {
-      zenbook = defFlakeSystem {
+      # zenbook = defFlakeSystem {
+      zenbook = nixpkgs.lib.nixosSystem {
         modules = [
           ./machines/zenbook/configuration.nix
           
@@ -45,6 +38,14 @@
           # Default users
           ./modules/user-profiles/defin.nix
 
+          home-manager.nixosModules.home-manager {
+            # home-manager.useGlobalPkgs = true;
+            home-manager.useUserpackages = true;
+            home-manager.users.defin = import ./home-manager/home.nix;
+            # Optionally, use home-manager.extraSpecialArgs to pass
+            # arguments to home.nix
+          }
+
           hyprland.homeManagerModules.default
           {wayland.windowManager.hyprland.enable = true;}
           ./modules/hyprland.nix
@@ -56,7 +57,9 @@
           ./modules/services.nix
           ./modules/sway.nix
 
-          
+          # Let 'nixos-version --json' know the Git revision of this flake.
+          system.configurationRevision = nixpkgs.lib.mkIf (self ? rev) self.rev;
+          nix.registry.nixpkgs.flake = nixpkgs;
         ];
       };
     };
-- 
cgit v1.2.3