more code cleanup thanks to MasterofNull on github

1 files changed, 22 insertions, 37 deletions

diff --git a/flake.nix b/flake.nix
index faaaf1d..f5ed4f2 100644
--- a/flake.nix
+++ b/flake.nix
@@ -154,12 +154,20 @@
     let
       # inherit (self) outputs;
       lib = nixpkgs.lib //home-manager.lib;
-      systems = [ "x86_64-linux" "aarch64-linux" ];
+      # systems = [ "x86_64-linux" "aarch64-linux" ];
       # forEachSystem = f: lib.genAttrs systems (system: f pkgsFor.${system});
-      pkgsFor = lib.genAttrs systems (system: import nixpkgs {
-        inherit system;
-        config.allowUnfreee = true;
-      });
+      # pkgsFor = lib.genAttrs systems (system: import nixpkgs {
+      #   inherit system;
+      #   config.allowUnfreee = true;
+      # });
+
+      minimalConfigSettings = [ # From github:MasterofNull/nixos config 
+        home-manager.nixosModules.home-manager {
+          home-manager.useGlobalPkgs = true;
+          home-manager.useUserPackages = true;
+          home-manager.extraSpecialArgs = { inherit inputs; };
+        }
+      ];
     in {
       inherit lib;
       nixosModules = import ./modules/nixos;
@@ -176,34 +184,26 @@
       # wallpapers = inherit wallpapers; #NOTE broken
 
       nixosConfigurations = {
-        # Main desktop
-        khad = lib.nixosSystem {
-          modules = [ 
+        khad = lib.nixosSystem { # Main desktop
+          modules = minimalConfigSettings ++ [ 
             ./machines/khad
             lix-module.nixosModules.default
 
              home-manager.nixosModules.home-manager {
-               home-manager.useGlobalPkgs = true;
-               home-manager.useUserPackages = true;
                home-manager.users.defin = import ./home-manager/home.nix;
-               home-manager.extraSpecialArgs = { inherit inputs; };
              }
           ];
         };
-        # Personal laptop
-        zenbook = lib.nixosSystem {
+        zenbook = lib.nixosSystem { # Personal laptop
           # specialArgs = { inherit inputs; };
-          modules = [
+          modules = minimalConfigSettings ++ [
             ./machines/zenbook
             lix-module.nixosModules.default
 
             # hyprland.homeManagerModules.default {wayland.windowManager.hyprland.enable = true;}
 
             home-manager.nixosModules.home-manager {
-              home-manager.useGlobalPkgs = true;
-              home-manager.useUserPackages = true;
               home-manager.users.defin = import ./home-manager/home.nix;
-              home-manager.extraSpecialArgs = { inherit inputs; };
             }
             # # Let 'nixos-version --json' know the Git revision of this flake.
             # system.configurationRevision = nixpkgs.lib.mkIf (self ? rev) self.rev;
@@ -212,70 +212,55 @@
         };
 
         betsy = lib.nixosSystem { # work laptop
-          modules = [
+          modules = minimalConfigSettings ++ [
             ./machines/betsy
             # lix-module.nixosModules.default
 
             home-manager.nixosModules.home-manager {
-              home-manager.useGlobalPkgs = true;
-              home-manager.useUserPackages = true;
               home-manager.users.defin = import ./home-manager/home.nix;
-              home-manager.extraSpecialArgs = { inherit inputs; };
             }
           ];
         };
         doretta = lib.nixosSystem { # build server
-          modules = [
+          modules = minimalConfigSettings ++ [
             ./machines/doretta
             lix-module.nixosModules.default
 
             home-manager.nixosModules.home-manager {
-              home-manager.useGlobalPkgs = true;
-              home-manager.useUserPackages = true;
               home-manager.users.defin = import ./home-manager/doretta.nix;
-              home-manager.extraSpecialArgs = { inherit inputs; };
             }
           ];
         };
         bosco = lib.nixosSystem { # networking server
-          modules = [
+          modules = minimalConfigSettings ++ [
             ./machines/bosco
             # lix-module.nixosModules.default
 
             home-manager.nixosModules.home-manager {
-              home-manager.useGlobalPkgs = true;
-              home-manager.useUserPackages = true;
               home-manager.users.defin = import ./home-manager/default.nix;
-              home-manager.extraSpecialArgs = { inherit inputs; };
             }
 
             ./modules/nixos/headscale.nix
           ];
         };
         picast = lib.nixosSystem { # anger at chromecast
-          modules = [
+          modules = minimalConfigSettings ++ [
             ./machines/picast
 
             home-manager.nixosModules.home-manager {
-              home-manager.useGlobalPkgs = true;
-              home-manager.useUserPackages = true;
               home-manager.users.defin = import ./home-manager/default.nix;
-              home-manager.extraSpecialArgs = { inherit inputs; };
             }
           ];
         };
         live = lib.nixosSystem {
-          modules = [
+          modules = minimalConfigSettings ++ [
             (nixpkgs + "/nixos/modules/installer/sd-card/sd-image-aarch64-installer.nix")
             ./machines/iso/configuration.nix
             ./modules/users/defin.nix
             ./modules/nixos/system-packages.nix
 
             home-manager.nixosModules.home-manager {
-              home-manager.useGlobalPkgs = true;
-              home-manager.useUserPackages = true;
               home-manager.users.defin = import ./home-manager/default.nix;
-              home-manager.extraSpecialArgs = { inherit inputs; };
             }
             { nixpkgs.hostPlatform = "aarch64-linux"; }
           ];