From af1cd6e0b68299f7b7dccb9e4f26737c8514e4cb Mon Sep 17 00:00:00 2001 From: Max Date: Tue, 16 Jul 2024 02:02:48 +0200 Subject: [PATCH] modules/autopatch: drop and replace with modules/nixpkgs-config --- modules/autopatch/default.nix | 18 ------------------ modules/nixpkgs-config/default.nix | 9 +++++++++ modules/part.nix | 4 ++-- 3 files changed, 11 insertions(+), 20 deletions(-) delete mode 100644 modules/autopatch/default.nix create mode 100644 modules/nixpkgs-config/default.nix diff --git a/modules/autopatch/default.nix b/modules/autopatch/default.nix deleted file mode 100644 index 28919d1..0000000 --- a/modules/autopatch/default.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ - nixpkgs.overlays = [ - (self: super: - (let - patched = import ../../packages/patched-derivations.nix super; - in { - - inherit (patched) - kanidm - prometheus-jitsi-exporter - ; - - jre_headless = patched.jre17_standard; - - }) - ) - ]; -} diff --git a/modules/nixpkgs-config/default.nix b/modules/nixpkgs-config/default.nix new file mode 100644 index 0000000..1349664 --- /dev/null +++ b/modules/nixpkgs-config/default.nix @@ -0,0 +1,9 @@ +{ depot, lib, ... }: + +{ + imports = [ + depot.inputs.nixpkgs.nixosModules.readOnlyPkgs + ]; + + nixpkgs.overlays = lib.mkForce []; +} diff --git a/modules/part.nix b/modules/part.nix index e141431..0cd083b 100644 --- a/modules/part.nix +++ b/modules/part.nix @@ -6,7 +6,6 @@ in { flake.nixosModules = with config.flake.nixosModules; { - autopatch = ./autopatch; ascensions = ./ascensions; consul-distributed-services = ./consul-distributed-services; consul-service-registry = ./consul-service-registry; @@ -23,6 +22,7 @@ in networking = ./networking; nix-builder = ./nix-builder; nix-config-server = ./nix-config/server.nix; + nixpkgs-config = ./nixpkgs-config; nix-register-flakes = ./nix-register-flakes; patroni = ./patroni; port-magic = ./port-magic; @@ -34,10 +34,10 @@ in tested = ./tested; machineBase = group [ - autopatch enterprise maintenance minimal + nixpkgs-config port-magic ssh systemd-extras