From c6cad9df9fd2e0c7c471cdfdfa3c9e4a482ce6ec Mon Sep 17 00:00:00 2001 From: Daniel Kempkens Date: Sat, 29 Jul 2023 01:59:23 +0200 Subject: [PATCH] deploy-rs: remove unused overlays --- flake.nix | 7 ++++++- home/hosts/Styx.nix | 2 -- system/flakes/Styx.nix | 2 -- system/flakes/adsb-antenna.nix | 2 -- system/flakes/argon.nix | 2 -- system/flakes/mediaserver.nix | 2 -- system/flakes/tanker.nix | 2 -- system/flakes/weather-sdr.nix | 2 -- 8 files changed, 6 insertions(+), 15 deletions(-) diff --git a/flake.nix b/flake.nix index 2572ba9..9271ed0 100644 --- a/flake.nix +++ b/flake.nix @@ -129,7 +129,7 @@ "aarch64-linux" ]; - perSystem = { config, pkgs, ... }: { + perSystem = { config, pkgs, inputs', ... }: { treefmt = { inherit (config.flake-root) projectRootFile; @@ -161,6 +161,11 @@ config.pre-commit.devShell ]; + packages = [ + inputs'.agenix.packages.agenix + inputs'.deploy-rs.packages.deploy-rs + ]; + TREEFMT_CONFIG_FILE = config.treefmt.build.configFile; }; }; diff --git a/home/hosts/Styx.nix b/home/hosts/Styx.nix index c0e819d..17269f6 100644 --- a/home/hosts/Styx.nix +++ b/home/hosts/Styx.nix @@ -43,13 +43,11 @@ stateVersion = "22.11"; packages = with pkgs; [ - agenix agilebits-op arp-scan awscli2 curlHTTP3 dasel - deploy-rs dig exiftool fd diff --git a/system/flakes/Styx.nix b/system/flakes/Styx.nix index 6d9bb01..9411680 100644 --- a/system/flakes/Styx.nix +++ b/system/flakes/Styx.nix @@ -6,7 +6,6 @@ let overlay-x86 = _: _: { pkgs-x86 = import nixpkgs { system = "x86_64-darwin"; }; }; overlay-agenix = inputs.agenix.overlays.default; overlay-attic = inputs.attic.overlays.default; - overlay-deploy-rs = _: _: { inherit (inputs.deploy-rs.packages.${default-system}) deploy-rs; }; overlay-nifoc = inputs.nifoc-overlay.overlay; nixpkgsConfig = { @@ -14,7 +13,6 @@ let overlay-x86 overlay-agenix overlay-attic - overlay-deploy-rs overlay-nifoc ]; diff --git a/system/flakes/adsb-antenna.nix b/system/flakes/adsb-antenna.nix index 1743d29..996a494 100644 --- a/system/flakes/adsb-antenna.nix +++ b/system/flakes/adsb-antenna.nix @@ -4,13 +4,11 @@ let default-system = "aarch64-linux"; overlay-attic = inputs.attic.overlays.default; - overlay-deploy-rs = _: _: { inherit (inputs.deploy-rs.packages.${default-system}) deploy-rs; }; overlay-nifoc = inputs.nifoc-overlay.overlay; nixpkgsConfig = { overlays = [ overlay-attic - overlay-deploy-rs overlay-nifoc ]; diff --git a/system/flakes/argon.nix b/system/flakes/argon.nix index 5aa7190..086aee7 100644 --- a/system/flakes/argon.nix +++ b/system/flakes/argon.nix @@ -4,13 +4,11 @@ let default-system = "aarch64-linux"; overlay-attic = inputs.attic.overlays.default; - overlay-deploy-rs = _: _: { inherit (inputs.deploy-rs.packages.${default-system}) deploy-rs; }; overlay-nifoc = inputs.nifoc-overlay.overlay; nixpkgsConfig = { overlays = [ overlay-attic - overlay-deploy-rs overlay-nifoc ]; diff --git a/system/flakes/mediaserver.nix b/system/flakes/mediaserver.nix index 10086b3..1efeb95 100644 --- a/system/flakes/mediaserver.nix +++ b/system/flakes/mediaserver.nix @@ -4,13 +4,11 @@ let default-system = "x86_64-linux"; overlay-attic = inputs.attic.overlays.default; - overlay-deploy-rs = _: _: { inherit (deploy-rs.packages.${default-system}) deploy-rs; }; overlay-nifoc = inputs.nifoc-overlay.overlay; nixpkgsConfig = { overlays = [ overlay-attic - overlay-deploy-rs overlay-nifoc ]; diff --git a/system/flakes/tanker.nix b/system/flakes/tanker.nix index 98bc45e..18b622e 100644 --- a/system/flakes/tanker.nix +++ b/system/flakes/tanker.nix @@ -5,14 +5,12 @@ let overlay-stable = _: _: { pkgs-stable = import nixos-stable { system = default-system; }; }; # overlay-master = _: _: { pkgs-master = import inputs.nixpkgs-master { system = default-system; }; }; - overlay-deploy-rs = _: _: { inherit (deploy-rs.packages.${default-system}) deploy-rs; }; overlay-nifoc = inputs.nifoc-overlay.overlay; nixpkgsConfig = { overlays = [ overlay-stable # overlay-master - overlay-deploy-rs overlay-nifoc ]; diff --git a/system/flakes/weather-sdr.nix b/system/flakes/weather-sdr.nix index 9c2b959..bf9e644 100644 --- a/system/flakes/weather-sdr.nix +++ b/system/flakes/weather-sdr.nix @@ -4,13 +4,11 @@ let default-system = "aarch64-linux"; overlay-attic = inputs.attic.overlays.default; - overlay-deploy-rs = _: _: { inherit (inputs.deploy-rs.packages.${default-system}) deploy-rs; }; overlay-nifoc = inputs.nifoc-overlay.overlay; nixpkgsConfig = { overlays = [ overlay-attic - overlay-deploy-rs overlay-nifoc ];