Fix abbreviations for fish 3.6

Author: zephraph

abbreviations

@@ -1,7 +1,11 @@
 # This file contains all the custom fish abbreviations that I enable. 
-# The helpers/abbbrs.fish script reads it in and passes each non-comment
+# The helpers/abbrs.fish script reads it in and passes each non-comment
 # line to abbr with --add or --erase depending on if it's during an install
 # or uninstall
+#
+# Due to a change in 3.6.0 I can't used run abbr --add directly, instead the
+# abbreviations are written to ~/.config/fish/conf.d/abbreviations.fish which will
+# be loaded on shell start
 
 # Quick edit access for Zephish plugin
 EZ code ~/.local/share/omf/pkg/zephish

functions/add_history_entry.fish

@@ -0,0 +1,13 @@
+# See https://unix.stackexchange.com/questions/631733/how-to-write-a-command-to-history-in-fish-shell
+function add_history_entry --description "Adds a command to the shell history"
+    begin
+        # brew install flock
+        flock 1
+        and echo -- '- cmd:' (
+      string replace -- \n \\n (string join ' ' $argv) | string replace \\ \\\\
+    )
+        and date +'  when: %s'
+    end >>$__fish_user_data_dir/fish_history
+    and history merge
+    atuin history start $argv >/dev/null
+end

helpers/abbrs.fish

@@ -3,22 +3,23 @@ begin
     set -lx action $argv[1]
     set -lx context (tint: 778899 [zephish/(status --current-filename)])
 
-    if not test $action = "install"
-        and not test $action = "uninstall"
+    if not test $action = install
+        and not test $action = uninstall
         echo $context Invalid argument (bold: (tint: red $action)) passed to abbrs. Expects either (bold: (tint: cyan install)) or (bold: (tint: cyan uninstall))
         exit 1
     end
 
+    echo "# Source from zephish/abbreviations" >~/.config/fish/conf.d/abbreviations.fish
     while read -la line
         if test "$line[1]" = "#"
             or test -z "$line"
             continue
         end
-        if test $action = "install"
-            abbr -a $line
+        if test $action = install
+            echo "abbr -a $line" >>~/.config/fish/conf.d/abbreviations.fish
         else
             abbr -e $line[1]
         end
     end <abbreviations
 
-end
+end