refactor(flake.nix): simplify and consolidate package imports
- Simplified the import statements for `unstablePkgs`, `masterPkgs`, `localPkgs`, `teslamatePkgs`, and `agenixPkgs` by using a helper function `importNixpkgs`. - Consolidated overlays into `additionalOverlays` and combined them with `extOverlays` in the final import statement. - Improved readability and maintainability of the flake configuration.
This commit is contained in:
parent
b72d5c9d6b
commit
cca80288ed
47
flake.nix
47
flake.nix
@ -36,49 +36,38 @@
|
|||||||
let
|
let
|
||||||
config = {
|
config = {
|
||||||
inherit cudaSupport;
|
inherit cudaSupport;
|
||||||
|
|
||||||
allowUnfree = true;
|
allowUnfree = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
extOverlays = [
|
extOverlays = [
|
||||||
(nvidia-patch.overlays.default)
|
(nvidia-patch.overlays.default)
|
||||||
];
|
];
|
||||||
in
|
|
||||||
import nixpkgs rec {
|
|
||||||
inherit system config;
|
|
||||||
|
|
||||||
unstablePkgs = import nixos-unstable {
|
importNixpkgs = { flake }:
|
||||||
inherit system config;
|
import flake {
|
||||||
|
inherit system config;
|
||||||
|
|
||||||
overlays = extOverlays;
|
overlays = extOverlays;
|
||||||
};
|
};
|
||||||
|
|
||||||
masterPkgs = import nixos-master {
|
unstablePkgs = importNixpkgs { flake = nixos-unstable; };
|
||||||
inherit system config;
|
masterPkgs = importNixpkgs { flake = nixos-master; };
|
||||||
|
localPkgs = importNixpkgs { flake = local-unstable; };
|
||||||
|
teslamatePkgs = importNixpkgs { flake = teslamate-flake; };
|
||||||
|
agenixPkgs = importNixpkgs { flake = agenix-flake; };
|
||||||
|
|
||||||
overlays = extOverlays;
|
additionalOverlays = [
|
||||||
};
|
|
||||||
|
|
||||||
localPkgs = import local-unstable {
|
|
||||||
inherit system config;
|
|
||||||
overlays = extOverlays;
|
|
||||||
};
|
|
||||||
|
|
||||||
teslamatePkgs = import teslamate-flake {
|
|
||||||
inherit system config;
|
|
||||||
overlays = extOverlays;
|
|
||||||
};
|
|
||||||
|
|
||||||
agenixPkgs = import agenix-flake {
|
|
||||||
inherit system config;
|
|
||||||
overlays = extOverlays;
|
|
||||||
};
|
|
||||||
|
|
||||||
overlays = [
|
|
||||||
(final: prev: { inherit unstablePkgs; })
|
(final: prev: { inherit unstablePkgs; })
|
||||||
(final: prev: { inherit localPkgs; })
|
(final: prev: { inherit localPkgs; })
|
||||||
(final: prev: { inherit teslamatePkgs; })
|
(final: prev: { inherit teslamatePkgs; })
|
||||||
(final: prev: { inherit agenixPkgs; })
|
(final: prev: { inherit agenixPkgs; })
|
||||||
] ++ extOverlays;
|
(final: prev: { inherit masterPkgs; })
|
||||||
|
];
|
||||||
|
in
|
||||||
|
import nixpkgs {
|
||||||
|
inherit system config;
|
||||||
|
overlays = additionalOverlays ++ extOverlays;
|
||||||
};
|
};
|
||||||
|
|
||||||
wrapUtils = { pkgs }:
|
wrapUtils = { pkgs }:
|
||||||
|
Loading…
Reference in New Issue
Block a user