foodogsquared/nixos-config
1
0
Fork 0
mirror of https://github.com/foo-dogsquared/nixos-config.git synced 2025-04-25 00:19:12 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

flake-parts/setups: create module option for unified configuration directory

Browse Source
This commit is contained in:
Gabriel Arazas 2024-07-23 18:27:15 +08:00
parent 78193d5270
commit dc31e3e36b
No known key found for this signature in database
GPG Key ID: 62104B43D00AA360
6 changed files with 32 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
modules/flake-parts/setups/default.nix
View File

@ -14,15 +14,30 @@
./wrapper-manager.nix ./wrapper-manager.nix
]; ];
options.setups.sharedNixpkgsConfig = lib.mkOption { options.setups = {
type = with lib.types; attrsOf anything; configDir = lib.mkOption {
description = '' type = lib.types.path;
Shared configuration of the nixpkgs instance to be passed to all of the default = ../../../configs;
module environments based from the nixpkgs module system. description = ''
''; The directory containing configurations of various environments. The
default = { }; top-level directories are expected to be the name of the environment
example = { with their configurations inside.
allowUnfree = true; '';
example = lib.literalExpression ''
''${inputs.my-flake}/configs
'';
};
sharedNixpkgsConfig = lib.mkOption {
type = with lib.types; attrsOf anything;
description = ''
Shared configuration of the nixpkgs instance to be passed to all of the
module environments based from the nixpkgs module system.
'';
default = { };
example = {
allowUnfree = true;
};
}; };
}; };
} }

5
modules/flake-parts/setups/disko.nix
View File

@ -8,6 +8,7 @@
let let
cfg = config.setups.disko; cfg = config.setups.disko;
partsConfig = config;
diskoConfigType = { name, config, ... }: { diskoConfigType = { name, config, ... }: {
options = { options = {
@ -57,7 +58,7 @@ in
config = lib.mkIf (config.diskoConfigs != [ ]) ( config = lib.mkIf (config.diskoConfigs != [ ]) (
let let
diskoConfigs = diskoConfigs =
builtins.map (name: import ../../../configs/disko/${name}) config.diskoConfigs; builtins.map (name: import "${partsConfig.setups.configDir}/disko/${name}") config.diskoConfigs;
in in
{ {
modules = lib.singleton { modules = lib.singleton {
@ -75,6 +76,6 @@ in
config = { config = {
flake.diskoConfigurations = flake.diskoConfigurations =
lib.mapAttrs (name: _: import ../../../configs/disko/${name}) cfg.configs; lib.mapAttrs (name: _: import "${partsConfig.setups.configDir}/disko/${name}") cfg.configs;
}; };
} }

2
modules/flake-parts/setups/home-manager.nix
View File

@ -105,7 +105,7 @@ let
config = { config = {
modules = [ modules = [
../../../configs/home-manager/${config.configName} "${partsConfig.setups.configDir}/home-manager/${config.configName}"
( (
let let

3
modules/flake-parts/setups/nixos.nix
View File

@ -6,6 +6,7 @@
let let
cfg = config.setups.nixos; cfg = config.setups.nixos;
partsConfig = config;
nixosModules = ../../nixos; nixosModules = ../../nixos;
# A thin wrapper around the NixOS configuration function. # A thin wrapper around the NixOS configuration function.
@ -172,7 +173,7 @@ let
config.modules = [ config.modules = [
# Bring in the required modules. # Bring in the required modules.
../../../configs/nixos/${config.configName} "${partsConfig.setups.configDir}/nixos/${config.configName}"
# Setting up the typical configuration. # Setting up the typical configuration.
( (

2
modules/flake-parts/setups/nixvim.nix
View File

@ -103,7 +103,7 @@ let
config = { config = {
modules = [ modules = [
../../../configs/nixvim/${config.configName} "${partsConfig.setups.configDir}/nixvim/${config.configName}"
]; ];
}; };
}; };

2
modules/flake-parts/setups/wrapper-manager.nix
View File

@ -86,7 +86,7 @@ let
nixpkgs.config = cfg.sharedNixpkgsConfig; nixpkgs.config = cfg.sharedNixpkgsConfig;
modules = [ modules = [
../../../configs/wrapper-manager/${config.configName} "${partsConfig.setups.configDir}/wrapper-manager/${config.configName}"
]; ];
}; };
}; };