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

flake-parts/setups: correct module type for custom modules attr

Browse Source
This commit is contained in:
Gabriel Arazas 2024-03-27 16:34:51 +08:00
parent 92e409e40f
commit 32c807e064
No known key found for this signature in database
GPG Key ID: 62104B43D00AA360
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -169,7 +169,7 @@ in
{ {
options.setups.home-manager = { options.setups.home-manager = {
sharedModules = lib.mkOption { sharedModules = lib.mkOption {
type = with lib.types; listOf raw; type = with lib.types; listOf deferredModule;
default = [ ]; default = [ ];
description = '' description = ''
A list of modules to be shared by all of the declarative home-manager A list of modules to be shared by all of the declarative home-manager
@ -183,7 +183,7 @@ in
}; };
standaloneConfigModules = lib.mkOption { standaloneConfigModules = lib.mkOption {
type = with lib.types; listOf raw; type = with lib.types; listOf deferredModule;
default = [ ]; default = [ ];
internal = true; internal = true;
description = '' description = ''

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

@ -123,7 +123,7 @@ let
}; };
additionalModules = lib.mkOption { additionalModules = lib.mkOption {
type = with lib.types; listOf raw; type = with lib.types; listOf deferredModule;
description = '' description = ''
A list of additional home-manager modules to be added with the A list of additional home-manager modules to be added with the
user. user.
@ -344,9 +344,10 @@ let
(lib.mkIf (config.homeManagerUsers.users != { }) (lib.mkIf (config.homeManagerUsers.users != { })
( (
let let
inherit (config.homeManagerUsers) nixpkgsInstance;
setupConfig = config; setupConfig = config;
hasHomeManagerUsers = config.homeManagerUsers.users != { }; hasHomeManagerUsers = config.homeManagerUsers.users != { };
inherit (config.homeManagerUsers) nixpkgsInstance;
isNixpkgs = state: hasHomeManagerUsers && nixpkgsInstance == state; isNixpkgs = state: hasHomeManagerUsers && nixpkgsInstance == state;
in in
{ config, lib, pkgs, ... }: { { config, lib, pkgs, ... }: {
@ -473,7 +474,7 @@ in
{ {
options.setups.nixos = { options.setups.nixos = {
sharedModules = lib.mkOption { sharedModules = lib.mkOption {
type = with lib.types; listOf raw; type = with lib.types; listOf deferredModule;
default = [ ]; default = [ ];
description = '' description = ''
A list of modules to be shared by all of the declarative NixOS setups. A list of modules to be shared by all of the declarative NixOS setups.

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

@ -23,7 +23,7 @@ let
}; };
modulesOption = lib.mkOption { modulesOption = lib.mkOption {
type = with lib.types; listOf raw; type = with lib.types; listOf deferredModule;
default = [ ]; default = [ ];
}; };
modulesOption' = configEnv: modulesOption // { modulesOption' = configEnv: modulesOption // {