minor

fish/.config/fish/config.fish

@@ -1,3 +1,17 @@
 if not status is-interactive
 	exit
 end
+
+function ls --wraps=lsd --description 'alias ls lsd'
+    lsd $argv
+end
+
+function vim --wraps=nvim --description 'alias vim nvim'
+    nvim $argv
+end
+
+function hibernate --wraps='systemctl hibernate' --description 'alias vim nvim'
+    systemctl hibernate $argv
+end
+
+bind alt-s 're-sudo'

fish/.config/fish/fish_plugins

@@ -1 +0,0 @@
-oh-my-fish/theme-bobthefish

fish/.config/fish/functions/__bobthefish_display_colors.fish

@@ -1,3 +0,0 @@
-function __bobthefish_display_colors -d 'Print example prompts using the current color scheme'
-  bobthefish_display_colors
-end

fish/.config/fish/functions/__fish_colors.fish

@@ -0,0 +1,35 @@
+function __fish_colors -S -d 'Define colors used by bobthefish'
+	set -l colorfg black
+	set -x color_initial_segment_exit     cyan red --bold
+	set -x color_initial_segment_private  cyan black
+	set -x color_initial_segment_su       cyan yellow --bold
+	set -x color_initial_segment_jobs     cyan blue --bold
+
+	set -x color_path                     black white
+	set -x color_path_basename            black white --bold
+	set -x color_path_nowrite             magenta $colorfg
+	set -x color_path_nowrite_basename    magenta $colorfg --bold
+
+	set -x color_repo                     brgreen $colorfg --bold
+	set -x color_repo_work_tree           black $colorfg --bold
+	set -x color_repo_dirty               brred $colorfg --bold
+	set -x color_repo_staged              bryellow $colorfg --bold
+
+	set -x color_vi_mode_default          brblue $colorfg --bold
+	set -x color_vi_mode_insert           green $colorfg --bold
+	set -x color_vi_mode_visual           magenta $colorfg --bold
+
+	set -x color_vagrant                  brcyan $colorfg
+	set -x color_k8s                      magenta $colorfg --bold
+	set -x color_aws_vault                blue $colorfg --bold
+	set -x color_aws_vault_expired        blue red --bold
+	set -x color_username                 white black --bold
+	set -x color_hostname                 white black
+	set -x color_screen                   brgreen $colorfg --bold
+	set -x color_rvm                      brmagenta $colorfg --bold
+	set -x color_node                     brgreen $colorfg --bold
+	set -x color_virtualfish              brblue $colorfg --bold
+	set -x color_virtualgo                brblue $colorfg --bold
+	set -x color_desk                     brblue $colorfg --bold
+	set -x color_nix                      brblue $colorfg --bold
+end

fish/.config/fish/functions/__fish_glyphs.fish

@@ -1,4 +1,4 @@
-function __bobthefish_glyphs -S -d 'Define glyphs used by bobthefish'
+function __fish_glyphs -S -d 'Define glyphs used by bobthefish'
   # Powerline glyphs
   set -x branch_glyph            \uE0A0
   set -x right_black_arrow_glyph \uE0B0
@@ -11,7 +11,7 @@ function __bobthefish_glyphs -S -d 'Define glyphs used by bobthefish'
   set -x tag_glyph               \u2302
   set -x nonzero_exit_glyph      '! '
   set -x private_glyph           \uE0A2 ' '
-  set -x superuser_glyph         '$ '
+  set -x superuser_glyph         '󱢚 '
   set -x bg_job_glyph            '% '
   set -x hg_glyph                \u263F
 

fish/.config/fish/functions/bobthefish_display_colors.fish

@@ -1,51 +1,6 @@
-function bobthefish_display_colors -a color_scheme -d 'Print example prompt color schemes'
-
-  set -l color_schemes default light \
-    solarized solarized-light \
-    base16 base16-light \
-    gruvbox gruvbox-light zenburn \
-    dracula nord \
-    catppuccin-latte catppuccin-frappe \
-    catppuccin-macchiato catppuccin-mocha \
-    jellybeans \
-    terminal terminal-dark-white \
-    terminal-light terminal-light-black \
-    terminal2 terminal2-dark-white \
-    terminal2-light terminal2-light-black
-
-  switch "$color_scheme"
-    case '--all'
-      for scheme in $color_schemes
-        echo
-        echo "$scheme:"
-        bobthefish_display_colors $scheme
-      end
-      return
-
-    case $color_schemes
-      __bobthefish_colors $color_scheme
-
-    case ''
-      if type -q bobthefish_colors
-        if [ -n "$theme_color_scheme" ]
-          echo "$theme_color_scheme (with bobthefish_colors overrides):"
-        else
-          echo 'custom (via bobthefish_colors):'
-        end
-      else if [ -n "$theme_color_scheme" ]
-        echo "$theme_color_scheme:"
-      end
-
-      __bobthefish_colors $theme_color_scheme
-      type -q bobthefish_colors
-        and bobthefish_colors
-
-    case '*'
-      echo 'usage: bobthefish_display_colors [--all] [color_scheme]'
-      return
-  end
-
-  __bobthefish_glyphs
+function bobthefish_display_colors -d 'Print example prompt color schemes'
+	__fish_colors
+  __fish_glyphs
 
   echo
   set_color normal

fish/.config/fish/functions/fish_mode_prompt.fish

@@ -16,10 +16,10 @@ function fish_mode_prompt -d 'bobthefish-optimized fish mode indicator'
         -o "$theme_display_vi" = 'yes' ]
     or return
 
-    __bobthefish_colors $theme_color_scheme
+    __fish_colors
 
-    type -q bobthefish_colors
-    and bobthefish_colors
+    type -q fish_colors
+    and fish_colors
 
     set_color normal # clear out anything bold or underline...
 

fish/.config/fish/functions/fish_prompt.fish

@@ -1,22 +1,3 @@
-# name: bobthefish
-#
-# bobthefish is a Powerline-style, Git-aware fish theme optimized for awesome.
-#
-# You will need a Powerline-patched font for this to work:
-#
-#     https://powerline.readthedocs.org/en/master/installation.html#patched-fonts
-#
-# I recommend picking one of these:
-#
-#     https://github.com/Lokaltog/powerline-fonts
-#
-# For more advanced awesome, install a nerd fonts patched font (and be sure to
-# enable nerd fonts support with `set -g theme_nerd_fonts yes`):
-#
-#     https://github.com/ryanoasis/nerd-fonts
-#
-# See README.md for setup and configuration options.
-#
 # ==============================
 # Helper methods
 # ==============================
@@ -1312,8 +1293,8 @@ function fish_prompt -d 'bobthefish, a fish theme optimized for awesome'
         return
     end
 
-    __bobthefish_glyphs
-    __bobthefish_colors $theme_color_scheme
+    __fish_glyphs
+    __fish_colors
 
     type -q bobthefish_colors
     and bobthefish_colors

fish/.config/fish/functions/fish_title.fish

@@ -11,20 +11,5 @@ function __bobthefish_title_user -S -d 'Display actual user if different from $d
 end
 
 function fish_title
-    __bobthefish_title_user
-
-    if [ "$theme_title_display_process" = 'yes' ]
-        status current-command
-
-        [ "$theme_title_display_path" != 'no' ]
-        and echo ' '
-    end
-
-    if [ "$theme_title_display_path" != 'no' ]
-        if [ "$theme_title_use_abbreviated_path" = 'no' ]
-            echo $PWD
-        else
-            prompt_pwd
-        end
-    end
+	echo (status current-command)
 end

fish/.config/fish/functions/icat.fish

@@ -0,0 +1,3 @@
+function icat --description 'alias icat kitten icat'
+    kitten icat $argv
+end

fish/.config/fish/functions/ls.fish

@@ -1,3 +0,0 @@
-function ls --wraps=lsd --description 'alias ls lsd'
-    lsd $argv
-end

fish/.config/fish/functions/re-sudo.fish

@@ -1,7 +1,5 @@
-function sudo_rep
+function re-sudo
 	set -l cmd (commandline)
 	if test -z "$cmd"; set cmd $history[1]; end
 	commandline -r "sudo $cmd"
 end
-
-bind \es 'sudo_rep'

fish/.config/fish/functions/vim.fish

@@ -1,3 +0,0 @@
-function vim --wraps=nvim --description 'alias vim nvim'
-    nvim $argv
-end

kitty/.config/kitty/base.conf

@@ -26,7 +26,7 @@ focus_follows_mouse yes
 # Window layout
 enabled_layouts grid,*
 draw_minimal_borders yes
-placement_strategy left
+placement_strategy center
 hide_window_decorations yes
 
 # Tab bar

kitty/.config/kitty/current-theme.conf

@@ -37,7 +37,7 @@ color7 #a9b1d6
 
 # bright
 color8  #414868
-color9  #ff899d
+color9  #f82c3d
 color10 #9fe044
 color11 #faba4a
 color12 #8db0ff
@@ -47,4 +47,5 @@ color15 #c0caf5
 
 # extended colors
 color16 #ff9e64
-color17 #db4b4b
+color17 #565f89
+color18 #9d7cd8