mirror of
https://github.com/foo-dogsquared/nixos-config.git
synced 2025-03-15 12:19:00 +00:00
flake,flake-parts: update modules
This commit is contained in:
parent
d22937d40c
commit
123ac3ba64
@ -28,7 +28,10 @@
|
|||||||
# 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 [
|
||||||
|
(import ../../shells { inherit pkgs; })
|
||||||
|
|
||||||
|
{
|
||||||
default = import ../../shell.nix {
|
default = import ../../shell.nix {
|
||||||
inherit pkgs;
|
inherit pkgs;
|
||||||
extraPackages = with pkgs;
|
extraPackages = with pkgs;
|
||||||
@ -39,7 +42,8 @@
|
|||||||
];
|
];
|
||||||
};
|
};
|
||||||
website = import ../../docs/website/shell.nix { inherit pkgs; };
|
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.
|
||||||
|
@ -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;
|
||||||
|
Loading…
Reference in New Issue
Block a user