diff --git a/flake-parts/devShells/default.nix b/flake-parts/devShells/default.nix new file mode 100644 index 0000000..5f3c959 --- /dev/null +++ b/flake-parts/devShells/default.nix @@ -0,0 +1,26 @@ +{ + perSystem = + { inputs' + , lib + , pkgs + , self' + , ... + }: { + devShells.default = pkgs.mkShell { + packages = [ + pkgs.bashInteractive + pkgs.sops + (pkgs.terraform.withPlugins (p: [ + p.hetznerdns + p.hcloud + p.null + p.external + p.local + ])) + ]; + inputsFrom = [ + inputs'.clan-core.devShells.default + ]; + }; + }; +} diff --git a/flake.lock b/flake.lock index 338bb05..f6f65b4 100644 --- a/flake.lock +++ b/flake.lock @@ -14,11 +14,11 @@ ] }, "locked": { - "lastModified": 1690388700, - "narHash": "sha256-9hYtUcPe6R/Bp8S+jXw2pFfBYhiLPtAtyG3gAh1HLHo=", + "lastModified": 1690550960, + "narHash": "sha256-448deP14rAvl1Uen/ciInXZ7eCNRC7L/3gyBlaiM0O8=", "ref": "refs/heads/main", - "rev": "1a0cdf0d1d7519073db76a73934912e8d7c0c5fe", - "revCount": 108, + "rev": "ea8f7f83d64e554af28634beb153b34b130e5292", + "revCount": 140, "type": "git", "url": "https://git.clan.lol/clan/clan-core" }, diff --git a/flake.nix b/flake.nix index eb38898..23936c0 100644 --- a/flake.nix +++ b/flake.nix @@ -36,8 +36,6 @@ systems = [ "x86_64-linux" "aarch64-linux" - "aarch64-darwin" - "x86_64-darwin" ]; imports = [ inputs.treefmt-nix.flakeModule @@ -46,6 +44,7 @@ ./flake-parts/action-create-pr ./flake-parts/action-ensure-tea-login ./flake-parts/action-flake-update + ./flake-parts/devShells ./flake-parts/job-flake-update ./targets/flake-module.nix ./modules/flake-module.nix @@ -64,21 +63,6 @@ "composition.nix" ]; }; - packages = { - default = pkgs.mkShell { - packages = [ - pkgs.bashInteractive - pkgs.sops - (pkgs.terraform.withPlugins (p: [ - p.hetznerdns - p.hcloud - p.null - p.external - p.local - ])) - ]; - }; - }; }; }); }