refactor: make sure zsh and fish have the same abbrs

2 files changed, 5 insertions, 7 deletions

diff --git a/.config/fish/config.fish b/.config/fish/config.fish
index 0ce9dbe..966b113 100644
--- a/.config/fish/config.fish
+++ b/.config/fish/config.fish
@@ -7,7 +7,9 @@ if status is-interactive
         fish_vi_key_bindings
 
     # aliases
-        alias grep='grep --color=auto'
+        if command grep --color=auto --version >/dev/null 2>&1
+            alias grep='grep --color=auto'
+        end
         if which eza >/dev/null 2>&1
             alias ls="eza"
         end
@@ -19,8 +21,6 @@ if status is-interactive
         abbr -a c "cal"
         abbr -a d "disown"
         abbr -a dots "cd ~/.local/share/.dotfiles/"
-        abbr -a egrep "grep -E"
-        abbr -a fgrep "grep -F"
         abbr -a ks "killall screen"
         abbr -a lgit 'lazygit'
         abbr -a p "paru"
@@ -30,7 +30,6 @@ if status is-interactive
         abbr -a sr "screen -r"
         abbr -a t "timedatectl"
         abbr -a uncommit 'git reset --soft HEAD^'
-        abbr -a w "curl wttr.in"
         abbr -a x "startx"
         abbr -a yt-best "youtube-dl -cif 'bestvideo+bestaudio/best'"
         abbr -a yt-m4a "youtube-dl -cif 'bestaudio[ext=m4a]'"
diff --git a/.config/shell/.zshrc b/.config/shell/.zshrc
index 7fc291b..e6ebd2c 100644
--- a/.config/shell/.zshrc
+++ b/.config/shell/.zshrc
@@ -50,11 +50,10 @@ SAVEHIST=9999999
         abbr -S --quiet t="timedatectl"
         abbr -S --quiet uncommit="git reset --soft HEAD^"
         abbr -S --quiet x="startx"
-
-    # youtube-dl abbreviations
         abbr -S --quiet yt-best="youtube-dl -cif 'bestvideo+bestaudio/best'"
         abbr -S --quiet yt-m4a="youtube-dl -cif 'bestaudio[ext=m4a]'"
         abbr -S --quiet yt-mp4="youtube-dl -cif 'bestvideo[ext=mp4]+bestaudio[ext=m4a]/best[ext=mp4]/best'"
+        abbr -S --quiet yt-mpv="mpv --ytdl-format="
         abbr -S --quiet yt-webm="youtube-dl -cif 'bestvideo[ext=webm]+bestaudio[ext=webm]/best[ext=webm]/best'"
 
 # pfetch stuff 
@@ -133,4 +132,4 @@ bindkey "^b" backward-word
 bindkey "^[[A" history-substring-search-up
 bindkey "^[[B" history-substring-search-down
 bindkey -M vicmd "k" history-substring-search-up
-bindkey -M vicmd "j" history-substring-search-down
\ No newline at end of file
+bindkey -M vicmd "j" history-substring-search-down