nix-configs

commit 76edf9c94b4e15f0f204bb922d9e7d08e07b85bc
parent e0b78afd37508ec615b24617d602856c64de8680
Author: breadcat <breadcat@users.noreply.github.com>
Date:   Thu, 28 May 2026 16:31:15 +0100

Simplify variable setup further

Diffstat:
M
common/home-manager.nix
 | 
5
++---
D
common/variables.nix
 | 
9
---------
M
entrypoint.nix
 | 
3
++-
M
machines/arcadia.nix
 | 
3
+--
M
machines/artemis.nix
 | 
3
+--
M
machines/atlas.nix
 | 
3
+--
M
machines/ilias.nix
 | 
3
+--
M
machines/minerva.nix
 | 
3
+--

8 files changed, 9 insertions(+), 23 deletions(-)
diff --git a/common/home-manager.nix b/common/home-manager.nix
@@ -1,8 +1,7 @@
-{ machine, vars }:
+{ machine, vars, ... }:
 
 let
   home-manager = builtins.fetchTarball "https://github.com/nix-community/home-manager/archive/release-25.11.tar.gz";
-  all-variables = { inherit machine vars; };
 in
 
 {
@@ -12,6 +11,6 @@ in
     backupFileExtension = "hm-bak";
     useGlobalPkgs = true;
     useUserPackages = true;
-    extraSpecialArgs = all-variables;
+    extraSpecialArgs = { inherit machine vars; };
   };
 }
diff --git a/common/variables.nix b/common/variables.nix
@@ -1,9 +0,0 @@
-{ machine, vars }:
-
-let
-  all-variables = { inherit machine vars; };
-in
-
-{
-  _module.args = all-variables;
-}
diff --git a/entrypoint.nix b/entrypoint.nix
@@ -11,5 +11,6 @@ let
   machine = lib.strings.removeSuffix "\n" hostname;
   osConfigPath = ./machines + "/${machine}.nix";
 in {
-  imports = [ (import osConfigPath { inherit config pkgs lib vars; }) ];
+  _module.args = { inherit machine vars; };
+  imports = [ osConfigPath ];
 }
 \ No newline at end of file
diff --git a/machines/arcadia.nix b/machines/arcadia.nix
@@ -5,14 +5,13 @@
 let machine = "arcadia"; in {
 
   imports = [
-    (import ../common/variables.nix { inherit machine vars; })
-    (import ../common/home-manager.nix  { inherit machine vars; })
     ../common/audio.nix
     ../common/autologin.nix
     ../common/boot-systemd.nix
     ../common/flakes.nix
     ../common/fonts.nix
     ../common/garbage.nix
+    ../common/home-manager.nix
     ../common/hyprland.nix
     ../common/kodi.nix
     ../common/locale.nix
diff --git a/machines/artemis.nix b/machines/artemis.nix
@@ -5,13 +5,12 @@
 let machine = "artemis"; in {
 
   imports = [
-    (import ../common/variables.nix { inherit machine vars; })
-    (import ../common/home-manager.nix  { inherit machine vars; })
     ../common/boot-systemd.nix
     ../common/docker.nix
     ../common/docker-webdev.nix
     ../common/flakes.nix
     ../common/garbage.nix
+    ../common/home-manager.nix
     ../common/locale.nix
     ../common/mount-drives.nix
     ../common/networking.nix
diff --git a/machines/atlas.nix b/machines/atlas.nix
@@ -5,8 +5,6 @@
 let machine = "atlas"; in {
 
   imports = [
-    (import ../common/variables.nix { inherit machine vars; })
-    (import ../common/home-manager.nix { inherit machine vars; })
     ../common/audio.nix
     ../common/autologin.nix
     ../common/boot-systemd.nix
@@ -14,6 +12,7 @@ let machine = "atlas"; in {
     ../common/flakes.nix
     ../common/fonts.nix
     ../common/garbage.nix
+    ../common/home-manager.nix
     ../common/hyprland.nix
     ../common/locale.nix
     ../common/mount-drives.nix
diff --git a/machines/ilias.nix b/machines/ilias.nix
@@ -5,12 +5,11 @@
 let machine = "ilias"; in {
 
   imports = [
-    (import ../common/variables.nix { inherit machine vars; })
-    (import ../common/home-manager.nix { inherit machine vars; })
     ../common/boot-systemd.nix
     ../common/devel.nix
     ../common/flakes.nix
     ../common/garbage.nix
+    ../common/home-manager.nix
     ../common/locale.nix
     ../common/mount-drives.nix
     ../common/networking.nix
diff --git a/machines/minerva.nix b/machines/minerva.nix
@@ -5,8 +5,6 @@
 let machine = "minerva"; in {
 
   imports = [
-    (import ../common/variables.nix { inherit machine vars; })
-    (import ../common/home-manager.nix { inherit machine vars; })
     ../common/audio.nix
     ../common/autologin.nix
     ../common/boot-grub.nix
@@ -14,6 +12,7 @@ let machine = "minerva"; in {
     ../common/flakes.nix
     ../common/fonts.nix
     ../common/garbage.nix
+    ../common/home-manager.nix
     ../common/hyprland.nix
     ../common/locale.nix
     ../common/mount-drives.nix