oysteikt/nix-dotfiles
oysteikt
/
nix-dotfiles
2
0
Fork 0
Code Issues Pull Requests Activity

modules: move colors to `home/modules`, explicitly import all

This commit is contained in:
Oystein Kristoffer Tveit 2023-07-28 21:48:15 +02:00
parent 4456244f2d
commit fdace82c2f
Signed by: oysteikt
GPG Key ID: 9F2F7D8250F35146
5 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
flake.nix
View File

@ -145,7 +145,7 @@
configuration = { configuration = {
imports = [ imports = [
./home/home.nix ./home/home.nix
./modules ./modules/machineVars.nix
]; ];
machineVars = { machineVars = {
@ -167,7 +167,8 @@
inherit (pkgs) lib; inherit (pkgs) lib;
modules = [ modules = [
"${home-manager}/nixos" "${home-manager}/nixos"
./modules ./modules/machineVars.nix
./modules/socketActivation.nix
./hosts/common.nix ./hosts/common.nix
./hosts/${name}/configuration.nix ./hosts/${name}/configuration.nix
@ -205,7 +206,7 @@
inherit pkgs; inherit pkgs;
inherit inputs; inherit inputs;
inherit (pkgs) lib; inherit (pkgs) lib;
inherit (config) machineVars colors; inherit (config) machineVars;
inherit (self) extendedLib; inherit (self) extendedLib;
}; };
}; };

6
home/home.nix
View File

@ -1,9 +1,8 @@
{ pkgs, lib, extendedLib, inputs, machineVars, colors, ... } @ args: let { pkgs, lib, extendedLib, inputs, machineVars, ... } @ args: let
inherit (lib) mkForce mkIf optionals; inherit (lib) mkForce mkIf optionals;
graphics = !machineVars.headless; graphics = !machineVars.headless;
in { in {
inherit machineVars; inherit machineVars;
inherit colors;
imports = [ imports = [
./shellOptions.nix ./shellOptions.nix
@ -25,7 +24,8 @@ in {
./programs/tmux.nix ./programs/tmux.nix
./programs/zsh ./programs/zsh
../modules ../modules/machineVars.nix
./modules/colors.nix
inputs.secrets.outputs.home-config inputs.secrets.outputs.home-config
] ++ optionals graphics [ ] ++ optionals graphics [

0
modules/colors.nix → home/modules/colors.nix
View File

7
modules/default.nix
View File

@ -1,7 +0,0 @@
{ ... }:
{
imports = [
./colors.nix
./machineVars.nix
];
}

1
modules/machineVars.nix
View File

@ -3,6 +3,7 @@ let
inherit (lib) types mkEnableOption mkOption mkIf; inherit (lib) types mkEnableOption mkOption mkIf;
cfg = config.machineVars; cfg = config.machineVars;
in { in {
# TODO: namespace these options behind `local`
options.machineVars = { options.machineVars = {
headless = mkEnableOption "Whether or not the machine should have graphical output."; headless = mkEnableOption "Whether or not the machine should have graphical output.";