From 08f4da826f1d51cc40210d23718be9e6b6f5640c Mon Sep 17 00:00:00 2001 From: Jashandeep Sohi Date: Thu, 29 Feb 2024 14:44:15 -0800 Subject: [PATCH] use remote repo for deploy-repo template --- flake.lock | 17 +++++++++++++ flake.nix | 6 ++++- templates/deploy-repo/flake.nix | 42 --------------------------------- 3 files changed, 22 insertions(+), 43 deletions(-) delete mode 100644 templates/deploy-repo/flake.nix diff --git a/flake.lock b/flake.lock index ba038cc..9963b7d 100644 --- a/flake.lock +++ b/flake.lock @@ -1,5 +1,21 @@ { "nodes": { + "deploy-repo-template": { + "flake": false, + "locked": { + "lastModified": 1709061350, + "narHash": "sha256-z7qL9Yghv3F73sBE8i+o0UAob3eDeeku668kEZlVW88=", + "ref": "refs/heads/main", + "rev": "fba0d91943542192e5506d886531d66f03573031", + "revCount": 8, + "type": "git", + "url": "https://github.com/LCOGT/deploy-repo-template.git" + }, + "original": { + "type": "git", + "url": "https://github.com/LCOGT/deploy-repo-template.git" + } + }, "devenv": { "inputs": { "flake-compat": "flake-compat", @@ -400,6 +416,7 @@ }, "root": { "inputs": { + "deploy-repo-template": "deploy-repo-template", "devenv": "devenv", "flake-parts": "flake-parts", "kpt": "kpt", diff --git a/flake.nix b/flake.nix index cd552f0..0d65f49 100644 --- a/flake.nix +++ b/flake.nix @@ -20,6 +20,10 @@ inputs.nixpkgs.follows = "nixpkgs"; }; + deploy-repo-template = { + url = "git+https://github.com/LCOGT/deploy-repo-template.git"; + flake = false; + }; }; nixConfig = { @@ -77,7 +81,7 @@ }; deploy-repo = { - path = ./templates/deploy-repo; + path = inputs.deploy-repo-template; description = "GitOps deploy repo"; welcomeText = '' Add the following to `.gitignore`: diff --git a/templates/deploy-repo/flake.nix b/templates/deploy-repo/flake.nix deleted file mode 100644 index bcdfda5..0000000 --- a/templates/deploy-repo/flake.nix +++ /dev/null @@ -1,42 +0,0 @@ -{ - description = "GitOps deploy repo"; - - inputs = { - nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; - flake-parts.url = "github:hercules-ci/flake-parts"; - devenv-k8s.url = "github:LCOGT/devenv-k8s"; - - nixpkgs.follows = "devenv-k8s/nixpkgs"; - flake-parts.follows = "devenv-k8s/flake-parts"; - }; - - nixConfig = { - extra-substituters = [ - "https://devenv.cachix.org" - "https://lco-public.cachix.org" - ]; - - extra-trusted-public-keys = [ - "devenv.cachix.org-1:w1cLUi8dv3hnoSPGAuibQv+f9TZLr6cv/Hm9XgU50cw=" - "lco-public.cachix.org-1:zSmLK7CkAehZ7QzTLZKt+5Y26Lr0w885GUB4GlT1SCg=" - ]; - }; - - outputs = inputs@{ flake-parts, ... }: - flake-parts.lib.mkFlake { inherit inputs; } { - imports = [ - inputs.devenv-k8s.flakeModules.default - ]; - - systems = [ "x86_64-linux" "aarch64-linux" "aarch64-darwin" "x86_64-darwin" ]; - - perSystem = { lib, config, ... }: { - - # Enable these as you see fit - config.devenv.shells.default = { - pre-commit.hooks.kustomize-build-staging.enable = lib.mkForce false; - pre-commit.hooks.kustomize-build-prod.enable = lib.mkForce false; - }; - }; - }; -}