treewide: replace enableGUI with config.me.gui

This commit is contained in:
LavaDesu 2025-03-23 12:57:20 +11:00
parent 3ccf85aa9e
commit 571f0f6f3e
Signed by: cilly
GPG key ID: 6500251E087653C9
6 changed files with 15 additions and 15 deletions

View file

@ -51,7 +51,7 @@
mkSystem = mkSystem =
if !(self ? rev) then throw "Dirty git tree detected." else 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; system = arch;
modules = [ modules = [
({ ({
@ -62,14 +62,14 @@
(./hosts + "/${name}") (./hosts + "/${name}")
] ++ extraModules; ] ++ extraModules;
specialArgs = { specialArgs = {
inherit inputs enableGUI; inherit inputs;
modules = import ./modules { lib = nixpkgs.lib; }; modules = import ./modules { lib = nixpkgs.lib; };
}; };
}; };
in in
{ {
nixosConfigurations."anemone" = mkSystem nixpkgs "anemone" "x86_64-linux" true []; nixosConfigurations."anemone" = mkSystem nixpkgs "anemone" "x86_64-linux" [];
nixosConfigurations."hyacinth" = mkSystem nixpkgs "hyacinth" "x86_64-linux" true []; nixosConfigurations."hyacinth" = mkSystem nixpkgs "hyacinth" "x86_64-linux" [];
packages."x86_64-linux" = packages."x86_64-linux" =
let let

View file

@ -1,4 +1,4 @@
{ config, enableGUI, inputs, modules, ... }: { { config, inputs, modules, ... }: {
imports = [ imports = [
inputs.home-manager.nixosModules.home-manager inputs.home-manager.nixosModules.home-manager
]; ];
@ -6,7 +6,7 @@
useGlobalPkgs = true; useGlobalPkgs = true;
useUserPackages = true; useUserPackages = true;
extraSpecialArgs = { extraSpecialArgs = {
inherit enableGUI inputs modules; inherit inputs modules;
sysConfig = config; sysConfig = config;
}; };
sharedModules = [ sharedModules = [

View file

@ -1,4 +1,4 @@
{ config, enableGUI, lib, pkgs, ... }: { { config, lib, pkgs, ... }: {
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
comma comma
ecryptfs ecryptfs
@ -16,13 +16,13 @@
sshfs sshfs
rsync rsync
wget wget
] ++ lib.optionals enableGUI [ ] ++ lib.optionals config.me.gui [
gparted gparted
nautilus nautilus
]; ];
environment.variables.EDITOR = "nvim"; environment.variables.EDITOR = "nvim";
} }
// (if !enableGUI then {} else { // (if !config.me.gui then {} else {
programs.adb.enable = true; programs.adb.enable = true;
hardware.graphics.extraPackages = with pkgs; [ hardware.graphics.extraPackages = with pkgs; [
vaapiIntel vaapiIntel

View file

@ -12,7 +12,7 @@
]; ];
}; };
home-manager.users.hana = { config, enableGUI, lib, pkgs, ... }: { home-manager.users.hana = { config, lib, pkgs, ... }: {
home = { home = {
username = "hana"; username = "hana";
homeDirectory = "/home/hana"; homeDirectory = "/home/hana";

View file

@ -1,4 +1,4 @@
{ config, lib, modules, pkgs, ... }: { { config, modules, pkgs, ... }: {
programs.zsh.enable = true; programs.zsh.enable = true;
users.users.rin = { users.users.rin = {
isNormalUser = true; isNormalUser = true;
@ -7,7 +7,7 @@
uid = 1001; uid = 1001;
hashedPasswordFile = config.age.secrets.passwd.path; hashedPasswordFile = config.age.secrets.passwd.path;
}; };
home-manager.users.rin = { config, enableGUI, lib, pkgs, ... }: { home-manager.users.rin = { config, lib, pkgs, ... }: {
home = { home = {
username = "rin"; username = "rin";
homeDirectory = "/home/rin"; homeDirectory = "/home/rin";
@ -26,7 +26,7 @@
neovim neovim
npm npm
zsh zsh
] ++ lib.optionals enableGUI [ ] ++ lib.optionals config.me.gui [
theming theming
xdg xdg

View file

@ -1,4 +1,4 @@
{ enableGUI, inputs, pkgs, ... }: { config, inputs, pkgs, ... }:
let let
dotnet-combined = (with pkgs.dotnetCorePackages; combinePackages [ dotnet-combined = (with pkgs.dotnetCorePackages; combinePackages [
dotnet_8.sdk dotnet_8.sdk
@ -25,7 +25,7 @@ in {
yt-dlp yt-dlp
nodePackages_latest.pnpm nodePackages_latest.pnpm
] ++ lib.optionals enableGUI [ ] ++ lib.optionals config.me.gui [
drawio drawio
element-desktop element-desktop
eww eww