From 3d8dd7c92c0ae4ee827c403d0b1714fb5acd83ab Mon Sep 17 00:00:00 2001
From: Gerg-L <GregLeyda@proton.me>
Date: Thu, 23 Feb 2023 20:28:46 -0500
Subject: [PATCH] cleaning up specialArgs

---
 flake.nix                        |  9 +++------
 modules/nix.nix                  | 11 +++--------
 systems/game-laptop/default.nix  |  2 +-
 systems/gerg-desktop/default.nix |  2 +-
 systems/mom-laptop/default.nix   |  2 +-
 5 files changed, 9 insertions(+), 17 deletions(-)

diff --git a/flake.nix b/flake.nix
index 5d812b0..f9e0b32 100644
--- a/flake.nix
+++ b/flake.nix
@@ -48,10 +48,9 @@
         gerg-desktop = unstable.lib.nixosSystem {
           system = "x86_64-linux";
           specialArgs = {
-            inherit inputs self;
+            inherit self;
             settings = {
               username = "gerg";
-              hostname = "gerg-desktop";
             };
           };
 
@@ -69,10 +68,9 @@
         game-laptop = unstable.lib.nixosSystem {
           system = "x86_64-linux";
           specialArgs = {
-            inherit inputs self;
+            inherit self;
             settings = {
               username = "games";
-              hostname = "game-laptop";
             };
           };
           modules = [
@@ -83,10 +81,9 @@
         moms-laptop = unstable.lib.nixosSystem {
           system = "x86_64-linux";
           specialArgs = {
-            inherit inputs self;
+            inherit self;
             settings = {
               username = "jo";
-              hostname = "moms-laptop";
             };
           };
           modules = [
diff --git a/modules/nix.nix b/modules/nix.nix
index 960752b..64fe8a6 100644
--- a/modules/nix.nix
+++ b/modules/nix.nix
@@ -1,9 +1,4 @@
-{
-  nix,
-  unstable,
-  ...
-}: {
-  inputs,
+inputs: {
   lib,
   self,
   settings,
@@ -26,12 +21,12 @@
         inputs
       )
       // {
-        nixpkgs.flake = unstable;
+        nixpkgs.flake = inputs.unstable;
         system.flake = self;
       }
     );
     #automatically add registry entries to nixPath
-    nixPath = (lib.mapAttrsToList (name: value: name + "=" + value) inputs) ++ ["system=${self}" "nixpkgs=${unstable}"];
+    nixPath = (lib.mapAttrsToList (name: value: name + "=" + value) inputs) ++ ["system=${self}" "nixpkgs=${inputs.unstable}"];
     settings = {
       experimental-features = ["nix-command" "flakes" "repl-flake"];
       auto-optimise-store = true;
diff --git a/systems/game-laptop/default.nix b/systems/game-laptop/default.nix
index 2344531..b5e9c81 100644
--- a/systems/game-laptop/default.nix
+++ b/systems/game-laptop/default.nix
@@ -35,7 +35,7 @@ inputs: {
     inputs.suckless.packages.${pkgs.system}.st
   ];
   networking = {
-    hostName = settings.hostname;
+    hostName = "game-laptop";
     networkmanager.enable = true;
   };
   users = {
diff --git a/systems/gerg-desktop/default.nix b/systems/gerg-desktop/default.nix
index 6a5c850..43dbfe6 100644
--- a/systems/gerg-desktop/default.nix
+++ b/systems/gerg-desktop/default.nix
@@ -48,7 +48,7 @@ inputs: {
   systemd.tmpfiles.rules = ["L+ /home/gerg/.config/WebCord/Themes/black - - - - ${self}/misc/black.theme.css"];
 
   networking = {
-    hostName = settings.hostname;
+    hostName = "gerg-desktop";
     hostId = "288b56db";
     useDHCP = false;
     dhcpcd.enable = false;
diff --git a/systems/mom-laptop/default.nix b/systems/mom-laptop/default.nix
index 48b72cf..114f567 100644
--- a/systems/mom-laptop/default.nix
+++ b/systems/mom-laptop/default.nix
@@ -30,7 +30,7 @@ inputs: {
   ];
   services.xserver.videoDrivers = ["intel"];
   networking = {
-    hostName = settings.hostname;
+    hostName = "mom-laptop";
     networkmanager.enable = true;
   };
   boot.kernelPackages = pkgs.linuxPackages_latest;