From 575a1138039bded7ad6bc61ef167f45db8ea741a Mon Sep 17 00:00:00 2001 From: Jermeiah S Date: Mon, 23 Jun 2025 12:51:29 -0400 Subject: [PATCH 1/2] remove .terraform --- .terraform/plugin_path | 3 --- 1 file changed, 3 deletions(-) delete mode 100644 .terraform/plugin_path diff --git a/.terraform/plugin_path b/.terraform/plugin_path deleted file mode 100644 index 8e12850..0000000 --- a/.terraform/plugin_path +++ /dev/null @@ -1,3 +0,0 @@ -[ - "/nix/store/qamki29d3xfgz3100s3hnb3kxay7bcgl-opentofu-1.9.1/libexec/terraform-providers" -] \ No newline at end of file From 05bca5b139e6b685fe644a9b74289fae8df9b0ec Mon Sep 17 00:00:00 2001 From: Jermeiah S Date: Mon, 23 Jun 2025 13:42:49 -0400 Subject: [PATCH 2/2] improved just file added just ssh for ygg services --- justfile | 24 ++++++++++++++++++++++++ modules/flake/devshell.nix | 1 + 2 files changed, 25 insertions(+) diff --git a/justfile b/justfile index 77602eb..a73f90d 100644 --- a/justfile +++ b/justfile @@ -16,6 +16,30 @@ update: lint: nix fmt +# gather ips +[group('dev')] +gather: + ip-gather + +# gather ips +[group('dev')] +get-key machine: + ssh-keyscan -t ed25519 olympus 2>/dev/null | ssh-to-age + +# Auto SSH resolution +[group('dev')] +ssh host: + #!/usr/bin/env bash + set -euo pipefail + addr=$(jq -r --arg host "{{host}}" '.[$host] // empty' hosts.json) + if [ -n "$addr" ]; then + echo "Connecting to $addr for {{host}}" + ssh "$addr" + else + echo "Hostname '{{host}}' not found in hosts.json" + exit 1 + fi + # Check nix flake [group('dev')] check: diff --git a/modules/flake/devshell.nix b/modules/flake/devshell.nix index d4da25d..40a5085 100644 --- a/modules/flake/devshell.nix +++ b/modules/flake/devshell.nix @@ -11,6 +11,7 @@ name = "nixos-unified-template-shell"; meta.description = "Shell environment for modifying this Nix configuration"; packages = with pkgs; [ + jq self'.packages.ip-gather deploy-rs ssh-to-age