move static fish functions

modules/shell/default.nix

@@ -1,6 +1,6 @@
 { ... }: {
   imports = [
-    ./fish.nix
+    ./fish
     ./starship.nix
     ./fzf.nix
     ./direnv.nix

modules/shell/fish/default.nix

@@ -11,8 +11,7 @@
       functions = {
         commandline-git-commits = {
           description = "Insert commit into commandline";
-          body = builtins.readFile
-            ../../fish.configlink/functions/commandline-git-commits.fish;
+          body = builtins.readFile ./functions/commandline-git-commits.fish;
         };
         copy = {
           description = "Copy file contents into clipboard";
@@ -20,7 +19,7 @@
         };
         edit = {
           description = "Open a file in Vim";
-          body = builtins.readFile ../../fish.configlink/functions/edit.fish;
+          body = builtins.readFile ./functions/edit.fish;
         };
         envs = {
           description = "Evaluate a bash-like environment variables file";
@@ -29,15 +28,12 @@
         fcd = {
           description = "Jump to directory";
           argumentNames = "directory";
-          body = builtins.readFile ../../fish.configlink/functions/fcd.fish;
+          body = builtins.readFile ./functions/fcd.fish;
         };
         fish_user_key_bindings = {
-          body = builtins.readFile
-            ../../fish.configlink/functions/fish_user_key_bindings.fish;
-        };
-        ip = {
-          body = builtins.readFile ../../fish.configlink/functions/ip.fish;
+          body = builtins.readFile ./functions/fish_user_key_bindings.fish;
         };
+        ip = { body = builtins.readFile ./functions/ip.fish; };
         json = {
           description = "Tidy up JSON using jq";
           body = "pbpaste | jq '.' | pbcopy"; # Need to fix for non-macOS
@@ -46,16 +42,15 @@
         note = {
           description = "Edit or create a note";
           argumentNames = "filename";
-          body = builtins.readFile ../../fish.configlink/functions/note.fish;
+          body = builtins.readFile ./functions/note.fish;
         };
         recent = {
           description = "Open a recent file in Vim";
-          body = builtins.readFile ../../fish.configlink/functions/recent.fish;
+          body = builtins.readFile ./functions/recent.fish;
         };
         syncnotes = {
           description = "Full git commit on notes";
-          body =
-            builtins.readFile ../../fish.configlink/functions/syncnotes.fish;
+          body = builtins.readFile ./functions/syncnotes.fish;
         };
       };
       interactiveShellInit = ''

modules/shell/fish/functions/commandline-git-commits.fish

@@ -0,0 +1,6 @@
+set commit (git-commits)
+if [ $commit ]
+    commandline -i "$commit"
+else
+    commandline -i HEAD
+end

modules/shell/fish/functions/edit.fish

@@ -0,0 +1,4 @@
+set vimfile (fzf)
+and set vimfile (echo $vimfile | tr -d '\r')
+and commandline -r "vim $vimfile"
+and commandline -f execute

modules/shell/fish/functions/fcd.fish

@@ -0,0 +1,10 @@
+if test -z $directory
+    set directory "$HOME"
+end
+if ! test -d $directory
+    echo "Directory not found: $directory"
+    return 1
+end
+set jump (fd -t d . $directory | fzf)
+and cd $jump $argv
+and commandline -f execute

modules/shell/fish/functions/fish_user_key_bindings.fish

@@ -0,0 +1,13 @@
+bind -M insert \co edit
+bind -M default \co edit
+bind -M insert \ca 'cd ~; and edit; and commandline -a "; cd -"; commandline -f execute'
+bind -M default \ca 'cd ~; and edit; and commandline -a "; cd -"; commandline -f execute'
+bind -M insert \ce recent
+bind -M default \ce recent
+bind -M insert \cg commandline-git-commits
+bind -M insert \cf fcd
+bind -M default \cf fcd
+bind -M insert \cp projects
+bind -M default \cp projects
+bind -M insert \x1F accept-autosuggestion
+bind -M default \x1F accept-autosuggestion

modules/shell/fish/functions/fish_vi_cursor.fish

@@ -0,0 +1,122 @@
+#!/usr/local/bin/fish
+
+function fish_vi_cursor -d 'Set cursor shape for different vi modes'
+    # If we're not interactive, there is effectively no bind mode.
+    if not status is-interactive
+        return
+    end
+
+    # This is hard to test in expect, since the exact sequences depend on the environment.
+    # Instead disable it.
+    if set -q FISH_UNIT_TESTS_RUNNING
+        return
+    end
+
+    # If this variable is set, skip all checks
+    if not set -q fish_vi_force_cursor
+
+        # Emacs Makes All Cursors Suck
+        if set -q INSIDE_EMACS
+            return
+        end
+
+        # vte-based terms set $TERM = xterm*, but only gained support in 2015.
+        # From https://bugzilla.gnome.org/show_bug.cgi?id=720821, it appears it was version 0.40.0
+        if set -q VTE_VERSION
+            and test "$VTE_VERSION" -lt 4000 2>/dev/null
+            return
+        end
+
+        # Similarly, genuine XTerm can do it since v280.
+        if set -q XTERM_VERSION
+            and not test (string replace -r "XTerm\((\d+)\)" '$1' -- "$XTERM_VERSION") -ge 280 2>/dev/null
+            return
+        end
+
+        # We need one of these terms.
+        # It would be lovely if we could rely on terminfo, but:
+        # - The "Ss" entry isn't a thing in macOS' old and crusty terminfo
+        # - It is set for xterm, and everyone and their dog claims to be xterm
+        #
+        # So we just don't care about $TERM, unless it is one of the few terminals that actually have their own entry.
+        #
+        # Note: Previous versions also checked $TMUX, and made sure that then $TERM was screen* or tmux*.
+        # We don't care, since we *cannot* handle term-in-a-terms 100% correctly.
+        if not set -q KONSOLE_PROFILE_NAME
+            and not test -n "$KONSOLE_VERSION" -a "$KONSOLE_VERSION" -ge 200400 # konsole, but new.
+            and not set -q ITERM_PROFILE
+            and not set -q VTE_VERSION # which version is already checked above
+            and not set -q WT_PROFILE_ID
+            and not set -q XTERM_VERSION
+            and not string match -rq '^st(-.*)$' -- $TERM
+            and not string match -q 'xterm-kitty*' -- $TERM
+            and not string match -q 'rxvt*' -- $TERM
+            and not string match -q 'alacritty*' -- $TERM
+            return
+        end
+
+        # HACK: Explicitly disable on ITERM because of #3696, which is weirdness with multi-line prompts.
+        # --force-iterm is now deprecated; set $fish_vi_force_cursor instead
+        if contains -- $argv[1] --force-iterm
+            set -e argv[1]
+        else if set -q ITERM_PROFILE
+            return
+        end
+    end
+
+    set -l terminal $argv[1]
+    set -q terminal[1]
+    or set terminal auto
+
+    set -l function
+    switch "$terminal"
+        case auto
+            # Nowadays, konsole does not set $KONSOLE_PROFILE_NAME anymore,
+            # and it uses the xterm sequences.
+            if set -q KONSOLE_PROFILE_NAME
+                set function __fish_cursor_konsole
+            else if set -q ITERM_PROFILE
+                set function __fish_cursor_1337
+            else
+                set function __fish_cursor_xterm
+            end
+        case konsole
+            set function __fish_cursor_konsole
+        case xterm
+            set function __fish_cursor_xterm
+    end
+
+    set -l tmux_prefix
+    set -l tmux_postfix
+    if set -q TMUX
+        set tmux_prefix echo -ne "'\ePtmux;\e'"
+        set tmux_postfix echo -ne "'\e\\\\'"
+    end
+
+    set -q fish_cursor_unknown
+    or set -g fish_cursor_unknown block blink
+
+    echo "
+          function fish_vi_cursor_handle --on-variable fish_bind_mode --on-event fish_postexec --on-event fish_focus_in
+              set -l varname fish_cursor_\$fish_bind_mode
+              if not set -q \$varname
+                set varname fish_cursor_unknown
+              end
+              $tmux_prefix
+              $function \$\$varname
+              $tmux_postfix
+          end
+         " | source
+
+    echo "
+          function fish_vi_cursor_handle_preexec --on-event fish_preexec
+              set -l varname fish_cursor_default
+              if not set -q \$varname
+                set varname fish_cursor_unknown
+              end
+              $tmux_prefix
+              $function \$\$varname
+              $tmux_postfix
+          end
+         " | source
+end

modules/shell/fish/functions/git-add-fuzzy.fish

@@ -0,0 +1,14 @@
+set gitfile (git status -s \
+    | fzf \
+        --height 50% \
+        -m \
+        --preview-window right:70% \
+        --layout reverse \
+        --preview 'set -l IFS; set gd (git diff --color=always (echo {} | awk \'{$1=$1};1\' | cut -d" " -f2)); if test "$gd"; echo "$gd"; else; bat --color=always (echo {} | awk \'{$1=$1};1\' | cut -d" " -f2); end')
+and for gf in $gitfile
+    set gf (echo $gf \
+        | awk '{$1=$1};1' \
+        | cut -d' ' -f2 \
+        )
+    and git add $gf
+end

modules/shell/fish/functions/git-commits.fish

@@ -0,0 +1,8 @@
+set commitline (git log \
+    --pretty="format:%C(auto)%ar %h%d %s" \
+    | fzf \
+        --height 50% \
+        --preview 'git show --color=always (echo {} | cut -d" " -f4)' \
+        )
+and set commit (echo $commitline | cut -d" " -f4)
+and echo $commit

modules/shell/fish/functions/git-fuzzy-branch.fish

@@ -0,0 +1,10 @@
+set -l current (git rev-parse --abbrev-ref HEAD | tr -d '\n')
+set -l branch (git branch \
+    --format "%(refname:short)" \
+    | fzf \
+        --height 50% \
+        --header="On $current, $header" \
+        --preview-window right:70% \
+        --preview 'git log {} --color=always --pretty="format:%C(auto)%ar %h%d %s"' \
+        )
+and echo $branch

modules/shell/fish/functions/git-history.fish

@@ -0,0 +1,14 @@
+if not count $argv >/dev/null
+    echo "Must provide filename."
+    return 1
+end
+set commitline ( git log \
+    --follow \
+    --pretty="format:%C(auto)%ar %h%d %s" \
+    -- ./$argv \
+    | fzf \
+        --height 100% \
+        --preview "git diff --color=always (echo {} | cut -d' ' -f4)^1..(echo {} | cut -d' ' -f4) -- ./$argv" \
+        )
+and set commit (echo $commitline | cut -d" " -f4)
+and echo $commit

modules/shell/fish/functions/git-push-upstream.fish

@@ -0,0 +1,4 @@
+set -l branch (git branch 2>/dev/null | grep '^\*' | colrm 1 2)
+set -l command "git push --set-upstream origin $branch"
+commandline -r $command
+commandline -f execute

modules/shell/fish/functions/git-show-fuzzy.fish

@@ -0,0 +1,6 @@
+set commitline (git log \
+   --pretty="format:%C(auto)%ar %h%d %s" \
+   | fzf \
+   )
+and set commit (echo $commitline | cut -d" " -f4 )
+and git show $commit

modules/shell/fish/functions/git.fish

@@ -0,0 +1,37 @@
+if contains f $argv
+    switch $argv[1]
+        case checkout
+            git-checkout-fuzzy
+        case add
+            git-add-fuzzy
+        case show
+            git-show-fuzzy
+        case merge
+            git-merge-fuzzy
+        case branch
+            if test "$argv[2]" = -d
+                git-delete-fuzzy
+            else if test "$argv[2]" = -D
+                git-force-delete-fuzzy
+            else
+                echo "Not a fuzzy option."
+                return 1
+            end
+        case reset
+            set commit (git-commits)
+            and if test "$argv[2]" = --hard
+                git reset --hard $commit
+            else
+                git reset $commit
+            end
+        case "*"
+            echo "No fuzzy option."
+            return 1
+    end
+else
+    if count $argv >/dev/null
+        command git $argv
+    else
+        command git status -sb
+    end
+end

modules/shell/fish/functions/ip.fish

@@ -0,0 +1,5 @@
+if count $argv >/dev/null
+    curl ipinfo.io/$argv
+else
+    curl checkip.amazonaws.com
+end

modules/shell/fish/functions/note.fish

@@ -0,0 +1,8 @@
+if test -n "$filename"
+    vim $NOTES_PATH/$filename.md
+else
+    set file (ls $NOTES_PATH | fzf)
+    if [ $status -eq 0 ]
+        vim $NOTES_PATH/$file
+    end
+end

modules/shell/fish/functions/recent.fish

@@ -0,0 +1,4 @@
+set vimfile (fd -t f --exec stat -f "%m%t%N" | sort -nr | cut -f2 | fzf)
+and set vimfile (echo $vimfile | tr -d '\r')
+and commandline -r "vim $vimfile"
+and commandline -f execute

modules/shell/fish/functions/syncnotes.fish

@@ -0,0 +1,7 @@
+set current_dir $PWD
+cd $NOTES_PATH
+git pull
+git add -A
+git commit -m autosync
+git push
+cd $current_dir

modules/shell/fish/functions/uncommitted.fish

@@ -0,0 +1,11 @@
+set current_dir (pwd)
+cd $HOME/dev
+find . -type d -name '.git' | while read dir
+    cd $dir/../
+    and if test -n (echo (git status -s))
+        pwd
+        git status -s
+    end
+    cd -
+end
+cd $current_dir

modules/shell/git.nix

@@ -66,17 +66,13 @@ in {
 
       programs.fish.functions = lib.mkIf (builtins.elem pkgs.fzf home-packages
         && builtins.elem pkgs.bat home-packages) {
-          git = {
-            body = builtins.readFile ../../fish.configlink/functions/git.fish;
-          };
+          git = { body = builtins.readFile ./fish/functions/git.fish; };
           git-add-fuzzy = {
-            body = builtins.readFile
-              ../../fish.configlink/functions/git-add-fuzzy.fish;
+            body = builtins.readFile ./fish/functions/git-add-fuzzy.fish;
           };
           git-fuzzy-branch = {
             argumentNames = "header";
-            body = builtins.readFile
-              ../../fish.configlink/functions/git-fuzzy-branch.fish;
+            body = builtins.readFile ./fish/functions/git-fuzzy-branch.fish;
           };
           git-checkout-fuzzy = {
             body = ''
@@ -103,26 +99,21 @@ in {
             '';
           };
           git-show-fuzzy = {
-            body = builtins.readFile
-              ../../fish.configlink/functions/git-show-fuzzy.fish;
+            body = builtins.readFile ./fish/functions/git-show-fuzzy.fish;
           };
           git-commits = {
-            body = builtins.readFile
-              ../../fish.configlink/functions/git-commits.fish;
+            body = builtins.readFile ./fish/functions/git-commits.fish;
           };
           git-history = {
-            body = builtins.readFile
-              ../../fish.configlink/functions/git-history.fish;
+            body = builtins.readFile ./fish/functions/git-history.fish;
           };
           git-push-upstream = {
             description = "Create upstream branch";
-            body = builtins.readFile
-              ../../fish.configlink/functions/git-push-upstream.fish;
+            body = builtins.readFile ./fish/functions/git-push-upstream.fish;
           };
           uncommitted = {
             description = "Find uncommitted git repos";
-            body = builtins.readFile
-              ../../fish.configlink/functions/uncommitted.fish;
+            body = builtins.readFile ./fish/functions/uncommitted.fish;
           };
         };
     };