flake,flake-parts: update modules

This commit is contained in:
Gabriel Arazas 2025-03-12 15:31:44 +08:00
parent d22937d40c
commit 123ac3ba64
No known key found for this signature in database
GPG Key ID: 62104B43D00AA360
2 changed files with 20 additions and 12 deletions

View File

@ -28,18 +28,22 @@
# My several development shells for usual type of projects. This is much # My several development shells for usual type of projects. This is much
# more preferable than installing all of the packages at the system # more preferable than installing all of the packages at the system
# configuration (or even home environment). # configuration (or even home environment).
devShells = import ../../shells { inherit pkgs; } // { devShells = lib.mkMerge [
default = import ../../shell.nix { (import ../../shells { inherit pkgs; })
inherit pkgs;
extraPackages = with pkgs; {
[ default = import ../../shell.nix {
# Mozilla addons-specific tooling. Unfortunately, only available with inherit pkgs;
# flakes-based setups. extraPackages = with pkgs;
nur.repos.rycee.mozilla-addons-to-nix [
]; # Mozilla addons-specific tooling. Unfortunately, only available with
}; # flakes-based setups.
website = import ../../docs/website/shell.nix { inherit pkgs; }; 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 # Packages that are meant to be consumed inside of a development
# environment. # environment.

View File

@ -66,6 +66,10 @@ in {
}; };
config = { 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 flake.diskoConfigurations = lib.mapAttrs
(name: _: import "${partsConfig.setups.configDir}/disko/${name}") (name: _: import "${partsConfig.setups.configDir}/disko/${name}")
cfg.configs; cfg.configs;