better shell

fish/config.fish

@@ -5,20 +5,6 @@ end
 # no greeting
 set fish_greeting
 
-# ls alias
-alias ls="ls --hyperlink=auto --color=auto"
-alias ll="ls -lh"
-alias la="ls -lha"
-
-# grep alias
-alias grep="grep --color=auto"
-
-# nvim
-if type -q nvim
-    set -x EDITOR nvim
-    set -x VISUAL nvim
-end
-
 if test -d $HOME/.config/fish/prev.d
     for file in $HOME/.config/fish/prev.d/*.fish
         if test -f $file

fish/post.d/fetch.fish

@@ -30,7 +30,7 @@ if type -q fastfetch
     end
 end
 
-# add 'set -g no_fetch' somewhere other than post.d to disable fetching
+# add 'set -g no_fetch' somewhere in prev.d to disable auto-fetch
 if not set -q no_fetch
     if type -q ff-brief
 	    ff-brief

fish/prev.d/.gitignore

@@ -1,7 +1,6 @@
 *
 !.gitignore
 !prompt.fish
-!ssh-agent.fish
 !theme.fish
-!programs.fish
+!alias.fish
 !env.fish

fish/prev.d/alias.fish

@@ -0,0 +1,49 @@
+# fzf
+if type -q fzf
+    fzf --fish | source
+
+    if type -q wl-copy
+        function fzc
+            fzf $argv | string collect | wl-copy
+        end
+    end
+
+    if type -q bat
+        alias fz="fzf --preview 'bat --style=numbers --color=always {}'"
+    end
+end
+
+# cd
+if type -q zoxide
+    zoxide init fish | source
+    alias cd=z
+end
+
+# rm
+if type -q trash
+    alias rm="echo \"use 'trash' instead :)\"  && sh -c \"exit 42\" && echo why do you see this line :O"
+end
+
+# ls
+if type -q eza
+    alias ll="eza -lh --group-directories-first --icons=auto"
+    alias la="eza -lh --group-directories-first --icons=auto --all"
+    alias lt="eza --tree --level=2 --long --icons --git"
+else
+    alias ll="ls -lh --group-directories-first --color=auto"
+    alias la="ls -lah --group-directories-first --color=auto"
+end
+
+# directories
+alias ..='cd ..'
+alias ...='cd ../..'
+alias ....='cd ../../..'
+
+# grep
+alias grep="grep --color=auto"
+
+# nvim
+if type -q nvim
+    set -x EDITOR nvim
+    set -x VISUAL nvim
+end

fish/prev.d/env.fish

@@ -0,0 +1,4 @@
+fish_add_path $HOME/.local/bin
+fish_add_path $HOME/.cargo/bin
+fish_add_path $HOME/go/bin
+fish_add_path $HOME/.scripts

fish/prev.d/programs.fish

@@ -1,18 +0,0 @@
-if type -q fzf
-    fzf --fish | source
-
-    if type -q wl-copy
-        function fzc
-            fzf $argv | string collect | wl-copy
-        end
-    end
-end
-
-if type -q zoxide
-    zoxide init fish | source
-    alias cd=z
-end
-
-if type -q trash
-    alias rm="echo \"use 'trash' instead :)\"  && sh -c \"exit 42\" && echo why do you see this line :O"
-end