From a2ed02625836e2880edd2f90b3d5de3da6495da8 Mon Sep 17 00:00:00 2001 From: Oliver Davies <oliver@oliverdavies.dev> Date: Wed, 10 Jul 2024 12:50:00 +0100 Subject: [PATCH] Use `$REPOS` variable consistently in scripts --- bin/update-all-git-repos | 2 +- lib/shared/modules/tmux.nix | 4 ++-- lib/shared/modules/zsh/aliases.nix | 2 +- lib/shared/scripts/t.nix | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/bin/update-all-git-repos b/bin/update-all-git-repos index d939fc85..e5fbbc49 100755 --- a/bin/update-all-git-repos +++ b/bin/update-all-git-repos @@ -6,7 +6,7 @@ set -o errexit set -o nounset -dirs=$(find ~/Code -mindepth 1 -maxdepth 2 -type d -name .git -not -path '*/*.old/*') +dirs=$(find "$REPOS" -mindepth 1 -maxdepth 2 -type d -name .git -not -path '*/*.old/*') for dir in $dirs; do repo_path="${dir%/.git}" diff --git a/lib/shared/modules/tmux.nix b/lib/shared/modules/tmux.nix index 9908112d..0a7a42f9 100644 --- a/lib/shared/modules/tmux.nix +++ b/lib/shared/modules/tmux.nix @@ -97,8 +97,8 @@ in bind-key -T copy-mode-vi 'C-\' select-pane -l bind-key -r F new-window t - bind-key -r D run-shell "t ~/Code/dotfiles.nix" - bind-key -r N run-shell "t ~/Code/opdavies.nvim" + bind-key -r D run-shell "t $REPOS/dotfiles.nix" + bind-key -r N run-shell "t $REPOS/opdavies.nvim" bind-key -r W run-shell "t ~/Documents/wiki" set -g @resurrect-strategy-nvim 'session' diff --git a/lib/shared/modules/zsh/aliases.nix b/lib/shared/modules/zsh/aliases.nix index 8b1e0df9..bb3bd438 100644 --- a/lib/shared/modules/zsh/aliases.nix +++ b/lib/shared/modules/zsh/aliases.nix @@ -10,5 +10,5 @@ secrets = ''doppler --project "$(whoami)" run''; tag = "tag-release"; wt = "git worktree"; - vss = "LC_ALL=C sort --unique ~/Code/opdavies.nvim/spell/en.utf-8.add --output ~/Code/personal/opdavies.nvim/spell/en.utf-8.add"; + vss = "LC_ALL=C sort --unique $REPOS/opdavies.nvim/spell/en.utf-8.add --output $REPOS/opdavies.nvim/spell/en.utf-8.add"; } diff --git a/lib/shared/scripts/t.nix b/lib/shared/scripts/t.nix index 5f32d610..7967cf9d 100644 --- a/lib/shared/scripts/t.nix +++ b/lib/shared/scripts/t.nix @@ -49,7 +49,7 @@ else # Get the session name from fuzzy-finding list of directories and generating a # tmux-safe version. - items=$(find ~/Code ~/Documents /tmp \ + items=$(find "$REPOS" ~/Documents /tmp \ -maxdepth 1 -mindepth 1 -type d \ ! -name "_archive" \ ! -name "*-old" \