From bbe32199858c550ce71b4c42752cc66c0e51bddf Mon Sep 17 00:00:00 2001 From: Nikolaos Karaolidis Date: Sat, 16 Aug 2025 13:21:47 +0300 Subject: [PATCH] Add sonder Signed-off-by: Nikolaos Karaolidis --- flake.lock | 8 ++++---- flake.nix | 2 ++ hosts/elara/configs/ssh/default.nix | 2 +- .../nikara/configs/console/{sagew => sas}/default.nix | 5 ++++- hosts/elara/users/nikara/default.nix | 2 +- lib/scripts/update.sh | 2 +- submodules/sas | 2 +- 7 files changed, 14 insertions(+), 9 deletions(-) rename hosts/elara/users/nikara/configs/console/{sagew => sas}/default.nix (52%) diff --git a/flake.lock b/flake.lock index 5756102..341e4e5 100644 --- a/flake.lock +++ b/flake.lock @@ -389,11 +389,11 @@ "sas": { "flake": false, "locked": { - "lastModified": 1755243359, - "narHash": "sha256-R8Tt700YWn/AEIfqG3n4mklFqmtYGsqKnj+kV+Sq6u8=", + "lastModified": 1755339494, + "narHash": "sha256-uJShrCV4n/1ecwO/wg2AjeKfI6rInJUNQWvUo7dMU98=", "ref": "refs/heads/main", - "rev": "7bf093db0a30e4b0d8867c1b21e461f0bf08d866", - "revCount": 4, + "rev": "c5cb904eefd8fdc19cb71c3ac24eb29d2a7531db", + "revCount": 5, "type": "git", "url": "ssh://git@karaolidis.com/karaolidis/nix-sas.git" }, diff --git a/flake.nix b/flake.nix index 4b28306..9bea796 100644 --- a/flake.nix +++ b/flake.nix @@ -25,11 +25,13 @@ }; }; + # FIXME: https://github.com/NixOS/nix/issues/12281 secrets = { url = "git+ssh://git@karaolidis.com/karaolidis/nix-secrets.git"; flake = false; }; + # FIXME: https://github.com/NixOS/nix/issues/12281 sas = { url = "git+ssh://git@karaolidis.com/karaolidis/nix-sas.git"; flake = false; diff --git a/hosts/elara/configs/ssh/default.nix b/hosts/elara/configs/ssh/default.nix index d74fad9..5aac38e 100644 --- a/hosts/elara/configs/ssh/default.nix +++ b/hosts/elara/configs/ssh/default.nix @@ -31,7 +31,7 @@ in IdentityFile /root/.ssh/ssh_personal_ed25519_key IdentitiesOnly yes - Host github.com + Host github.sas.com User git HostName github.com IdentityFile /root/.ssh/ssh_sas_ed25519_key diff --git a/hosts/elara/users/nikara/configs/console/sagew/default.nix b/hosts/elara/users/nikara/configs/console/sas/default.nix similarity index 52% rename from hosts/elara/users/nikara/configs/console/sagew/default.nix rename to hosts/elara/users/nikara/configs/console/sas/default.nix index faaba09..9fb033f 100644 --- a/hosts/elara/users/nikara/configs/console/sagew/default.nix +++ b/hosts/elara/users/nikara/configs/console/sas/default.nix @@ -4,5 +4,8 @@ let selfPkgs = inputs.self.packages.${system}; in { - home-manager.users.${user}.home.packages = [ selfPkgs.sagew ]; + home-manager.users.${user}.home.packages = with selfPkgs; [ + sagew + sonder + ]; } diff --git a/hosts/elara/users/nikara/default.nix b/hosts/elara/users/nikara/default.nix index e9d2dd9..7446b27 100644 --- a/hosts/elara/users/nikara/default.nix +++ b/hosts/elara/users/nikara/default.nix @@ -93,7 +93,7 @@ in (import ./configs/console/java { inherit user home; }) (import ./configs/console/kubernetes { inherit user home; }) (import ./configs/console/podman { inherit user home; }) - (import ./configs/console/sagew { inherit user home; }) + (import ./configs/console/sas { inherit user home; }) (import ./configs/console/ssh { inherit user home; }) (import ./configs/console/viya4-orders-cli { inherit user home; }) diff --git a/lib/scripts/update.sh b/lib/scripts/update.sh index fc6ce0a..2c396dd 100755 --- a/lib/scripts/update.sh +++ b/lib/scripts/update.sh @@ -4,7 +4,7 @@ set -o errexit set -o nounset set -o pipefail -find packages -type f -name "*.nix" | while read -r file; do +find . -type f -name "*.nix" | while read -r file; do update_command=$(grep -oP '^#\s*AUTO-UPDATE:\s*\K.+' "$file" || true) if [[ -n "$update_command" ]]; then echo "Running update command in: $file" diff --git a/submodules/sas b/submodules/sas index 7bf093d..c5cb904 160000 --- a/submodules/sas +++ b/submodules/sas @@ -1 +1 @@ -Subproject commit 7bf093db0a30e4b0d8867c1b21e461f0bf08d866 +Subproject commit c5cb904eefd8fdc19cb71c3ac24eb29d2a7531db