diff --git a/dotfiles/bash/bash_profile b/dotfiles/bash/bash_profile index 3b29a65..6af3c84 100644 --- a/dotfiles/bash/bash_profile +++ b/dotfiles/bash/bash_profile @@ -7,4 +7,4 @@ export PATH="$PATH:$HOME/.cargo/bin" [[ -f ~/.bashrc ]] && . ~/.bashrc # Load items that are common to bash and zsh -[[ -f ~/setup_cockpit/dotfiles/shell/profile ]] && . ~/setup_cockpit/dotfiles/shell/profile +[[ -f ~/setup-cockpit/dotfiles/shell/profile ]] && . ~/setup-cockpit/dotfiles/shell/profile diff --git a/dotfiles/shell/aliases b/dotfiles/shell/aliases index 693a0d5..9729ffb 100644 --- a/dotfiles/shell/aliases +++ b/dotfiles/shell/aliases @@ -3,7 +3,7 @@ # aliases common to bash and zsh # shellcheck source=../../secrets -source /home/*/setup_cockpit/secrets +source /home/*/setup-cockpit/secrets alias lime2connect='ssh $SSH_REPO' alias git-summary='~/github_misc/git-summary/git-summary' @@ -61,11 +61,11 @@ clitip() { xmlstarlet unesc | fmt -80 | iconv -t US } -GIT_REPOS=(~/.password-store ~/setup_cockpit ~/Keepass ~/tssr ~/Lessons/* ~/personal_scripts ~/RootMe ~/src/*) +GIT_REPOS=(~/.password-store ~/setup-cockpit ~/keepass ~/tssr ~/lessons/* ~/personal-scripts ~/root-me ~/src/*) cockpit() { # enable pass-like commands (ex: cockpit git push) local start_dir="$PWD" - cd ~/setup_cockpit && "$@" + cd ~/setup-cockpit && "$@" cd "$start_dir" && echo 'done' } diff --git a/dotfiles/zsh/zprofile b/dotfiles/zsh/zprofile index 0004039..d66bd2a 100644 --- a/dotfiles/zsh/zprofile +++ b/dotfiles/zsh/zprofile @@ -2,4 +2,4 @@ # # Load items that are common to bash and zsh -[[ -f ~/setup_cockpit/dotfiles/shell/profile ]] && source ~/setup_cockpit/dotfiles/shell/profile +[[ -f ~/setup-cockpit/dotfiles/shell/profile ]] && source ~/setup-cockpit/dotfiles/shell/profile diff --git a/pacman_hooks/borg_backup.hook b/pacman_hooks/borg_backup.hook index 7542c97..545bc66 100644 --- a/pacman_hooks/borg_backup.hook +++ b/pacman_hooks/borg_backup.hook @@ -8,5 +8,5 @@ Target = * [Action] Description = Borg backup When = PreTransaction -Exec = /bin/bash -c 'source /home/*/setup_cockpit/secrets && /home/*/setup_cockpit/borg_backup.sh' +Exec = /bin/bash -c 'source /home/*/setup-cockpit/secrets && /home/*/setup-cockpit/borg_backup.sh' Depends = borg