From e393dbb791873c80a2960b0b7c9e61584ff6f9ba Mon Sep 17 00:00:00 2001 From: Gabriel Arazas Date: Wed, 12 Jun 2024 12:56:58 +0800 Subject: [PATCH] flake-parts/setups/nixos: refactor --- modules/flake-parts/setups/nixos.nix | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/modules/flake-parts/setups/nixos.nix b/modules/flake-parts/setups/nixos.nix index 8197a739..f9e73cdc 100644 --- a/modules/flake-parts/setups/nixos.nix +++ b/modules/flake-parts/setups/nixos.nix @@ -143,7 +143,9 @@ let }; }; - configType = { options, config, name, lib, ... }: { + configType = { options, config, name, lib, ... }: let + setupConfig = config; + in { options = { formats = lib.mkOption { type = with lib.types; nullOr (listOf str); @@ -255,7 +257,6 @@ let let inherit (config.home-manager) nixpkgsInstance; - setupConfig = config; hasHomeManagerUsers = config.home-manager.users != { }; isNixpkgs = state: hasHomeManagerUsers && nixpkgsInstance == state; in @@ -333,9 +334,6 @@ let # Next, we include the chosen NixVim configuration into NixOS. (lib.mkIf (config.nixvim.instance != null) ( - let - setupConfig = config; - in { lib, ... }: { imports = [ inputs.${config.nixvim.branch}.nixosModules.nixvim ]; @@ -364,9 +362,6 @@ let # Setting up the typical configuration. ( - let - setupConfig = config; - in { config, lib, ... }: { config = lib.mkMerge [ {