fish: move git aliases into dedicated file and source it

fish: update aliases

diff --git a/config/dot-config/fish/config.fish b/config/dot-config/fish/config.fish
index 1bbea8f301e9490c61026321b3c50744f5e1edd6..db31391d0bb916be5d6bb37d69593bf2996ff3ca 100644 (file)
--- a/config/dot-config/fish/config.fish
+++ b/config/dot-config/fish/config.fish
@@ -3,6 +3,7 @@ if status is-interactive
     #
     fish ~/.local/bin/base16-flavours-fish
     source ~/.config/fish/functions/eza-aliases.fish
+    source ~/.config/fish/functions/git-aliases.fish
        set EZA_COLORS "*.patch.skip=38;5;244"
        command fastfetch -c ~/.config/fastfetch/config.jsonc
     source (/usr/bin/starship init fish --print-full-init | psub)
@@ -28,5 +29,4 @@ function foot_cmd_end --on-event fish_postexec
   echo -en "\e]133;D\e\\"
 end
 
-source ~/.config/fish/functions/eza-aliases.fish
 fish_add_path /home/andy/.spicetify

diff --git a/config/dot-config/fish/fish_variables b/config/dot-config/fish/fish_variables
new file mode 100644 (file)
index 0000000..6b8913c
--- /dev/null
+++ b/config/dot-config/fish/fish_variables
@@ -0,0 +1,32 @@
+# This file contains fish universal variable definitions.
+# VERSION: 3.0
+SETUVAR __fish_initialized:3400
+SETUVAR fish_color_autosuggestion:brblack
+SETUVAR fish_color_cancel:\x2dr
+SETUVAR fish_color_command:blue
+SETUVAR fish_color_comment:red
+SETUVAR fish_color_cwd:green
+SETUVAR fish_color_cwd_root:red
+SETUVAR fish_color_end:green
+SETUVAR fish_color_error:brred
+SETUVAR fish_color_escape:brcyan
+SETUVAR fish_color_history_current:\x2d\x2dbold
+SETUVAR fish_color_host:normal
+SETUVAR fish_color_host_remote:yellow
+SETUVAR fish_color_normal:normal
+SETUVAR fish_color_operator:brcyan
+SETUVAR fish_color_param:cyan
+SETUVAR fish_color_quote:yellow
+SETUVAR fish_color_redirection:cyan\x1e\x2d\x2dbold
+SETUVAR fish_color_search_match:bryellow\x1e\x2d\x2dbackground\x3dbrblack
+SETUVAR fish_color_selection:white\x1e\x2d\x2dbold\x1e\x2d\x2dbackground\x3dbrblack
+SETUVAR fish_color_status:red
+SETUVAR fish_color_user:brgreen
+SETUVAR fish_color_valid_path:\x2d\x2dunderline
+SETUVAR fish_key_bindings:fish_default_key_bindings
+SETUVAR fish_pager_color_completion:normal
+SETUVAR fish_pager_color_description:yellow\x1e\x2di
+SETUVAR fish_pager_color_prefix:normal\x1e\x2d\x2dbold\x1e\x2d\x2dunderline
+SETUVAR fish_pager_color_progress:brwhite\x1e\x2d\x2dbackground\x3dcyan
+SETUVAR fish_pager_color_selected_background:\x2dr
+SETUVAR fish_user_paths:/home/andy/\x2espicetify

diff --git a/config/dot-config/fish/functions/eza-aliases.fish b/config/dot-config/fish/functions/eza-aliases.fish
index d54813d096bc2e99aa256cff4642709b45307361..7e400c6776026c28be0e65a9bd261e26bf4d82db 100644 (file)
--- a/config/dot-config/fish/functions/eza-aliases.fish
+++ b/config/dot-config/fish/functions/eza-aliases.fish
@@ -1,7 +1,7 @@
 #!/bin/fish
 
 function l1 --wraps='eza' --description='alias eza'
-    switch $(tty | cut -f1-3 -d'/')
+    switch (tty | cut -f1-3 -d'/')
         case /dev/tty
             EZA_GRID_ROWS=13 eza -w 220 --group --group-directories-first -1 $argv
         case /dev/pts
@@ -10,7 +10,7 @@ function l1 --wraps='eza' --description='alias eza'
 end
 
 function ls --wraps='eza' --description='alias eza'
-    switch $(tty | cut -f1-3 -d'/')
+    switch (tty | cut -f1-3 -d'/')
         case /dev/tty
             EZA_GRID_ROWS=13 eza -w 220 --group-directories-first --icons $argv
         case /dev/pts
@@ -19,7 +19,7 @@ function ls --wraps='eza' --description='alias eza'
 end
 
 function la --wraps='eza' --description='alias eza'
-    switch $(tty | cut -f1-3 -d'/')
+    switch (tty | cut -f1-3 -d'/')
         case /dev/tty
             EZA_GRID_ROWS=13 eza -w 220 --group --group-directories-first --icons -l -a $argv
         case /dev/pts
@@ -28,7 +28,7 @@ function la --wraps='eza' --description='alias eza'
 end
 
 function lg --wraps='eza' --description='alias eza'
-    switch $(tty | cut -f1-3 -d'/')
+    switch (tty | cut -f1-3 -d'/')
         case /dev/tty
             EZA_GRID_ROWS=13 eza -w 220 --no-user --long --grid --group-directories-first $argv
         case /dev/pts
@@ -37,7 +37,7 @@ function lg --wraps='eza' --description='alias eza'
 end
 
 function ll --wraps='eza' --description='alias eza'
-    switch $(tty | cut -f1-3 -d'/')
+    switch (tty | cut -f1-3 -d'/')
         case /dev/tty
             EZA_GRID_ROWS=13 eza -w 220 --group --group-directories-first --icons -l $argv
         case /dev/pts
@@ -46,7 +46,7 @@ function ll --wraps='eza' --description='alias eza'
 end
 
 function lt --wraps='eza' --description='alias eza'
-    switch $(tty | cut -f1-3 -d'/')
+    switch (tty | cut -f1-3 -d'/')
         case /dev/tty
             EZA_GRID_ROWS=13 eza -w 220 --group --long --grid --group-directories-first --sort=mod -t=mod --time-style=long-iso $argv
         case /dev/pts

diff --git a/config/dot-config/fish/functions/git-aliases.fish b/config/dot-config/fish/functions/git-aliases.fish
new file mode 100644 (file)
index 0000000..2ae863e
--- /dev/null
+++ b/config/dot-config/fish/functions/git-aliases.fish
@@ -0,0 +1,34 @@
+#!/bin/fish
+
+function gst --wraps='git status' --description='alias git status'
+       git status
+end
+
+function glo --wraps='git log --oneline' --description='alias git log --oneline'
+       git log --oneline
+end
+
+function gg --wraps='cd' --description='alias git go top'
+       cd (git rev-parse --show-toplevel)
+end
+
+function gdi --wraps='git diff' --description='alias git diff'
+       git diff 
+end
+
+function gco --wraps='git checkout' --description='alias git checkout'
+       git checkout
+end
+
+function gcp --wraps='git cherry-pick' --description='alias git cherry-pick'
+       git cherry-pick
+end
+
+function gfb --wraps='git filter-branch' --description='alias git filter-branch'
+       echo git filter-branch -f --index-filter 'git rm --cached --ignore-unmatch $argv' --tag-name-filter cat -- --all
+end
+
+function gri --wraps='git rebase -i' --description='alias git rebase interactive'
+       git rebase -i 
+end
+

diff --git a/config/dot-config/fish/functions/lf.fish b/config/dot-config/fish/functions/lf.fish
new file mode 100644 (file)
index 0000000..50e6c93
--- /dev/null
+++ b/config/dot-config/fish/functions/lf.fish
@@ -0,0 +1,4 @@
+function lf --wraps=lfrun --description 'alias lf=lfrun'
+  lfrun $argv
+        
+end