From cb933d885d8c9ca111fda3059e1f61f944d828a8 Mon Sep 17 00:00:00 2001
From: Natalie Marks <nmarks413@gmail.com>
Date: Fri, 27 Sep 2024 15:15:30 -0700
Subject: [PATCH] bweh

---
 flake.nix | 51 ++++++++++++++++++++++-----------------------------
 1 file changed, 22 insertions(+), 29 deletions(-)

diff --git a/flake.nix b/flake.nix
index 8ba9b66..b24012b 100644
--- a/flake.nix
+++ b/flake.nix
@@ -46,6 +46,7 @@
     nixpkgs-stable,
     home-manager,
     stylix,
+    darwin,
     blocklist-hosts,
     hyprland-plugins,
     zig,
@@ -58,7 +59,6 @@
       inputs.zig.overlays.default
     ];
     pkgs = import nixpkgs {
-      system = systemSettings.system;
       config = {
         allowUnfree = true;
         allowUnfreePredicate = _: true;
@@ -67,7 +67,6 @@
     };
 
     pkgs-stable = import nixpkgs-stable {
-      system = systemSettings.system;
       config = {
         allowUnfree = true;
         allowUnfreePredicate = _: true;
@@ -75,36 +74,30 @@
       overlays = [];
     };
 
-
     lib = nixpkgs.lib;
   in {
     nixosConfigurations = {
       nixos = lib.nixosSystem {
-        system = systemSettings.system;
         modules = [
           nixos-cosmic.nixosModules.default
           ./configuration.nix
           home-manager.nixosModules.home-manager
           {
             home-manager.useGlobalPkgs = true;
-	  	home-manager.useUserPackages = true;
-	    home-manager.users.nmarks = import ./hosts/desktop/home.nix;	
-	    home-manager.extraSpecialArgs = {
-          inherit pkgs-stable;
-          inherit systemSettings;
-          inherit userSettings;
-          inherit stylix;
-          inherit hyprland-plugins;
-          inherit zls;
-          inherit ghostty;
-        };
+            home-manager.useUserPackages = true;
+            home-manager.users.nmarks = import ./hosts/desktop/home.nix;
+            home-manager.extraSpecialArgs = {
+              inherit pkgs-stable;
+              inherit stylix;
+              inherit hyprland-plugins;
+              inherit zls;
+              inherit ghostty;
+            };
           }
         ];
         specialArgs = {
           inherit inputs;
           inherit pkgs-stable;
-          inherit systemSettings;
-          inherit userSettings;
           inherit stylix;
           inherit blocklist-hosts;
         };
@@ -112,18 +105,18 @@
     };
     darwinSystem = darwin.lib.darwinSystem {
       system = "aarch64-darwin";
-        modules = [
-          ./hosts/laptop/configuration.nix
-          home-manager.darwinModules.home-manager
-          {
-            home-manager.useGlobalPkgs = true;
-            home-manager.useUserPackages = true;
-            home-manager.users.nmarks = import ./hosts/laptop/home.nix;
-            users.users.nmarks.home = "/Users/nmarks";
-          };
-        ];
-        specialArgs = { inherit nixpkgs; };
-   };
+      modules = [
+        ./hosts/laptop/configuration.nix
+        home-manager.darwinModules.home-manager
+        {
+          home-manager.useGlobalPkgs = true;
+          home-manager.useUserPackages = true;
+          home-manager.users.nmarks = import ./hosts/laptop/home.nix;
+          users.users.nmarks.home = "/Users/nmarks";
+        }
+      ];
+      specialArgs = {inherit nixpkgs;};
+    };
     # nixos = inputs.self.nixosConfigurations.nmarks;
     #
     #