Compare commits

..

No commits in common. "0365955a0748508290ba7640917db7bb9e8e96fe" and "7f582b1288f1054f8928fc3a511a6bf34c41007e" have entirely different histories.

2 changed files with 1 additions and 6 deletions

@ -1 +1 @@
Subproject commit c6b7cb13818397d7995b07d299ca803f7c6b0507 Subproject commit 3ede97a5ebcea293aed158144550617bb38510db

View file

@ -29,10 +29,6 @@ else
export EDITOR='nvim' export EDITOR='nvim'
fi fi
export GPG_TTY="$(tty)"
export SSH_AUTH_SOCK=$(gpgconf --list-dirs agent-ssh-socket)
gpgconf --launch gpg-agent
alias reboot-windows="systemctl reboot --boot-loader-entry=windows.conf" alias reboot-windows="systemctl reboot --boot-loader-entry=windows.conf"
alias reboot-linux="systemctl reboot --boot-loader-entry=arch.conf" alias reboot-linux="systemctl reboot --boot-loader-entry=arch.conf"
alias zshrc="nvim ~/.zshrc" alias zshrc="nvim ~/.zshrc"
@ -50,7 +46,6 @@ alias rosterm='find_or_create_rosterm'
alias git-delete-merged="git branch --merged main | grep -v '^[ *]*main$' | xargs git branch -d" alias git-delete-merged="git branch --merged main | grep -v '^[ *]*main$' | xargs git branch -d"
function find_or_create_rosterm() { function find_or_create_rosterm() {
docker container inspect ros2-vim > /dev/null 2>&1 docker container inspect ros2-vim > /dev/null 2>&1
if [ $? -eq 0 ]; then if [ $? -eq 0 ]; then