From 571f0f6f3eff6fb2fa3ed54153c1a85b42513900 Mon Sep 17 00:00:00 2001 From: LavaDesu Date: Sun, 23 Mar 2025 12:57:20 +1100 Subject: [PATCH] treewide: replace enableGUI with config.me.gui --- flake.nix | 8 ++++---- modules/system/home-manager.nix | 4 ++-- modules/system/packages.nix | 6 +++--- users/hana/default.nix | 2 +- users/rin/default.nix | 6 +++--- users/rin/packages.nix | 4 ++-- 6 files changed, 15 insertions(+), 15 deletions(-) diff --git a/flake.nix b/flake.nix index d785db3..db61e01 100644 --- a/flake.nix +++ b/flake.nix @@ -51,7 +51,7 @@ mkSystem = if !(self ? rev) then throw "Dirty git tree detected." else - nixpkgs: name: arch: enableGUI: extraModules: nixpkgs.lib.nixosSystem { + nixpkgs: name: arch: extraModules: nixpkgs.lib.nixosSystem { system = arch; modules = [ ({ @@ -62,14 +62,14 @@ (./hosts + "/${name}") ] ++ extraModules; specialArgs = { - inherit inputs enableGUI; + inherit inputs; modules = import ./modules { lib = nixpkgs.lib; }; }; }; in { - nixosConfigurations."anemone" = mkSystem nixpkgs "anemone" "x86_64-linux" true []; - nixosConfigurations."hyacinth" = mkSystem nixpkgs "hyacinth" "x86_64-linux" true []; + nixosConfigurations."anemone" = mkSystem nixpkgs "anemone" "x86_64-linux" []; + nixosConfigurations."hyacinth" = mkSystem nixpkgs "hyacinth" "x86_64-linux" []; packages."x86_64-linux" = let diff --git a/modules/system/home-manager.nix b/modules/system/home-manager.nix index 9de74ad..7d0f19d 100644 --- a/modules/system/home-manager.nix +++ b/modules/system/home-manager.nix @@ -1,4 +1,4 @@ -{ config, enableGUI, inputs, modules, ... }: { +{ config, inputs, modules, ... }: { imports = [ inputs.home-manager.nixosModules.home-manager ]; @@ -6,7 +6,7 @@ useGlobalPkgs = true; useUserPackages = true; extraSpecialArgs = { - inherit enableGUI inputs modules; + inherit inputs modules; sysConfig = config; }; sharedModules = [ diff --git a/modules/system/packages.nix b/modules/system/packages.nix index 2f545a2..0af911d 100644 --- a/modules/system/packages.nix +++ b/modules/system/packages.nix @@ -1,4 +1,4 @@ -{ config, enableGUI, lib, pkgs, ... }: { +{ config, lib, pkgs, ... }: { environment.systemPackages = with pkgs; [ comma ecryptfs @@ -16,13 +16,13 @@ sshfs rsync wget - ] ++ lib.optionals enableGUI [ + ] ++ lib.optionals config.me.gui [ gparted nautilus ]; environment.variables.EDITOR = "nvim"; } -// (if !enableGUI then {} else { +// (if !config.me.gui then {} else { programs.adb.enable = true; hardware.graphics.extraPackages = with pkgs; [ vaapiIntel diff --git a/users/hana/default.nix b/users/hana/default.nix index 482323f..25cfc8b 100644 --- a/users/hana/default.nix +++ b/users/hana/default.nix @@ -12,7 +12,7 @@ ]; }; - home-manager.users.hana = { config, enableGUI, lib, pkgs, ... }: { + home-manager.users.hana = { config, lib, pkgs, ... }: { home = { username = "hana"; homeDirectory = "/home/hana"; diff --git a/users/rin/default.nix b/users/rin/default.nix index 5403832..790f717 100644 --- a/users/rin/default.nix +++ b/users/rin/default.nix @@ -1,4 +1,4 @@ -{ config, lib, modules, pkgs, ... }: { +{ config, modules, pkgs, ... }: { programs.zsh.enable = true; users.users.rin = { isNormalUser = true; @@ -7,7 +7,7 @@ uid = 1001; hashedPasswordFile = config.age.secrets.passwd.path; }; - home-manager.users.rin = { config, enableGUI, lib, pkgs, ... }: { + home-manager.users.rin = { config, lib, pkgs, ... }: { home = { username = "rin"; homeDirectory = "/home/rin"; @@ -26,7 +26,7 @@ neovim npm zsh - ] ++ lib.optionals enableGUI [ + ] ++ lib.optionals config.me.gui [ theming xdg diff --git a/users/rin/packages.nix b/users/rin/packages.nix index 31e2213..33f690f 100644 --- a/users/rin/packages.nix +++ b/users/rin/packages.nix @@ -1,4 +1,4 @@ -{ enableGUI, inputs, pkgs, ... }: +{ config, inputs, pkgs, ... }: let dotnet-combined = (with pkgs.dotnetCorePackages; combinePackages [ dotnet_8.sdk @@ -25,7 +25,7 @@ in { yt-dlp nodePackages_latest.pnpm - ] ++ lib.optionals enableGUI [ + ] ++ lib.optionals config.me.gui [ drawio element-desktop eww