From f2c82ea93fd0610f1d98cfded5aeb7e3588e1c91 Mon Sep 17 00:00:00 2001
From: materus <materus@podkos.pl>
Date: Fri, 27 Oct 2023 17:00:26 +0200
Subject: [PATCH] configurations: formatting and some cleaning

---
 configurations/home/default.nix       |  3 +-
 configurations/home/genHomes.nix      | 37 ++++++++++---------
 configurations/host/default.nix       | 52 +++++++++++++--------------
 configurations/host/materusPC/tmp.nix |  2 +-
 configurations/profile/default.nix    |  2 +-
 flake.nix                             | 11 +-----
 6 files changed, 48 insertions(+), 59 deletions(-)

diff --git a/configurations/home/default.nix b/configurations/home/default.nix
index 276b2d2..4f878f8 100644
--- a/configurations/home/default.nix
+++ b/configurations/home/default.nix
@@ -2,5 +2,4 @@
 let
   genHomes = import ./genHomes.nix { inherit inputs; inherit materusFlake; };
 in
-{ }
-  // genHomes "materus"
+genHomes "materus"
diff --git a/configurations/home/genHomes.nix b/configurations/home/genHomes.nix
index 05b3f1c..d9aea6a 100644
--- a/configurations/home/genHomes.nix
+++ b/configurations/home/genHomes.nix
@@ -28,26 +28,25 @@ let
     in
     (builtins.listToAttrs (_for 0)) // {
       #Make generic x86_64-linux user profile "username"
-      ${username} = 
-    let materusCfg = {
-        stable = false;
-        inherit materusFlake;
-        host = "Generic";
-        hm = inputs.configInputs.inputs.home-manager;
-        nixerus = inputs.configInputs.inputs.nixerus;
-        configInputs = inputs.configInputs;
-        path = materusFlake.selfPath;
-      }; in
+      ${username} =
+        let materusCfg = {
+          stable = false;
+          inherit materusFlake;
+          host = "Generic";
+          hm = inputs.configInputs.inputs.home-manager;
+          nixerus = inputs.configInputs.inputs.nixerus;
+          configInputs = inputs.configInputs;
+          path = materusFlake.selfPath;
+        }; in
         inputs.configInputs.inputs.home-manager.lib.homeManagerConfiguration {
-        pkgs = import inputs.nixpkgs { system = "x86_64-linux"; config = {allowUnfree = true;}; };
-        extraSpecialArgs = { inherit materusCfg; };
-        modules = [
-          ./${username}
-          profiles.homeProfile
-          inputs.private.homeModule
-        ];
-      };
+          pkgs = import inputs.nixpkgs { system = "x86_64-linux"; config = { allowUnfree = true; }; };
+          extraSpecialArgs = { inherit materusCfg; };
+          modules = [
+            ./${username}
+            profiles.homeProfile
+            inputs.private.homeModule
+          ];
+        };
     };
-
 in
 genHomes
diff --git a/configurations/host/default.nix b/configurations/host/default.nix
index dd7980b..a8ab430 100644
--- a/configurations/host/default.nix
+++ b/configurations/host/default.nix
@@ -3,32 +3,32 @@
 let
   profiles = import ../profile;
 
-makeSystem = {host, arch ? "x86_64-linux", extraModules ? [], stable ? true}:
-let
-nixosSystem = if stable then inputs.nixpkgs-stable.lib.nixosSystem else  inputs.nixpkgs.lib.nixosSystem;
-hm = if stable then inputs.configInputs-stable.inputs.home-manager else inputs.configInputs.inputs.home-manager;
-materusCfg = {
-  inherit stable;
-  inherit materusFlake;
-  inherit host;
-  inherit hm;
-  nixerus = if stable then inputs.configInputs-stable.inputs.nixerus else inputs.configInputs.inputs.nixerus;
-  configInputs = if stable then inputs.configInputs-stable else inputs.configInputs;
-  path = materusFlake.selfPath;
-};
-in
-(nixosSystem rec {
-    specialArgs = { inherit materusCfg; };
-    system = arch;
-    modules = [
-      ./${host}
-      inputs.private.systemModule
-      profiles.osProfile
-    ] ++ extraModules;
-  }) // {inherit materusCfg;};
+  makeSystem = { host, arch ? "x86_64-linux", extraModules ? [ ], stable ? true }:
+    let
+      nixosSystem = if stable then inputs.nixpkgs-stable.lib.nixosSystem else inputs.nixpkgs.lib.nixosSystem;
+      hm = if stable then inputs.configInputs-stable.inputs.home-manager else inputs.configInputs.inputs.home-manager;
+      materusCfg = {
+        inherit stable;
+        inherit materusFlake;
+        inherit host;
+        inherit hm;
+        nixerus = if stable then inputs.configInputs-stable.inputs.nixerus else inputs.configInputs.inputs.nixerus;
+        configInputs = if stable then inputs.configInputs-stable else inputs.configInputs;
+        path = materusFlake.selfPath;
+      };
+    in
+    (nixosSystem rec {
+      specialArgs = { inherit materusCfg; };
+      system = arch;
+      modules = [
+        ./${host}
+        inputs.private.systemModule
+        profiles.osProfile
+      ] ++ extraModules;
+    }) // { inherit materusCfg; };
 in
 {
-  materusPC = makeSystem {host = "materusPC"; stable = false;};
-  flamaster = makeSystem {host = "flamaster"; stable = true;};
-  valkyrie = makeSystem {host = "valkyrie"; stable = true;};
+  materusPC = makeSystem { host = "materusPC"; stable = false; };
+  flamaster = makeSystem { host = "flamaster"; stable = true; };
+  valkyrie = makeSystem { host = "valkyrie"; stable = true; };
 }
diff --git a/configurations/host/materusPC/tmp.nix b/configurations/host/materusPC/tmp.nix
index 1b7e206..40d0894 100644
--- a/configurations/host/materusPC/tmp.nix
+++ b/configurations/host/materusPC/tmp.nix
@@ -217,7 +217,7 @@
     config.programs.java.package
 
     nss_latest
-    
+
     pciutils
 
     aspell
diff --git a/configurations/profile/default.nix b/configurations/profile/default.nix
index a34dfc6..1a161ce 100644
--- a/configurations/profile/default.nix
+++ b/configurations/profile/default.nix
@@ -13,4 +13,4 @@
     ];
   };
 
-}
\ No newline at end of file
+}
diff --git a/flake.nix b/flake.nix
index e6ea1cc..62ade8d 100644
--- a/flake.nix
+++ b/flake.nix
@@ -22,7 +22,7 @@
       ref = "nixos-23.05";
     };
 
-    
+
     configInputs = {
       type = "github";
       owner = "materusPL";
@@ -46,18 +46,9 @@
 
 
   outputs = inputs @ { self, nixpkgs, home-manager, nur, ... }:
-    let
-      systems = [
-        "x86_64-linux"
-        "i686-linux"
-        "aarch64-linux"
-      ];
-      forAllSystems = f: nixpkgs.lib.genAttrs systems (system: f system);
-    in
     rec {
       nixosConfigurations = import ./configurations/host { inherit inputs; materusFlake = self; };
       homeConfigurations = import ./configurations/home { inherit inputs; materusFlake = self; };
       selfPath = ./.;
-
     };
 }