diff --git a/flake.nix b/flake.nix index f1749d4f..941890a9 100644 --- a/flake.nix +++ b/flake.nix @@ -21,6 +21,7 @@ url = "github:hercules-ci/flake-parts"; }; nixpkgs.url = "https://channels.nixos.org/nixpkgs-unstable/nixexprs.tar.xz"; + nixpkgs-shelfmark-full.url = "github:pyrox0/nixpkgs/init/shelfmark-full"; # Overrides flake-compat.url = "github:edolstra/flake-compat"; flake-utils = { @@ -143,6 +144,7 @@ inherit system; overlays = [ inputs.self.overlays.openssh-fixperms + inputs.self.overlays.add-shelfmark-full inputs.glide.overlays.default inputs.golink.overlays.default ]; diff --git a/nixosModules/default-config/nixpkgsConfig.nix b/nixosModules/default-config/nixpkgsConfig.nix index a8f6c5c9..8da2e37e 100644 --- a/nixosModules/default-config/nixpkgsConfig.nix +++ b/nixosModules/default-config/nixpkgsConfig.nix @@ -6,6 +6,7 @@ nixpkgs = { overlays = [ inputs.self.overlays.openssh-fixperms + inputs.self.overlays.add-shelfmark-full inputs.glide.overlays.default inputs.golink.overlays.default ]; diff --git a/overlays/add-shelfmark-full/default.nix b/overlays/add-shelfmark-full/default.nix new file mode 100644 index 00000000..6a8f79af --- /dev/null +++ b/overlays/add-shelfmark-full/default.nix @@ -0,0 +1,11 @@ +{ withSystem, ... }: +{ + flake.overlays.add-shelfmark-full = + final: prev: + withSystem prev.stdenv.hostPlatform.system ( + { inputs', ... }: + { + inherit (inputs'.nixpkgs-shelfmark-full.legacyPackages) shelfmark shelfmark-frontend shelfmark-full; + } + ); +} diff --git a/overlays/default.nix b/overlays/default.nix index 94ad6a7b..36bbffc0 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -1,4 +1,7 @@ { + imports = [ + ./add-shelfmark-full + ]; flake.overlays = { cinny = import ./cinny; openssh-fixperms = import ./openssh-fixperms;