diff --git a/configs/flake-parts/dev.nix b/configs/flake-parts/dev.nix index 1f47feea..180234b7 100644 --- a/configs/flake-parts/dev.nix +++ b/configs/flake-parts/dev.nix @@ -28,18 +28,22 @@ # My several development shells for usual type of projects. This is much # more preferable than installing all of the packages at the system # configuration (or even home environment). - devShells = import ../../shells { inherit pkgs; } // { - default = import ../../shell.nix { - inherit pkgs; - extraPackages = with pkgs; - [ - # Mozilla addons-specific tooling. Unfortunately, only available with - # flakes-based setups. - nur.repos.rycee.mozilla-addons-to-nix - ]; - }; - website = import ../../docs/website/shell.nix { inherit pkgs; }; - }; + devShells = lib.mkMerge [ + (import ../../shells { inherit pkgs; }) + + { + default = import ../../shell.nix { + inherit pkgs; + extraPackages = with pkgs; + [ + # Mozilla addons-specific tooling. Unfortunately, only available with + # flakes-based setups. + nur.repos.rycee.mozilla-addons-to-nix + ]; + }; + website = import ../../docs/website/shell.nix { inherit pkgs; }; + } + ]; # Packages that are meant to be consumed inside of a development # environment. diff --git a/modules/flake-parts/setups/disko.nix b/modules/flake-parts/setups/disko.nix index f2648ca6..209970b2 100644 --- a/modules/flake-parts/setups/disko.nix +++ b/modules/flake-parts/setups/disko.nix @@ -66,6 +66,10 @@ in { }; config = { + # Most of the disko configurations are basically lambdas that have yet to + # be evaluated. That's how it can also apply those arguments. + # Unfortunately, it also means you cannot make typical configurations with + # a generic nixpkgs module. flake.diskoConfigurations = lib.mapAttrs (name: _: import "${partsConfig.setups.configDir}/disko/${name}") cfg.configs;