7 files changed, 296 insertions(+), 5 deletions(-)

A .config/fish/completions/podman.fish
M .config/fish/config.fish
R .config/fish/functions/{convert.fish => convert-videos.fish}
A .config/fish/pfp.png
A .config/fish/pos.sh
A .config/fish/starship-init.fish
M .config/kitty/kitty.conf

@@ 0,0 1,179 @@
+# fish completion for podman                               -*- shell-script -*-
+
+function __podman_debug
+    set -l file "$BASH_COMP_DEBUG_FILE"
+    if test -n "$file"
+        echo "$argv" >> $file
+    end
+end
+
+function __podman_perform_completion
+    __podman_debug "Starting __podman_perform_completion"
+
+    # Extract all args except the last one
+    set -l args (commandline -opc)
+    # Extract the last arg and escape it in case it is a space
+    set -l lastArg (string escape -- (commandline -ct))
+
+    __podman_debug "args: $args"
+    __podman_debug "last arg: $lastArg"
+
+    # Disable ActiveHelp which is not supported for fish shell
+    set -l requestComp "PODMAN_ACTIVE_HELP=0 $args[1] __complete $args[2..-1] $lastArg"
+
+    __podman_debug "Calling $requestComp"
+    set -l results (eval $requestComp 2> /dev/null)
+
+    # Some programs may output extra empty lines after the directive.
+    # Let's ignore them or else it will break completion.
+    # Ref: https://github.com/spf13/cobra/issues/1279
+    for line in $results[-1..1]
+        if test (string trim -- $line) = ""
+            # Found an empty line, remove it
+            set results $results[1..-2]
+        else
+            # Found non-empty line, we have our proper output
+            break
+        end
+    end
+
+    set -l comps $results[1..-2]
+    set -l directiveLine $results[-1]
+
+    # For Fish, when completing a flag with an = (e.g., <program> -n=<TAB>)
+    # completions must be prefixed with the flag
+    set -l flagPrefix (string match -r -- '-.*=' "$lastArg")
+
+    __podman_debug "Comps: $comps"
+    __podman_debug "DirectiveLine: $directiveLine"
+    __podman_debug "flagPrefix: $flagPrefix"
+
+    for comp in $comps
+        printf "%s%s\n" "$flagPrefix" "$comp"
+    end
+
+    printf "%s\n" "$directiveLine"
+end
+
+# This function does two things:
+# - Obtain the completions and store them in the global __podman_comp_results
+# - Return false if file completion should be performed
+function __podman_prepare_completions
+    __podman_debug ""
+    __podman_debug "========= starting completion logic =========="
+
+    # Start fresh
+    set --erase __podman_comp_results
+
+    set -l results (__podman_perform_completion)
+    __podman_debug "Completion results: $results"
+
+    if test -z "$results"
+        __podman_debug "No completion, probably due to a failure"
+        # Might as well do file completion, in case it helps
+        return 1
+    end
+
+    set -l directive (string sub --start 2 $results[-1])
+    set --global __podman_comp_results $results[1..-2]
+
+    __podman_debug "Completions are: $__podman_comp_results"
+    __podman_debug "Directive is: $directive"
+
+    set -l shellCompDirectiveError 1
+    set -l shellCompDirectiveNoSpace 2
+    set -l shellCompDirectiveNoFileComp 4
+    set -l shellCompDirectiveFilterFileExt 8
+    set -l shellCompDirectiveFilterDirs 16
+
+    if test -z "$directive"
+        set directive 0
+    end
+
+    set -l compErr (math (math --scale 0 $directive / $shellCompDirectiveError) % 2)
+    if test $compErr -eq 1
+        __podman_debug "Received error directive: aborting."
+        # Might as well do file completion, in case it helps
+        return 1
+    end
+
+    set -l filefilter (math (math --scale 0 $directive / $shellCompDirectiveFilterFileExt) % 2)
+    set -l dirfilter (math (math --scale 0 $directive / $shellCompDirectiveFilterDirs) % 2)
+    if test $filefilter -eq 1; or test $dirfilter -eq 1
+        __podman_debug "File extension filtering or directory filtering not supported"
+        # Do full file completion instead
+        return 1
+    end
+
+    set -l nospace (math (math --scale 0 $directive / $shellCompDirectiveNoSpace) % 2)
+    set -l nofiles (math (math --scale 0 $directive / $shellCompDirectiveNoFileComp) % 2)
+
+    __podman_debug "nospace: $nospace, nofiles: $nofiles"
+
+    # If we want to prevent a space, or if file completion is NOT disabled,
+    # we need to count the number of valid completions.
+    # To do so, we will filter on prefix as the completions we have received
+    # may not already be filtered so as to allow fish to match on different
+    # criteria than the prefix.
+    if test $nospace -ne 0; or test $nofiles -eq 0
+        set -l prefix (commandline -t | string escape --style=regex)
+        __podman_debug "prefix: $prefix"
+
+        set -l completions (string match -r -- "^$prefix.*" $__podman_comp_results)
+        set --global __podman_comp_results $completions
+        __podman_debug "Filtered completions are: $__podman_comp_results"
+
+        # Important not to quote the variable for count to work
+        set -l numComps (count $__podman_comp_results)
+        __podman_debug "numComps: $numComps"
+
+        if test $numComps -eq 1; and test $nospace -ne 0
+            # We must first split on \t to get rid of the descriptions to be
+            # able to check what the actual completion will be.
+            # We don't need descriptions anyway since there is only a single
+            # real completion which the shell will expand immediately.
+            set -l split (string split --max 1 \t $__podman_comp_results[1])
+
+            # Fish won't add a space if the completion ends with any
+            # of the following characters: @=/:.,
+            set -l lastChar (string sub -s -1 -- $split)
+            if not string match -r -q "[@=/:.,]" -- "$lastChar"
+                # In other cases, to support the "nospace" directive we trick the shell
+                # by outputting an extra, longer completion.
+                __podman_debug "Adding second completion to perform nospace directive"
+                set --global __podman_comp_results $split[1] $split[1].
+                __podman_debug "Completions are now: $__podman_comp_results"
+            end
+        end
+
+        if test $numComps -eq 0; and test $nofiles -eq 0
+            # To be consistent with bash and zsh, we only trigger file
+            # completion when there are no other completions
+            __podman_debug "Requesting file completion"
+            return 1
+        end
+    end
+
+    return 0
+end
+
+# Since Fish completions are only loaded once the user triggers them, we trigger them ourselves
+# so we can properly delete any completions provided by another script.
+# Only do this if the program can be found, or else fish may print some errors; besides,
+# the existing completions will only be loaded if the program can be found.
+if type -q "podman"
+    # The space after the program name is essential to trigger completion for the program
+    # and not completion of the program name itself.
+    # Also, we use '> /dev/null 2>&1' since '&>' is not supported in older versions of fish.
+    complete --do-complete "podman " > /dev/null 2>&1
+end
+
+# Remove any pre-existing completions for the program since we will be handling all of them.
+complete -c podman -e
+
+# The call to __podman_prepare_completions will setup __podman_comp_results
+# which provides the program's completion choices.
+complete -c podman -n '__podman_prepare_completions' -f -a '$__podman_comp_results'
+
+
+# This file is generated with "podman completion"; see: podman-completion(1)

@@ 1,5 1,5 @@
 # shell env
-set -x fish_greeting 💖 hiya sashanoraa, welcome to (gethost) "~" 🏳️‍⚧️
+# set -x fish_greeting 💖 hiya sashanoraa, welcome to (gethost) "~" 🏳️‍⚧️
 set -x EDITOR nvim
 
 set -x EXA_COLORS 'di=35;01:da=35'


@@ 62,6 62,7 @@ fish_add_path ~/.local/share/cargo/bin
 fish_add_path ~/.local/share/npm-global/bin
 
 if status is-interactive
+
     # Commands to run in interactive sessions can go here
 
     # gpg for ssh


@@ 98,3 99,16 @@ if status is-interactive
 
     source ~/.config/fish/git.fish
 end
+
+function fish_greeting
+    if kitty +kitten icat --detect-support 2> /dev/null
+        set img_path ~/.config/fish/pfp.png
+
+        set pos (string split x (bash ~/.config/fish/pos.sh))
+        echo 💖 hiya sashanoraa
+        kitty +kitten icat --place 2x1@19x(math $pos[1]) $img_path
+        echo '  ', welcome to (gethost) "~" 🏳️‍⚧️
+    else
+        echo 💖 hiya sashanoraa, welcome to (gethost) "~" 🏳️‍⚧️
+    end
+end

@@ 1,4 1,4 @@
-function convert
+function convert-videos
 for f in *.mkv
 ffmpeg -v quiet -stats -i $f -vcodec libx265 -crf 28 -threads 2 $(basename $f .mkv).mp4
 mv "$f" "$f.done"

@@ 0,0 1,15 @@
+#!/bin/bash
+# based on a script from http://invisible-island.net/xterm/xterm.faq.html
+exec < /dev/tty
+oldstty=$(stty -g)
+stty raw -echo min 0
+# on my system, the following line can be replaced by the line below it
+echo -en "\033[6n" > /dev/tty
+# tput u7 > /dev/tty    # when TERM=xterm (and relatives)
+IFS=';' read -r -d R -a pos
+stty $oldstty
+# change from one-based to zero based so they work with: tput cup $row $col
+row=$((${pos[0]:2} - 1))    # strip off the esc-[
+col=$((${pos[1]} - 1))
+
+echo "${row}x${col}"

@@ 0,0 1,83 @@
+function fish_prompt
+    switch "$fish_key_bindings"
+        case fish_hybrid_key_bindings fish_vi_key_bindings
+            set STARSHIP_KEYMAP "$fish_bind_mode"
+        case '*'
+            set STARSHIP_KEYMAP insert
+    end
+    set STARSHIP_CMD_PIPESTATUS $pipestatus
+    set STARSHIP_CMD_STATUS $status
+    # Account for changes in variable name between v2.7 and v3.0
+    set STARSHIP_DURATION "$CMD_DURATION$cmd_duration"
+    set STARSHIP_JOBS (count (jobs -p))
+    if test "$TRANSIENT" = "1"
+        # Clear from cursor to end of screen as `commandline -f repaint` does not do this
+        # See https://github.com/fish-shell/fish-shell/issues/8418
+        printf \e\[0J
+        if type -q starship_transient_prompt_func
+            starship_transient_prompt_func
+        else
+            printf "\e[1;32m❯\e[0m "
+        end
+    else
+        /bin/starship prompt --terminal-width="$COLUMNS" --status=$STARSHIP_CMD_STATUS --pipestatus="$STARSHIP_CMD_PIPESTATUS" --keymap=$STARSHIP_KEYMAP --cmd-duration=$STARSHIP_DURATION --jobs=$STARSHIP_JOBS
+    end
+end
+
+function fish_right_prompt
+    switch "$fish_key_bindings"
+        case fish_hybrid_key_bindings fish_vi_key_bindings
+            set STARSHIP_KEYMAP "$fish_bind_mode"
+        case '*'
+            set STARSHIP_KEYMAP insert
+    end
+    set STARSHIP_CMD_PIPESTATUS $pipestatus
+    set STARSHIP_CMD_STATUS $status
+    # Account for changes in variable name between v2.7 and v3.0
+    set STARSHIP_DURATION "$CMD_DURATION$cmd_duration"
+    set STARSHIP_JOBS (count (jobs -p))
+    if test "$TRANSIENT" = "1"
+        if type -q starship_transient_rprompt_func
+            starship_transient_rprompt_func
+        else
+            printf ""
+        end
+    else
+        /bin/starship prompt --right --terminal-width="$COLUMNS" --status=$STARSHIP_CMD_STATUS --pipestatus="$STARSHIP_CMD_PIPESTATUS" --keymap=$STARSHIP_KEYMAP --cmd-duration=$STARSHIP_DURATION --jobs=$STARSHIP_JOBS
+    end
+end
+
+# Disable virtualenv prompt, it breaks starship
+set -g VIRTUAL_ENV_DISABLE_PROMPT 1
+
+# Remove default mode prompt
+builtin functions -e fish_mode_prompt
+
+set -gx STARSHIP_SHELL "fish"
+
+# Transience related functions
+function reset-transient --on-event fish_postexec
+    set -g TRANSIENT 0
+end
+
+function transient_execute
+    if commandline --is-valid
+        set -g TRANSIENT 1
+        commandline -f repaint
+    else
+        set -g TRANSIENT 0
+    end
+    commandline -f execute
+end
+
+function enable_transience
+    bind \r transient_execute
+end
+
+function disable_transience
+    bind \r execute
+end
+
+# Set up the session key that will be used to store logs
+# We don't use `random [min] [max]` because it is unavailable in older versions of fish shell
+set -gx STARSHIP_SESSION_KEY (string sub -s1 -l16 (random)(random)(random)(random)(random)0000000000000000)

@@ 858,7 858,7 @@ tab_bar_edge top
 #: The second number is the margin between the tab bar and the
 #: contents of the current tab.
 
-tab_bar_style custom
+tab_bar_style powerline
 
 #: The tab bar style, can be one of:
 


@@ 916,7 916,7 @@ tab_bar_align left
 #: The separator between tabs in the tab bar when using separator as
 #: the tab_bar_style.
 
-# tab_powerline_style round
+tab_powerline_style round
 
 #: The powerline separator style between tabs in the tab bar when
 #: using powerline as the tab_bar_style, can be one of: angled,


@@ 966,7 966,7 @@ tab_bar_align left
 #: {activity_symbol} are not present in the template, they are
 #: prepended to it.
 
-# active_tab_title_template none
+# active_tab_title_template "{fmt.fg.tab}{fmt.bg.purple}{title}"
 
 #: Template to use for active tabs. If not specified falls back to
 #: tab_title_template.