diff --git a/.config/zsh/configs/aliases b/.config/zsh/configs/aliases index bfb5a58e..2111aa2a 100644 --- a/.config/zsh/configs/aliases +++ b/.config/zsh/configs/aliases @@ -58,7 +58,6 @@ fi # Misc. alias \ ll="ls -lhpAN --color=auto --group-directories-first" \ - subpush="git push --recurse-submodules=on-demand" \ ref="shortcuts >/dev/null; source ${XDG_CONFIG_HOME:-$HOME/.config}/shell/shortcutrc ; source ${XDG_CONFIG_HOME:-$HOME/.config}/shell/zshnameddirrc" \ weath="less -S ${XDG_CACHE_HOME:-$HOME/.cache}/weatherreport" \ remvirt="virt-manager -c 'qemu+ssh://luca@192.168.178.200/system'" \ diff --git a/.local/bin/dotsync b/.local/bin/dotsync index e4b758c0..63931e88 100755 --- a/.local/bin/dotsync +++ b/.local/bin/dotsync @@ -22,7 +22,8 @@ fi printf "\n" printf "%b" "$BOLD${BLUE}Pulling updates from dotfiles repo...$NC\n" -git pull origin main --recurse-submodules=yes +git pull origin main +git submodule update --remote --merge printf "\n" if [ $needs_pop -eq 1 ]; then diff --git a/TODO.md b/TODO.md index f0e70aed..1c9dfb69 100644 --- a/TODO.md +++ b/TODO.md @@ -1,8 +1,7 @@ # TODO - [ ] Create a better bitwarden integration -- [ ] Remove username from ssh completion +- [ ] Create SSH autocompletions - [ ] add a messaging function to dotsync to warn for breaking changes -- [ ] use hashes in lf titlestring # FIX - [ ] sb-playerctl trailing dash when no artist