Refactor to pass host vars as arguments

Remove per‑host imports across flake, modules, and profiles, exposing
needed
variables (system, printer settings, consoleKeyMap, etc.) as arguments.
Drop unused printEnable flags from host variable files.

flake.nix

@@ -65,25 +65,14 @@
     hostDirs = builtins.attrNames (builtins.readDir ./hosts);
 
     mkHost = hostName: let
-      inherit
+      hostVars = import ./hosts/${hostName}/variables.nix;
-        (import ./hosts/${hostName}/variables.nix)
+      hostPrinterVars = import ./hosts/${hostName}/printers.nix;
-        host
-        username
-        profile
-        system
-        ;
     in
       nixpkgs.lib.nixosSystem {
-        inherit system;
+        inherit (hostVars) system;
-        specialArgs = {
+        specialArgs = hostVars // hostPrinterVars // {inherit inputs;};
-          inherit inputs;
-          inherit username;
-          inherit host;
-          inherit profile;
-          inherit system;
-        };
         modules = [
-          ./profiles/${profile}
+          ./profiles/${hostVars.profile}
           nix-flatpak.nixosModules.nix-flatpak
           garandos-tui.nixosModules.garandos-tui
         ];

hosts/Garand-Desktop/variables.nix

@@ -39,9 +39,6 @@
   # Enable NFS
   enableNFS = false;
 
-  # Enable Printing Support
-  printEnable = true;
-
   # Set Stylix Image
   # This will set your color palette
   # Default background

hosts/default/variables.nix

@@ -41,9 +41,6 @@
   # Enable NFS
   enableNFS = false;
 
-  # Enable Printing Support
-  printEnable = false;
-
   # Themes, waybar and animation.
   #  Only uncomment your selection
   # The others much be commented out.

modules/core/docker.nix

@@ -2,11 +2,9 @@
   pkgs,
   lib,
   config,
-  host,
+  profile,
   ...
-}: let
+}: {
-  inherit (import ../../hosts/${host}/variables.nix) profile;
-in {
   options.docker.enable = lib.mkEnableOption "Docker";
 
   config.virtualisation.docker = lib.mkIf config.docker.enable {

modules/core/network.nix

@@ -1,10 +1,9 @@
 {
   host,
+  hostId,
   options,
   ...
-}: let
+}: {
-  inherit (import ../../hosts/${host}/variables.nix) hostId;
-in {
   # Defensive assertion for hostname validity (clearer message at eval time)
   assertions = [
     {

modules/core/nfs.nix

@@ -1,6 +1,4 @@
-{host, ...}: let
+{enableNFS, ...}: {
-  inherit (import ../../hosts/${host}/variables.nix) enableNFS;
-in {
   services = {
     rpcbind.enable = enableNFS;
     nfs.server.enable = enableNFS;

modules/core/printing.nix

@@ -1,11 +1,11 @@
 {
   pkgs,
   lib,
-  host,
+  printEnable,
+  ensureDefaultPrinter,
+  ensurePrinters,
   ...
-}: let
+}: {
-  inherit (import ../../hosts/${host}/printers.nix) printEnable ensureDefaultPrinter ensurePrinters;
-in {
   services = lib.mkIf printEnable {
     printing = {
       enable = true;

modules/core/stylix.nix

@@ -1,10 +1,8 @@
 {
   pkgs,
-  host,
+  stylixImage,
   ...
-}: let
+}: {
-  inherit (import ../../hosts/${host}/variables.nix) stylixImage;
-in {
   # Styling Options
   stylix = {
     enable = true;

modules/core/system.nix

@@ -1,10 +1,8 @@
 {
-  host,
+  consoleKeyMap,
   inputs,
   ...
-}: let
+}: {
-  inherit (import ../../hosts/${host}/variables.nix) consoleKeyMap;
-in {
   nix = {
     nixPath = ["nixpkgs=${inputs.nixpkgs}"];
     settings = {

modules/core/user.nix

@@ -5,10 +5,14 @@
   host,
   profile,
   system,
+  gitUsername,
+  shell,
+  extraMonitorSettings,
+  keyboardLayout,
+  gitEmail,
+  location,
   ...
-}: let
+}: {
-  inherit (import ../../hosts/${host}/variables.nix) gitUsername shell;
-in {
   imports = [inputs.home-manager.nixosModules.home-manager];
   home-manager = {
     useUserPackages = true;
@@ -21,6 +25,12 @@ in {
         host
         profile
         system
+        extraMonitorSettings
+        shell
+        keyboardLayout
+        gitEmail
+        gitUsername
+        location
         ;
     };
     users.${username} = {

modules/core/xserver.nix

@@ -1,6 +1,4 @@
-{host, ...}: let
+{keyboardLayout, ...}: {
-  inherit (import ../../hosts/${host}/variables.nix) keyboardLayout;
-in {
   services.xserver = {
     enable = true;
     xkb = {

modules/home/bash/default.nix

@@ -1,6 +1,4 @@
-{host, ...}: let
+{shell, ...}: {
-  inherit (import ../../../hosts/${host}/variables.nix) shell;
-in {
   programs.bash = {
     enable =
       if shell == "bash"

modules/home/fish/default.nix

@@ -1,10 +1,8 @@
 {
   pkgs,
-  host,
+  shell,
   ...
-}: let
+}: {
-  inherit (import ../../../hosts/${host}/variables.nix) shell;
-in {
   programs = {
     fish = {
       enable =

modules/home/git.nix

@@ -1,6 +1,8 @@
-{host, ...}: let
+{
-  inherit (import ../../hosts/${host}/variables.nix) gitUsername gitEmail;
+  gitUsername,
-in {
+  gitEmail,
+  ...
+}: {
   programs.git = {
     enable = true;
     settings = {

modules/home/hyprland/hyprland.nix

@@ -1,10 +1,9 @@
 {
-  host,
+  extraMonitorSettings,
+  keyboardLayout,
   pkgs,
   ...
-}: let
+}: {
-  inherit (import ../../../hosts/${host}/variables.nix) extraMonitorSettings keyboardLayout;
-in {
   systemd.user.targets.hyprland-session.Unit.Wants = [
     "xdg-desktop-autostart.target"
   ];

modules/home/noctalia/settings/general.nix

@@ -1,11 +1,9 @@
 {
   lib,
-  host,
+  keyboardLayout,
   username,
   ...
-}: let
+}: {
-  inherit (import ../../../../hosts/${host}/variables.nix) keyboardLayout;
-in {
   programs.noctalia-shell.settings.general = lib.mkForce {
     avatarImage = "/home/${username}/.face.icon";
     dimmerOpacity = 0.2;

modules/home/noctalia/settings/location.nix

@@ -1,10 +1,8 @@
 {
   lib,
-  host,
+  location,
   ...
-}: let
+}: {
-  inherit (import ../../../../hosts/${host}/variables.nix) location;
-in {
   programs.noctalia-shell.settings.location = lib.mkForce {
     name = "${location}";
     weatherEnabled = true;

profiles/nvidia-laptop/default.nix

@@ -1,6 +1,9 @@
-{host, ...}: let
+{
-  inherit (import ../../hosts/${host}/variables.nix) intelID nvidiaID;
+  host,
-in {
+  intelID,
+  nvidiaID,
+  ...
+}: {
   imports = [
     ../../hosts/${host}
     ../../modules/drivers