home-manager: fix injection of machineVars

flake.nix

@@ -195,15 +195,12 @@
                 extraSpecialArgs = {
                   inherit inputs;
                   inherit (self) extendedLib;
+                  inherit (config) machineVars;
                   secrets = secrets.outputs.settings;
                 };
 
-                users.h7x4 = import ./home/home.nix {
+                users.h7x4 = {
-                  inherit pkgs;
+                  imports = [ ./home/home.nix ];
-                  inherit inputs;
-                  inherit (pkgs) lib;
-                  inherit (config) machineVars;
-                  inherit (self) extendedLib;
                 };
               };
             })

home/config/gtk.nix

@@ -1,6 +1,6 @@
-{ pkgs, config, ... }:
+{ pkgs, config, machineVars, ... }:
 {
-  gtk = pkgs.lib.mkIf (!config.machineVars.headless) {
+  gtk = pkgs.lib.mkIf (!machineVars.headless) {
     enable = true;
     font = {
       name = "Droid Sans";

home/home.nix

@@ -1,9 +1,7 @@
-{ pkgs, lib, extendedLib, inputs, machineVars, ... } @ args: let
+{ config, pkgs, lib, extendedLib, inputs, machineVars, ... } @ args: let
   inherit (lib) mkForce mkIf optionals;
   graphics = !machineVars.headless;
 in {
-  inherit machineVars;
-
   imports = [
     ./shell.nix
     ./packages.nix
@@ -26,7 +24,6 @@ in {
     ./programs/tmux.nix
     ./programs/zsh
 
-    ../modules/machineVars.nix
     ./modules/colors.nix
     ./modules/shellAliases.nix
   ] ++ optionals graphics [

home/packages.nix

@@ -1,6 +1,5 @@
-{ pkgs, config, ... }: let
+{ pkgs, config, machineVars, ... }:
-  inherit (config) machineVars;
+{
-in {
   home.packages = with pkgs; [
     beets
     cloc

home/programs/xmobar/default.nix

@@ -1,4 +1,4 @@
-{ pkgs, config, ... }: let
+{ config, pkgs, machineVars, ... }: let
   inherit (pkgs) lib;
 in {
   programs.xmobar = let
@@ -7,8 +7,8 @@ in {
     # TODO: loop over dataDrives
     disks = [
       "/"
-      "${config.machineVars.dataDrives.default}"
+      "${machineVars.dataDrives.default}"
-      "${config.machineVars.dataDrives.default}/disks/data2"
+      "${machineVars.dataDrives.default}/disks/data2"
     ];
 
     mpd_status_script = pkgs.writeShellScript "mpd-status" ''

home/services/polybar.nix

@@ -1,6 +1,5 @@
-{ pkgs, config, ... }: let
+{ pkgs, config, machineVars, ... }: let
   colors = config.colors.defaultColorSet;
-  inherit (config) machineVars;
 in {
   services.polybar = {
     enable = true;