From 319438216439173e66f264b09125334178364eca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C2=B7=F0=90=91=91=F0=90=91=B4=F0=90=91=95=F0=90=91=91?= =?UTF-8?q?=F0=90=91=A9=F0=90=91=A4?= Date: Thu, 22 Oct 2026 01:00:33 +0700 Subject: [PATCH] overlays: freed from the shackles of experimental flakes --- flake.nix | 8 ++------ nix/overlays/default.nix | 6 ++++++ 2 files changed, 8 insertions(+), 6 deletions(-) create mode 100644 nix/overlays/default.nix diff --git a/flake.nix b/flake.nix index c9b8c97a..f9713fa7 100644 --- a/flake.nix +++ b/flake.nix @@ -34,7 +34,7 @@ system: import nixpkgs { inherit system; - overlays = [ packageOverlay ]; + overlays = [ self.overlays.default ]; } ); eachSystem = @@ -46,10 +46,6 @@ pkgs = pkgsFor.${system}; } ); - packageOverlay = final: _prev: rec { - system-manager-unwrapped = final.callPackage ./package.nix { }; - system-manager = final.callPackage ./nix/packages/wrapper.nix { inherit system-manager-unwrapped; }; - }; in { lib = (import ./nix/lib.nix { inherit nixpkgs userborn; }) // { @@ -69,7 +65,7 @@ # Documentation outputs docs = eachSystem ({ pkgs, ... }: import ./docs/options.nix { inherit pkgs; }); - overlays.default = packageOverlay; + overlays.default = import ./nix/overlays; # Only useful for quick tests systemConfigs.default = self.lib.makeSystemConfig { diff --git a/nix/overlays/default.nix b/nix/overlays/default.nix new file mode 100644 index 00000000..636129a9 --- /dev/null +++ b/nix/overlays/default.nix @@ -0,0 +1,6 @@ +final: _prev: { + system-manager-unwrapped = final.callPackage ../../package.nix { }; + system-manager = final.callPackage ../packages/wrapper.nix { + inherit (final) system-manager-unwrapped; + }; +}