flake.nix: move several overlays to flake outputs
This commit is contained in:
46
flake.nix
46
flake.nix
@@ -74,26 +74,10 @@
|
||||
];
|
||||
};
|
||||
|
||||
overlays = let
|
||||
nonrecursive-unstable-pkgs = import nixpkgs-unstable {
|
||||
inherit system;
|
||||
config.allowUnfree = true;
|
||||
config.segger-jlink.acceptLicense = true;
|
||||
config.permittedInsecurePackages = [
|
||||
"segger-jlink-qt4-796s"
|
||||
];
|
||||
};
|
||||
in [
|
||||
(import ./overlays/wayland-ime-integration.nix)
|
||||
|
||||
(import ./overlays/pcloud.nix {
|
||||
inherit (nixpkgs) lib;
|
||||
pkgs = nonrecursive-unstable-pkgs;
|
||||
})
|
||||
|
||||
(_: _: {
|
||||
linuxPackages_latest = nonrecursive-unstable-pkgs.linuxPackages_latest;
|
||||
})
|
||||
overlays = [
|
||||
self.overlays.pcloud
|
||||
self.overlays.unstableLinuxPackages
|
||||
self.overlays.waylandImeIntegration
|
||||
|
||||
minecraft.overlays.default
|
||||
osuchan.overlays.default
|
||||
@@ -115,6 +99,28 @@
|
||||
packages = with pkgs; [ sops ];
|
||||
};
|
||||
|
||||
overlays = let
|
||||
nonrecursive-unstable-pkgs = import nixpkgs-unstable {
|
||||
inherit system;
|
||||
config.allowUnfree = true;
|
||||
config.segger-jlink.acceptLicense = true;
|
||||
config.permittedInsecurePackages = [
|
||||
"segger-jlink-qt4-796s"
|
||||
];
|
||||
};
|
||||
in {
|
||||
pcloud = import ./overlays/pcloud.nix {
|
||||
inherit (nixpkgs) lib;
|
||||
pkgs = nonrecursive-unstable-pkgs;
|
||||
};
|
||||
|
||||
unstableLinuxPackages = _: _: {
|
||||
linuxPackages_latest = nonrecursive-unstable-pkgs.linuxPackages_latest;
|
||||
};
|
||||
|
||||
waylandImeIntegration = import ./overlays/wayland-ime-integration.nix;
|
||||
};
|
||||
|
||||
nixosModules = {
|
||||
machineVars = ./modules/machineVars.nix;
|
||||
socketActivation = ./modules/socketActivation.nix;
|
||||
|
Reference in New Issue
Block a user