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

flake-parts/setups/nixos: refactor

Browse Source
This commit is contained in:
Gabriel Arazas 2024-06-12 12:56:58 +08:00
parent 67e85d1639
commit e393dbb791
No known key found for this signature in database
GPG Key ID: 62104B43D00AA360
1 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -143,7 +143,9 @@ let
}; };
}; };
configType = { options, config, name, lib, ... }: { configType = { options, config, name, lib, ... }: let
setupConfig = config;
in {
options = { options = {
formats = lib.mkOption { formats = lib.mkOption {
type = with lib.types; nullOr (listOf str); type = with lib.types; nullOr (listOf str);
@ -255,7 +257,6 @@ let
let let
inherit (config.home-manager) nixpkgsInstance; inherit (config.home-manager) nixpkgsInstance;
setupConfig = config;
hasHomeManagerUsers = config.home-manager.users != { }; hasHomeManagerUsers = config.home-manager.users != { };
isNixpkgs = state: hasHomeManagerUsers && nixpkgsInstance == state; isNixpkgs = state: hasHomeManagerUsers && nixpkgsInstance == state;
in in
@ -333,9 +334,6 @@ let
# Next, we include the chosen NixVim configuration into NixOS. # Next, we include the chosen NixVim configuration into NixOS.
(lib.mkIf (config.nixvim.instance != null) (lib.mkIf (config.nixvim.instance != null)
( (
let
setupConfig = config;
in
{ lib, ... }: { { lib, ... }: {
imports = [ inputs.${config.nixvim.branch}.nixosModules.nixvim ]; imports = [ inputs.${config.nixvim.branch}.nixosModules.nixvim ];
@ -364,9 +362,6 @@ let
# Setting up the typical configuration. # Setting up the typical configuration.
( (
let
setupConfig = config;
in
{ config, lib, ... }: { { config, lib, ... }: {
config = lib.mkMerge [ config = lib.mkMerge [
{ {