fish: remove flavours, update config

diff --git a/dot-config/fish/config.fish b/dot-config/fish/config.fish
index 9a5681f33fa203ab9946bc1df1609b0a2ae56bc2..297394416508050db1b9aa55416e7c384c054c05 100644 (file)
--- a/dot-config/fish/config.fish
+++ b/dot-config/fish/config.fish
@@ -1,14 +1,12 @@
 if status is-interactive
     # Commands to run in interactive sessions can go here
     #
-    test -f ~/.local/bin/base16-flavours-fish && 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 -v fastfetch && command fastfetch -c ~/.config/fastfetch/default.jsonc
     source (/usr/bin/starship init fish --print-full-init | psub)
     set -g fish_greeting
-    trap "sh ~/.local/bin/base16-flavours" "SIGUSR1"
 end
 
 # set hostname

diff --git a/dot-config/fish/functions/eza-aliases.fish b/dot-config/fish/functions/eza-aliases.fish
index 330597956845b0164b03ea1230d21df3f19be6de..3bc61aeab430d6d286f24402a2039644cb4676fc 100644 (file)
--- a/dot-config/fish/functions/eza-aliases.fish
+++ b/dot-config/fish/functions/eza-aliases.fish
@@ -3,53 +3,53 @@
 function l1 --wraps='eza' --description='alias eza'
     switch (tty | cut -f1-3 -d'/')
         case /dev/tty
-            EZA_GRID_ROWS=13 eza -w 220 --group --group-directories-first -1 $argv
+            EZA_ICON_SPACING=2 COLUMNS=160 EZA_GRID_ROWS=13 eza --group --group-directories-first -1 $argv
         case /dev/pts
-            EZA_GRID_ROWS=26 eza --group --group-directories-first -1 $argv
+            EZA_ICON_SPACING=2 COLUMNS=180 EZA_GRID_ROWS=26 eza --group --group-directories-first -1 $argv
     end
 end
 
 function ls --wraps='eza' --description='alias eza'
     switch (tty | cut -f1-3 -d'/')
         case /dev/tty
-            EZA_GRID_ROWS=13 eza -w 220 --group-directories-first --icons $argv
+            EZA_ICON_SPACING=2 COLUMNS=160 EZA_GRID_ROWS=13 eza --group-directories-first --icons $argv
         case /dev/pts
-            EZA_GRID_ROWS=26 eza --group-directories-first --icons $argv
+            EZA_ICON_SPACING=2 COLUMNS=180 EZA_GRID_ROWS=26 eza --group-directories-first --icons $argv
     end
 end
 
 function la --wraps='eza' --description='alias eza'
     switch (tty | cut -f1-3 -d'/')
         case /dev/tty
-            EZA_GRID_ROWS=13 eza -w 220 --group --group-directories-first --icons -l -a $argv
+            EZA_ICON_SPACING=2 COLUMNS=160 EZA_GRID_ROWS=13 eza --group --group-directories-first --icons -l -a $argv
         case /dev/pts
-            EZA_GRID_ROWS=26 eza --group --group-directories-first --icons -l -a $argv
+            EZA_ICON_SPACING=2 COLUMNS=180 EZA_GRID_ROWS=26 eza --group --group-directories-first --icons -l -a $argv
     end
 end
 
 function lg --wraps='eza' --description='alias eza'
     switch (tty | cut -f1-3 -d'/')
         case /dev/tty
-            EZA_GRID_ROWS=13 eza -w 220 --no-user --long --grid --group-directories-first $argv
+            EZA_ICON_SPACING=2 COLUMNS=160 EZA_GRID_ROWS=13 eza --no-user --long --grid --group-directories-first $argv
         case /dev/pts
-            EZA_GRID_ROWS=26 eza --no-user --long --grid --group-directories-first $argv
+            EZA_ICON_SPACING=2 COLUMNS=180 EZA_GRID_ROWS=26 eza --no-user --long --grid --group-directories-first $argv
     end
 end
 
 function ll --wraps='eza' --description='alias eza'
     switch (tty | cut -f1-3 -d'/')
         case /dev/tty
-            EZA_GRID_ROWS=13 eza -w 220 --group --group-directories-first --icons -l $argv
+            EZA_ICON_SPACING=2 COLUMNS=160 EZA_GRID_ROWS=13 eza --group --group-directories-first --icons -l $argv
         case /dev/pts
-            EZA_GRID_ROWS=26 eza --group --group-directories-first --icons -l $argv
+            EZA_ICON_SPACING=2 COLUMNS=180 EZA_GRID_ROWS=26 eza --group --group-directories-first --icons -l $argv
     end
 end
 
 function lt --wraps='eza' --description='alias eza'
     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
+            EZA_ICON_SPACING=2 COLUMNS=160 EZA_GRID_ROWS=13 eza --group --long --grid --group-directories-first --sort=mod -t=mod --time-style=long-iso $argv
         case /dev/pts
-            EZA_GRID_ROWS=26 eza --group --long --grid --group-directories-first --sort=mod -t=mod --time-style=long-iso $argv
+            EZA_ICON_SPACING=2 COLUMNS=180 EZA_GRID_ROWS=26 eza --group --long --grid --group-directories-first --sort=mod -t=mod --time-style=long-iso $argv
     end
 end