diff --git a/fastfetch/.config/fastfetch/logo.png b/fastfetch/.config/fastfetch/logo.png index 2ef3972..0e7fd75 100644 Binary files a/fastfetch/.config/fastfetch/logo.png and b/fastfetch/.config/fastfetch/logo.png differ diff --git a/fish/.config/fish/conf.d/tokyonight_storm.fish b/fish/.config/fish/conf.d/theme.fish similarity index 100% rename from fish/.config/fish/conf.d/tokyonight_storm.fish rename to fish/.config/fish/conf.d/theme.fish diff --git a/fish/.config/fish/config.fish b/fish/.config/fish/config.fish index ea1e4ed..93892e1 100644 --- a/fish/.config/fish/config.fish +++ b/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' diff --git a/fish/.config/fish/fish_plugins b/fish/.config/fish/fish_plugins index a912a84..e69de29 100644 --- a/fish/.config/fish/fish_plugins +++ b/fish/.config/fish/fish_plugins @@ -1 +0,0 @@ -oh-my-fish/theme-bobthefish diff --git a/fish/.config/fish/functions/__bobthefish_colors.fish b/fish/.config/fish/functions/__bobthefish_colors.fish deleted file mode 100644 index 4c47754..0000000 --- a/fish/.config/fish/functions/__bobthefish_colors.fish +++ /dev/null @@ -1,1064 +0,0 @@ -function __bobthefish_colors -S -a color_scheme -d 'Define colors used by bobthefish' - switch "$color_scheme" - case 'user' - set -l colorfg black - set -x color_initial_segment_exit white red --bold - set -x color_initial_segment_private white black - set -x color_initial_segment_su white green --bold - set -x color_initial_segment_jobs white 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 green $colorfg - set -x color_repo_work_tree black $colorfg --bold - set -x color_repo_dirty red $colorfg - set -x color_repo_staged yellow $colorfg - - set -x color_vi_mode_default brblue $colorfg --bold - set -x color_vi_mode_insert brgreen $colorfg --bold - set -x color_vi_mode_visual bryellow $colorfg --bold - - set -x color_vagrant brcyan $colorfg - set -x color_k8s magenta white --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 - - case 'terminal' 'terminal-dark*' - set -l colorfg black - [ "$color_scheme" = 'terminal-dark-white' ]; and set colorfg white - set -x color_initial_segment_exit white red --bold - set -x color_initial_segment_private white black - set -x color_initial_segment_su white green --bold - set -x color_initial_segment_jobs white 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 green $colorfg - set -x color_repo_work_tree black $colorfg --bold - set -x color_repo_dirty brred $colorfg - set -x color_repo_staged yellow $colorfg - - set -x color_vi_mode_default brblue $colorfg --bold - set -x color_vi_mode_insert brgreen $colorfg --bold - set -x color_vi_mode_visual bryellow $colorfg --bold - - set -x color_vagrant brcyan $colorfg - set -x color_k8s magenta white --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 - - case 'terminal-light*' - set -l colorfg white - [ "$color_scheme" = 'terminal-light-black' ]; and set colorfg black - set -x color_initial_segment_exit black red --bold - set -x color_initial_segment_private black white - set -x color_initial_segment_su black green --bold - set -x color_initial_segment_jobs black blue --bold - - set -x color_path white black - set -x color_path_basename white black --bold - set -x color_path_nowrite magenta $colorfg - set -x color_path_nowrite_basename magenta $colorfg --bold - - set -x color_repo green $colorfg - set -x color_repo_work_tree white $colorfg --bold - set -x color_repo_dirty brred $colorfg - set -x color_repo_staged yellow $colorfg - - set -x color_vi_mode_default brblue $colorfg --bold - set -x color_vi_mode_insert brgreen $colorfg --bold - set -x color_vi_mode_visual bryellow $colorfg --bold - - set -x color_vagrant brcyan $colorfg - set -x color_k8s magenta white --bold - set -x color_aws_vault blue $colorfg --bold - set -x color_aws_vault_expired blue red --bold - set -x color_username black white --bold - set -x color_hostname black white - 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 - - case 'terminal2' 'terminal2-dark*' - set -l colorfg black - [ "$color_scheme" = 'terminal2-dark-white' ]; and set colorfg white - set -x color_initial_segment_exit grey red --bold - set -x color_initial_segment_private grey black - set -x color_initial_segment_su grey green --bold - set -x color_initial_segment_jobs grey blue --bold - - set -x color_path brgrey white - set -x color_path_basename brgrey white --bold - set -x color_path_nowrite magenta $colorfg - set -x color_path_nowrite_basename magenta $colorfg --bold - - set -x color_repo green $colorfg - set -x color_repo_work_tree brgrey $colorfg --bold - set -x color_repo_dirty brred $colorfg - set -x color_repo_staged yellow $colorfg - - set -x color_vi_mode_default brblue $colorfg --bold - set -x color_vi_mode_insert brgreen $colorfg --bold - set -x color_vi_mode_visual bryellow $colorfg --bold - - set -x color_vagrant brcyan $colorfg - set -x color_k8s magenta white --bold - set -x color_aws_vault blue $colorfg --bold - set -x color_aws_vault_expired blue red --bold - set -x color_username brgrey white --bold - set -x color_hostname brgrey white - 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 - - case 'terminal2-light*' - set -l colorfg white - [ "$color_scheme" = 'terminal2-light-black' ]; and set colorfg black - set -x color_initial_segment_exit brgrey red --bold - set -x color_initial_segment_private brgrey black - set -x color_initial_segment_su brgrey green --bold - set -x color_initial_segment_jobs brgrey blue --bold - - set -x color_path grey black - set -x color_path_basename grey black --bold - set -x color_path_nowrite magenta $colorfg - set -x color_path_nowrite_basename magenta $colorfg --bold - - set -x color_repo green $colorfg - set -x color_repo_work_tree grey $colorfg --bold - set -x color_repo_dirty brred $colorfg - set -x color_repo_staged yellow $colorfg - - set -x color_vi_mode_default brblue $colorfg --bold - set -x color_vi_mode_insert brgreen $colorfg --bold - set -x color_vi_mode_visual bryellow $colorfg --bold - - set -x color_vagrant brcyan $colorfg - set -x color_k8s magenta white --bold - set -x color_aws_vault blue $colorfg --bold - set -x color_aws_vault_expired blue red --bold - set -x color_username grey black --bold - set -x color_hostname grey 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 - - case 'zenburn' - set -l grey 333333 # a bit darker than normal zenburn grey - set -l red CC9393 - set -l green 7F9F7F - set -l yellow E3CEAB - set -l orange DFAF8F - set -l blue 8CD0D3 - set -l white DCDCCC - - set -x color_initial_segment_exit $white $red --bold - set -x color_initial_segment_private $white $grey - set -x color_initial_segment_su $white $green --bold - set -x color_initial_segment_jobs $white $blue --bold - - set -x color_path $grey $white - set -x color_path_basename $grey $white --bold - set -x color_path_nowrite $grey $red - set -x color_path_nowrite_basename $grey $red --bold - - set -x color_repo $green $grey - set -x color_repo_work_tree $grey $grey --bold - set -x color_repo_dirty $red $grey - set -x color_repo_staged $yellow $grey - - set -x color_vi_mode_default $grey $yellow --bold - set -x color_vi_mode_insert $green $white --bold - set -x color_vi_mode_visual $yellow $grey --bold - - set -x color_vagrant $blue $green --bold - set -x color_k8s $green $white --bold - set -x color_aws_vault $blue $grey --bold - set -x color_aws_vault_expired $blue $red --bold - set -x color_username $grey $blue --bold - set -x color_hostname $grey $blue - set -x color_screen $green $grey --bold - set -x color_rvm $red $grey --bold - set -x color_node $green $white --bold - set -x color_virtualfish $blue $grey --bold - set -x color_virtualgo $blue $grey --bold - set -x color_desk $blue $grey --bold - set -x color_nix $blue $grey --bold - - case 'base16-light' - set -l base00 181818 - set -l base01 282828 - set -l base02 383838 - set -l base03 585858 - set -l base04 b8b8b8 - set -l base05 d8d8d8 - set -l base06 e8e8e8 - set -l base07 f8f8f8 - set -l base08 ab4642 # red - set -l base09 dc9656 # orange - set -l base0A f7ca88 # yellow - set -l base0B a1b56c # green - set -l base0C 86c1b9 # cyan - set -l base0D 7cafc2 # blue - set -l base0E ba8baf # violet - set -l base0F a16946 # brown - - set -l colorfg $base00 - - set -x color_initial_segment_exit $base02 $base08 --bold - set -x color_initial_segment_private $base02 $base06 - set -x color_initial_segment_su $base02 $base0B --bold - set -x color_initial_segment_jobs $base02 $base0D --bold - - set -x color_path $base06 $base02 - set -x color_path_basename $base06 $base01 --bold - set -x color_path_nowrite $base06 $base08 - set -x color_path_nowrite_basename $base06 $base08 --bold - - set -x color_repo $base0B $colorfg - set -x color_repo_work_tree $base06 $colorfg --bold - set -x color_repo_dirty $base08 $colorfg - set -x color_repo_staged $base09 $colorfg - - set -x color_vi_mode_default $base04 $colorfg --bold - set -x color_vi_mode_insert $base0B $colorfg --bold - set -x color_vi_mode_visual $base09 $colorfg --bold - - set -x color_vagrant $base0C $colorfg --bold - set -x color_k8s $base06 $colorfg --bold - set -x color_aws_vault $base0D $colorfg --bold - set -x color_aws_vault_expired $base0D $base08 --bold - set -x color_username $base02 $base0D --bold - set -x color_hostname $base02 $base0D - set -x color_screen $base06 $colorfg --bold - set -x color_rvm $base08 $colorfg --bold - set -x color_node $base0B $colorfg --bold - set -x color_virtualfish $base0D $colorfg --bold - set -x color_virtualgo $base0D $colorfg --bold - set -x color_desk $base0D $colorfg --bold - set -x color_nix $base0D $colorfg --bold - - case 'base16' 'base16-dark' - set -l base00 181818 - set -l base01 282828 - set -l base02 383838 - set -l base03 585858 - set -l base04 b8b8b8 - set -l base05 d8d8d8 - set -l base06 e8e8e8 - set -l base07 f8f8f8 - set -l base08 ab4642 # red - set -l base09 dc9656 # orange - set -l base0A f7ca88 # yellow - set -l base0B a1b56c # green - set -l base0C 86c1b9 # cyan - set -l base0D 7cafc2 # blue - set -l base0E ba8baf # violet - set -l base0F a16946 # brown - - set -l colorfg $base07 - - set -x color_initial_segment_exit $base05 $base08 --bold - set -x color_initial_segment_private $base05 $base02 - set -x color_initial_segment_su $base05 $base0B --bold - set -x color_initial_segment_jobs $base05 $base0D --bold - - set -x color_path $base02 $base05 - set -x color_path_basename $base02 $base06 --bold - set -x color_path_nowrite $base02 $base08 - set -x color_path_nowrite_basename $base02 $base08 --bold - - set -x color_repo $base0B $colorfg - set -x color_repo_work_tree $base02 $colorfg --bold - set -x color_repo_dirty $base08 $colorfg - set -x color_repo_staged $base09 $colorfg - - set -x color_vi_mode_default $base03 $colorfg --bold - set -x color_vi_mode_insert $base0B $colorfg --bold - set -x color_vi_mode_visual $base09 $colorfg --bold - - set -x color_vagrant $base0C $colorfg --bold - set -x color_k8s $base0B $colorfg --bold - set -x color_aws_vault $base0D $base0A --bold - set -x color_aws_vault_expired $base0D $base08 --bold - set -x color_username $base02 $base0D --bold - set -x color_hostname $base02 $base0D - set -x color_screen $base0B $colorfg --bold - set -x color_rvm $base08 $colorfg --bold - set -x color_node $base0B $colorfg --bold - set -x color_virtualfish $base0D $colorfg --bold - set -x color_virtualgo $base0D $colorfg --bold - set -x color_desk $base0D $colorfg --bold - set -x color_nix $base0D $colorfg --bold - - case 'solarized-light' - set -l base03 002b36 - set -l base02 073642 - set -l base01 586e75 - set -l base00 657b83 - set -l base0 839496 - set -l base1 93a1a1 - set -l base2 eee8d5 - set -l base3 fdf6e3 - set -l yellow b58900 - set -l orange cb4b16 - set -l red dc322f - set -l magenta d33682 - set -l violet 6c71c4 - set -l blue 268bd2 - set -l cyan 2aa198 - set -l green 859900 - - set colorfg $base03 - - set -x color_initial_segment_exit $base02 $red --bold - set -x color_initial_segment_private $base02 $base2 - set -x color_initial_segment_su $base02 $green --bold - set -x color_initial_segment_jobs $base02 $blue --bold - - set -x color_path $base2 $base00 - set -x color_path_basename $base2 $base01 --bold - set -x color_path_nowrite $base2 $orange - set -x color_path_nowrite_basename $base2 $orange --bold - - set -x color_repo $green $colorfg - set -x color_repo_work_tree $base2 $colorfg --bold - set -x color_repo_dirty $red $colorfg - set -x color_repo_staged $yellow $colorfg - - set -x color_vi_mode_default $blue $colorfg --bold - set -x color_vi_mode_insert $green $colorfg --bold - set -x color_vi_mode_visual $yellow $colorfg --bold - - set -x color_vagrant $violet $colorfg --bold - set -x color_k8s $green $colorfg --bold - set -x color_aws_vault $violet $base3 --bold - set -x color_aws_vault_expired $violet $orange --bold - set -x color_username $base2 $blue --bold - set -x color_hostname $base2 $blue - set -x color_screen $green $colorfg --bold - set -x color_rvm $red $colorfg --bold - set -x color_node $green $colorfg --bold - set -x color_virtualfish $cyan $colorfg --bold - set -x color_virtualgo $cyan $colorfg --bold - set -x color_desk $cyan $colorfg --bold - set -x color_nix $cyan $colorfg --bold - - case 'solarized' 'solarized-dark' - set -l base03 002b36 - set -l base02 073642 - set -l base01 586e75 - set -l base00 657b83 - set -l base0 839496 - set -l base1 93a1a1 - set -l base2 eee8d5 - set -l base3 fdf6e3 - set -l yellow b58900 - set -l orange cb4b16 - set -l red dc322f - set -l magenta d33682 - set -l violet 6c71c4 - set -l blue 268bd2 - set -l cyan 2aa198 - set -l green 859900 - - set colorfg $base3 - - set -x color_initial_segment_exit $base2 $red --bold - set -x color_initial_segment_private $base2 $base02 - set -x color_initial_segment_su $base2 $green --bold - set -x color_initial_segment_jobs $base2 $blue --bold - - set -x color_path $base02 $base0 - set -x color_path_basename $base02 $base1 --bold - set -x color_path_nowrite $base02 $orange - set -x color_path_nowrite_basename $base02 $orange --bold - - set -x color_repo $green $colorfg - set -x color_repo_work_tree $base02 $colorfg --bold - set -x color_repo_dirty $red $colorfg - set -x color_repo_staged $yellow $colorfg - - set -x color_vi_mode_default $blue $colorfg --bold - set -x color_vi_mode_insert $green $colorfg --bold - set -x color_vi_mode_visual $yellow $colorfg --bold - - set -x color_vagrant $violet $colorfg --bold - set -x color_k8s $green $colorfg --bold - set -x color_aws_vault $violet $base3 --bold - set -x color_aws_vault_expired $violet $orange --bold - set -x color_username $base02 $blue --bold - set -x color_hostname $base02 $blue - set -x color_screen $green $colorfg --bold - set -x color_rvm $red $colorfg --bold - set -x color_node $green $colorfg --bold - set -x color_virtualfish $cyan $colorfg --bold - set -x color_virtualgo $cyan $colorfg --bold - set -x color_desk $cyan $colorfg --bold - set -x color_nix $cyan $colorfg --bold - - case 'light' - # light medium dark - # ------ ------ ------ - set -l red cc9999 ce000f 660000 - set -l green addc10 189303 0c4801 - set -l blue 48b4fb 005faf 255e87 - set -l orange f6b117 unused 3a2a03 - set -l brown bf5e00 803f00 4d2600 - set -l grey cccccc 999999 333333 - set -l white ffffff - set -l black 000000 - set -l ruby_red af0000 - - set -x color_initial_segment_exit $grey[3] $red[2] --bold - set -x color_initial_segment_private $grey[3] $grey[1] - set -x color_initial_segment_su $grey[3] $green[2] --bold - set -x color_initial_segment_jobs $grey[3] $blue[3] --bold - - set -x color_path $grey[1] $grey[2] - set -x color_path_basename $grey[1] $grey[3] --bold - set -x color_path_nowrite $red[1] $red[3] - set -x color_path_nowrite_basename $red[1] $red[3] --bold - - set -x color_repo $green[1] $green[3] - set -x color_repo_work_tree $grey[1] $white --bold - set -x color_repo_dirty $red[2] $white - set -x color_repo_staged $orange[1] $orange[3] - - set -x color_vi_mode_default $grey[2] $grey[3] --bold - set -x color_vi_mode_insert $green[2] $grey[3] --bold - set -x color_vi_mode_visual $orange[1] $orange[3] --bold - - set -x color_vagrant $blue[1] $white --bold - set -x color_k8s $green[1] $colorfg --bold - set -x color_aws_vault $blue[3] $orange[1] --bold - set -x color_aws_vault_expired $blue[3] $red[3] --bold - set -x color_username $grey[1] $blue[3] --bold - set -x color_hostname $grey[1] $blue[3] - set -x color_screen $green[1] $colorfg --bold - set -x color_rvm $ruby_red $grey[1] --bold - set -x color_node $green $grey[1] --bold - set -x color_virtualfish $blue[2] $grey[1] --bold - set -x color_virtualgo $blue[2] $grey[1] --bold - set -x color_desk $blue[2] $grey[1] --bold - set -x color_nix $blue[2] $grey[1] --bold - - case 'gruvbox' - # light medium dark darkest - # ------ ------ ------ ------- - set -l red fb4934 cc241d - set -l green b8bb26 98971a - set -l yellow fabd2f d79921 - set -l aqua 8ec07c 689d6a - set -l blue 83a598 458588 - set -l grey cccccc 999999 333333 - set -l fg fbf1c7 ebdbb2 d5c4a1 a89984 - set -l bg 504945 282828 - - set -x color_initial_segment_exit $fg[1] $red[2] --bold - set -x color_initial_segment_private $fg[1] $bg[1] - set -x color_initial_segment_su $fg[1] $green[2] --bold - set -x color_initial_segment_jobs $fg[1] $aqua[2] --bold - - set -x color_path $bg[1] $fg[2] - set -x color_path_basename $bg[1] $fg[2] --bold - set -x color_path_nowrite $red[1] $fg[2] - set -x color_path_nowrite_basename $red[1] $fg[2] --bold - - set -x color_repo $green[2] $bg[1] - set -x color_repo_work_tree $bg[1] $fg[2] --bold - set -x color_repo_dirty $red[2] $fg[2] - set -x color_repo_staged $yellow[1] $bg[1] - - set -x color_vi_mode_default $fg[4] $bg[2] --bold - set -x color_vi_mode_insert $blue[1] $bg[2] --bold - set -x color_vi_mode_visual $yellow[1] $bg[2] --bold - - set -x color_vagrant $blue[2] $fg[2] --bold - set -x color_k8s $green[2] $fg[2] --bold - set -x color_aws_vault $blue[2] $yellow[1] --bold - set -x color_aws_vault_expired $blue[2] $red[1] --bold - set -x color_username $fg[3] $blue[2] --bold - set -x color_hostname $fg[3] $blue[2] - set -x color_screen $green[1] $fg[2] --bold - set -x color_rvm $red[2] $fg[2] --bold - set -x color_node $green[1] $fg[2] --bold - set -x color_virtualfish $blue[2] $fg[2] --bold - set -x color_virtualgo $blue[2] $fg[2] --bold - set -x color_desk $blue[2] $fg[2] --bold - set -x color_nix $blue[2] $fg[2] --bold - - case 'gruvbox-light' - # light medium dark darkest - # ------ ------ ------ ------- - set -l red 9d0006 cc241d - set -l green 79740e 98971a - set -l yellow b57614 d79921 - set -l aqua 427b58 689d6a - set -l blue 076678 458588 - set -l grey a89984 928374 - set -l orange af3a03 d65d0e - set -l fg 282828 3c3836 504945 7c6f64 - set -l bg d5c4a1 fbf1c7 - - set -x color_initial_segment_exit $red[1] $bg[2] --bold - set -x color_initial_segment_su $fg[1] $green[2] --bold - set -x color_initial_segment_jobs $fg[1] $aqua[2] --bold - - set -x color_path $bg[1] $fg[2] - set -x color_path_basename $bg[1] $fg[2] --bold - set -x color_path_nowrite $red[1] $bg[2] - set -x color_path_nowrite_basename $red[1] $bg[2] --bold - - set -x color_repo $green[2] $fg[1] - set -x color_repo_work_tree $bg[1] $fg[2] --bold - set -x color_repo_dirty $orange[2] $bg[2] - set -x color_repo_staged $yellow[1] $bg[1] - - set -x color_vi_mode_default $fg[4] $bg[2] --bold - set -x color_vi_mode_insert $blue[1] $bg[2] --bold - set -x color_vi_mode_visual $yellow[1] $bg[2] --bold - - set -x color_vagrant $blue[2] $fg[2] --bold - set -x color_k8s $green[2] $fg[2] --bold - set -x color_username $fg[3] $blue[2] --bold - set -x color_hostname $fg[3] $blue[2] - set -x color_screen $green[2] $fg[2] --bold - set -x color_rvm $red[2] $bg[2] --bold - set -x color_nvm $green[1] $fg[2] --bold - set -x color_virtualfish $blue[2] $fg[2] --bold - set -x color_virtualgo $blue[2] $fg[2] --bold - set -x color_desk $blue[2] $fg[2] --bold - set -x color_nix $blue[2] $fg[2] --bold - - case 'dracula' # https://draculatheme.com - set -l bg 282a36 - set -l current_line 44475a - set -l selection 44475a - set -l fg f8f8f2 - set -l comment 6272a4 - set -l cyan 8be9fd - set -l green 50fa7b - set -l orange ffb86c - set -l pink ff79c6 - set -l purple bd93f9 - set -l red ff5555 - set -l yellow f1fa8c - - set -x color_initial_segment_exit $fg $red --bold - set -x color_initial_segment_private $fg $selection - set -x color_initial_segment_su $fg $purple --bold - set -x color_initial_segment_jobs $fg $comment --bold - - set -x color_path $selection $fg - set -x color_path_basename $selection $fg --bold - set -x color_path_nowrite $selection $red - set -x color_path_nowrite_basename $selection $red --bold - - set -x color_repo $green $bg - set -x color_repo_work_tree $selection $fg --bold - set -x color_repo_dirty $red $bg - set -x color_repo_staged $yellow $bg - - set -x color_vi_mode_default $bg $yellow --bold - set -x color_vi_mode_insert $green $bg --bold - set -x color_vi_mode_visual $orange $bg --bold - - set -x color_vagrant $pink $bg --bold - set -x color_k8s $purple $bg --bold - set -x color_aws_vault $comment $yellow --bold - set -x color_aws_vault_expired $comment $red --bold - set -x color_username $selection $cyan --bold - set -x color_hostname $selection $cyan - set -x color_screen $green $bg --bold - set -x color_rvm $red $bg --bold - set -x color_node $green $bg --bold - set -x color_virtualfish $comment $bg --bold - set -x color_virtualgo $cyan $bg --bold - set -x color_desk $comment $bg --bold - set -x color_nix $cyan $bg --bold - - case 'nord' - set -l base00 2E3440 - set -l base01 3B4252 - set -l base02 434C5E - set -l base03 4C566A - set -l base04 D8DEE9 - set -l base05 E5E9F0 - set -l base06 ECEFF4 - set -l base07 8FBCBB - set -l base08 88C0D0 - set -l base09 81A1C1 - set -l base0A 5E81AC - set -l base0B BF616A - set -l base0C D08770 - set -l base0D EBCB8B - set -l base0E A3BE8C - set -l base0F B48EAD - - set -l colorfg $base00 - - set -x color_initial_segment_exit $base05 $base0B --bold - set -x color_initial_segment_private $base05 $base02 - set -x color_initial_segment_su $base05 $base0E --bold - set -x color_initial_segment_jobs $base05 $base0C --bold - - set -x color_path $base02 $base05 - set -x color_path_basename $base02 $base06 --bold - set -x color_path_nowrite $base02 $base08 - set -x color_path_nowrite_basename $base02 $base08 --bold - - set -x color_repo $base0E $colorfg - set -x color_repo_work_tree $base02 $colorfg --bold - set -x color_repo_dirty $base0B $colorfg - set -x color_repo_staged $base0D $colorfg - - set -x color_vi_mode_default $base08 $colorfg --bold - set -x color_vi_mode_insert $base06 $colorfg --bold - set -x color_vi_mode_visual $base07 $colorfg --bold - - set -x color_vagrant $base02 $colorfg --bold - set -x color_k8s $base02 $colorfg --bold - set -x color_aws_vault $base0A $base0D --bold - set -x color_aws_vault_expired $base0A $base0B --bold - set -x color_username $base02 $base0D --bold - set -x color_hostname $base02 $base0D - set -x color_screen $base02 $colorfg --bold - set -x color_rvm $base09 $colorfg --bold - set -x color_node $base09 $colorfg --bold - set -x color_virtualfish $base09 $colorfg --bold - set -x color_virtualgo $base09 $colorfg --bold - set -x color_desk $base09 $colorfg --bold - - case 'catppuccin-latte' - set -l rosewater dc8a78 - set -l flamingo dd7878 - set -l pink ea76cb - set -l mauve 8839ef - set -l red d20f39 - set -l maroon e64553 - set -l peach fe640b - set -l yellow df8e1d - set -l green 40a02b - set -l teal 179299 - set -l sky 04a5e5 - set -l sapphire 209fb5 - set -l blue 1e66f5 - set -l lavender 7287fd - set -l text 4c4f69 - set -l subtext1 5c5f77 - set -l subtext0 6c6f85 - set -l overlay2 7c7f93 - set -l overlay1 8c8fa1 - set -l overlay0 9ca0b0 - set -l surface2 acb0be - set -l surface1 bcc0cc - set -l surface0 ccd0da - set -l base eff1f5 - set -l mantle e6e9ef - set -l crust dce0e8 - - set -x color_initial_segment_exit $surface2 $red --bold - set -x color_initial_segment_private $surface2 $flamingo - set -x color_initial_segment_su $surface2 $green --bold - set -x color_initial_segment_jobs $surface2 $peach --bold - - set -x color_path $surface0 $text - set -x color_path_basename $surface0 $text --bold - set -x color_path_nowrite $surface0 $mauve - set -x color_path_nowrite_basename $surface0 $mauve --bold - - set -x color_repo $green $mantle - set -x color_repo_work_tree $surface2 $mantle --bold - set -x color_repo_dirty $red $mantle - set -x color_repo_staged $yellow $mantle - - set -x color_vi_mode_default $sky $mantle --bold - set -x color_vi_mode_insert $green $mantle --bold - set -x color_vi_mode_visual $mauve $mantle --bold - - set -x color_vagrant $surface2 $text --bold - set -x color_k8s $surface2 $text --bold - set -x color_aws_vault $yellow $mantle --bold - set -x color_aws_vault_expired $red $mantle --bold - set -x color_username $surface2 $yellow --bold - set -x color_hostname $surface2 $yellow - set -x color_screen $green $mantle --bold - set -x color_rvm $red $mantle --bold - set -x color_node $green $mantle --bold - set -x color_virtualfish $peach $mantle --bold - set -x color_virtualgo $sky $mantle --bold - set -x color_desk $peach $mantle --bold - set -x color_nix $sky $mantle --bold - - case 'catppuccin-frappe' - set -l rosewater f2d5cf - set -l flamingo eebebe - set -l pink f4b8e4 - set -l mauve ca9ee6 - set -l red e78284 - set -l maroon ea999c - set -l peach ef9f76 - set -l yellow e5c890 - set -l green a6d189 - set -l teal 81c8be - set -l sky 99d1db - set -l sapphire 85c1dc - set -l blue 8caaee - set -l lavender babbf1 - set -l text c6d0f5 - set -l subtext1 b5bfe2 - set -l subtext0 a5adce - set -l overlay2 949cbb - set -l overlay1 838ba7 - set -l overlay0 737994 - set -l surface2 626880 - set -l surface1 51576d - set -l surface0 414559 - set -l base 303446 - set -l mantle 292c3c - set -l crust 232634 - - set -x color_initial_segment_exit $surface2 $red --bold - set -x color_initial_segment_private $surface2 $flamingo - set -x color_initial_segment_su $surface2 $green --bold - set -x color_initial_segment_jobs $surface2 $peach --bold - - set -x color_path $surface0 $text - set -x color_path_basename $surface0 $text --bold - set -x color_path_nowrite $surface0 $mauve - set -x color_path_nowrite_basename $surface0 $mauve --bold - - set -x color_repo $green $mantle - set -x color_repo_work_tree $surface2 $mantle --bold - set -x color_repo_dirty $red $mantle - set -x color_repo_staged $yellow $mantle - - set -x color_vi_mode_default $sky $mantle --bold - set -x color_vi_mode_insert $green $mantle --bold - set -x color_vi_mode_visual $mauve $mantle --bold - - set -x color_vagrant $surface2 $text --bold - set -x color_k8s $surface2 $text --bold - set -x color_aws_vault $yellow $mantle --bold - set -x color_aws_vault_expired $red $mantle --bold - set -x color_username $surface2 $yellow --bold - set -x color_hostname $surface2 $yellow - set -x color_screen $green $mantle --bold - set -x color_rvm $red $mantle --bold - set -x color_node $green $mantle --bold - set -x color_virtualfish $peach $mantle --bold - set -x color_virtualgo $sky $mantle --bold - set -x color_desk $peach $mantle --bold - set -x color_nix $sky $mantle --bold - - case 'catppuccin-macchiato' - set -l rosewater f4dbd6 - set -l flamingo f0c6c6 - set -l pink f5bde6 - set -l mauve c6a0f6 - set -l red ed8796 - set -l maroon ee99a0 - set -l peach f5a97f - set -l yellow eed49f - set -l green a6da95 - set -l teal 8bd5ca - set -l sky 91d7e3 - set -l sapphire 7dc4e4 - set -l blue 8aadf4 - set -l lavender b7bdf8 - set -l text cad3f5 - set -l subtext1 b8c0e0 - set -l subtext0 a5adcb - set -l overlay2 939ab7 - set -l overlay1 8087a2 - set -l overlay0 6e738d - set -l surface2 5b6078 - set -l surface1 494d64 - set -l surface0 363a4f - set -l base 24273a - set -l mantle 1e2030 - set -l crust 181926 - - set -x color_initial_segment_exit $surface2 $red --bold - set -x color_initial_segment_private $surface2 $flamingo - set -x color_initial_segment_su $surface2 $green --bold - set -x color_initial_segment_jobs $surface2 $peach --bold - - set -x color_path $surface0 $text - set -x color_path_basename $surface0 $text --bold - set -x color_path_nowrite $surface0 $mauve - set -x color_path_nowrite_basename $surface0 $mauve --bold - - set -x color_repo $green $mantle - set -x color_repo_work_tree $surface2 $mantle --bold - set -x color_repo_dirty $red $mantle - set -x color_repo_staged $yellow $mantle - - set -x color_vi_mode_default $sky $mantle --bold - set -x color_vi_mode_insert $green $mantle --bold - set -x color_vi_mode_visual $mauve $mantle --bold - - set -x color_vagrant $surface2 $text --bold - set -x color_k8s $surface2 $text --bold - set -x color_aws_vault $yellow $mantle --bold - set -x color_aws_vault_expired $red $mantle --bold - set -x color_username $surface2 $yellow --bold - set -x color_hostname $surface2 $yellow - set -x color_screen $green $mantle --bold - set -x color_rvm $red $mantle --bold - set -x color_node $green $mantle --bold - set -x color_virtualfish $peach $mantle --bold - set -x color_virtualgo $sky $mantle --bold - set -x color_desk $peach $mantle --bold - set -x color_nix $sky $mantle --bold - - case 'catppuccin-mocha' - set -l rosewater f5e0dc - set -l flamingo f2cdcd - set -l pink f5c2e7 - set -l mauve cba6f7 - set -l red f38ba8 - set -l maroon eba0ac - set -l peach fab387 - set -l yellow f9e2af - set -l green a6e3a1 - set -l teal 94e2d5 - set -l sky 89dceb - set -l sapphire 74c7ec - set -l blue 89b4fa - set -l lavender b4befe - set -l text cdd6f4 - set -l subtext1 bac2de - set -l subtext0 a6adc8 - set -l overlay2 9399b2 - set -l overlay1 7f849c - set -l overlay0 6c7086 - set -l surface2 585b70 - set -l surface1 45475a - set -l surface0 313244 - set -l base 1e1e2e - set -l mantle 181825 - set -l crust 11111b - - set -x color_initial_segment_exit $surface2 $red --bold - set -x color_initial_segment_private $surface2 $flamingo - set -x color_initial_segment_su $surface2 $green --bold - set -x color_initial_segment_jobs $surface2 $peach --bold - - set -x color_path $surface0 $text - set -x color_path_basename $surface0 $text --bold - set -x color_path_nowrite $surface0 $mauve - set -x color_path_nowrite_basename $surface0 $mauve --bold - - set -x color_repo $green $mantle - set -x color_repo_work_tree $surface2 $mantle --bold - set -x color_repo_dirty $red $mantle - set -x color_repo_staged $yellow $mantle - - set -x color_vi_mode_default $sky $mantle --bold - set -x color_vi_mode_insert $green $mantle --bold - set -x color_vi_mode_visual $mauve $mantle --bold - - set -x color_vagrant $surface2 $text --bold - set -x color_k8s $surface2 $text --bold - set -x color_aws_vault $yellow $mantle --bold - set -x color_aws_vault_expired $red $mantle --bold - set -x color_username $surface2 $yellow --bold - set -x color_hostname $surface2 $yellow - set -x color_screen $green $mantle --bold - set -x color_rvm $red $mantle --bold - set -x color_node $green $mantle --bold - set -x color_virtualfish $peach $mantle --bold - set -x color_virtualgo $sky $mantle --bold - set -x color_desk $peach $mantle --bold - set -x color_nix $sky $mantle --bold - - case 'jellybeans' # https://github.com/nanotech/jellybeans.vim - set -l bg 151515 - set -l darker_grey 1c1c1c - set -l dark_grey 262626 - set -l grey 888888 - set -l blue_grey a0a8b0 - set -l light_grey d8dee9 - set -l white ffffff - set -l dark_red 902020 - set -l red cf6a4c - set -l red_orange ffb964 - set -l bright_orange fad07a - set -l pale_gold dad085 - set -l pink f0a0c0 - set -l lilac c6b6ee - set -l dark_blue 2b5b77 - set -l deep_blue 0d61ac - set -l blue 8197bf - set -l bright_blue 7697d6 - set -l cyan 8fbfdc - set -l blue_green 668799 - set -l green 799d6a - set -l bright_green 70b950 - set -l brighter_green 65c254 - set -l light_green 99ad6a - set -l dark_green 556633 - - set -x color_initial_segment_exit $dark_red $white --bold - set -x color_initial_segment_private $light_grey $dark_grey --bold - set -x color_initial_segment_su $red_orange $darker_grey --bold - set -x color_initial_segment_jobs $lilac $darker_grey --bold - - set -x color_path $dark_grey $light_grey - set -x color_path_basename $dark_grey $light_grey --bold - set -x color_path_nowrite $dark_grey $red_orange - set -x color_path_nowrite_basename $dark_grey $red_orange --bold - - set -x color_repo $light_green $darker_grey - set -x color_repo_work_tree $dark_grey $light_grey --bold - set -x color_repo_dirty $red $darker_grey - set -x color_repo_staged $pale_gold $darker_grey - - set -x color_vi_mode_default $bright_blue $darker_grey --bold - set -x color_vi_mode_insert $lilac $darker_grey --bold - set -x color_vi_mode_visual $cyan $darker_grey --bold - - set -x color_username $dark_grey $blue_grey --bold - set -x color_hostname $dark_grey $blue_grey - set -x color_screen $bright_green $darker_grey --bold - - set -x color_vagrant $lilac $darker_grey --bold - set -x color_k8s $pale_gold $darker_grey --bold - set -x color_aws_vault $deep_blue $pale_gold --bold - set -x color_aws_vault_expired $deep_blue $red --bold - set -x color_rvm $pink $darker_grey --bold - set -x color_nvm $bright_green $darker_grey --bold - set -x color_virtualfish $cyan $darker_grey --bold - set -x color_virtualgo $light_green $darker_grey --bold - set -x color_desk $light_grey $darker_grey --bold - set -x color_nix $bright_blue $darker_grey --bold - - case 'darcula' - # light medium dark darkest - # ------ ------ ------ ------ - set -l grey 808080 616161 595959 424242 - set -l red FF4050 F0524F B82421 772E2C - set -l green 4FC414 5C962C 458500 39511F - set -l yellow E5BF00 A68A0D A87B00 5C4F17 - set -l blue 1FB0FF 3993D4 1778BD 245980 - set -l white F9F9F4 B7C3D0 - - set -x color_initial_segment_exit $white[2] $red[3] --bold - set -x color_initial_segment_private $white[2] $grey[4] - set -x color_initial_segment_su $white[2] $green[3] --bold - set -x color_initial_segment_jobs $white[2] $blue[3] --bold - - set -x color_path $grey[4] $white[2] - set -x color_path_basename $grey[4] $white[1] --bold - set -x color_path_nowrite $grey[4] $red[2] - set -x color_path_nowrite_basename $grey[4] $red[1] --bold - - set -x color_repo $green[3] $white[4] - set -x color_repo_work_tree $grey[4] $grey[4] --bold - set -x color_repo_dirty $red[3] $grey[4] - set -x color_repo_staged $yellow[3] $grey[4] - - set -x color_vi_mode_default $grey[4] $yellow[2] --bold - set -x color_vi_mode_insert $green[2] $grey[4] --bold - set -x color_vi_mode_visual $yellow[2] $grey[4] --bold - - set -x color_vagrant $blue[2] $green[1] --bold - set -x color_k8s $green[2] $grey[4] --bold - set -x color_aws_vault $blue[2] $grey[4] --bold - set -x color_aws_vault_expired $blue[2] $red[1] --bold - set -x color_username $grey[4] $blue[2] --bold - set -x color_hostname $grey[4] $blue[1] - set -x color_screen $green[3] $white[2] --bold - set -x color_rvm $red[2] $grey[4] --bold - set -x color_node $green[3] $white[2] --bold - set -x color_virtualfish $blue[2] $grey[4] --bold - set -x color_virtualgo $blue[2] $grey[4] --bold - set -x color_desk $blue[2] $grey[4] --bold - set -x color_nix $blue[2] $grey[4] --bold - - case '*' # default dark theme - # light medium dark - # ------ ------ ------ - set -l red cc9999 ce000f 660000 - set -l green addc10 189303 0c4801 - set -l blue 48b4fb 005faf 255e87 - set -l orange f6b117 unused 3a2a03 - set -l brown bf5e00 803f00 4d2600 - set -l grey cccccc 999999 333333 - set -l white ffffff - set -l black 000000 - set -l ruby_red af0000 - set -l go_blue 00d7d7 - - set -x color_initial_segment_exit $white $red[2] --bold - set -x color_initial_segment_private $white $grey[3] - set -x color_initial_segment_su $white $green[2] --bold - set -x color_initial_segment_jobs $white $blue[3] --bold - - set -x color_path $grey[3] $grey[2] - set -x color_path_basename $grey[3] $white --bold - set -x color_path_nowrite $red[3] $red[1] - set -x color_path_nowrite_basename $red[3] $red[1] --bold - - set -x color_repo $green[1] $green[3] - set -x color_repo_work_tree $grey[3] $white --bold - set -x color_repo_dirty $red[2] $white - set -x color_repo_staged $orange[1] $orange[3] - - set -x color_vi_mode_default $grey[2] $grey[3] --bold - set -x color_vi_mode_insert $green[2] $grey[3] --bold - set -x color_vi_mode_visual $orange[1] $orange[3] --bold - - set -x color_vagrant $blue[1] $white --bold - set -x color_k8s $green[2] $white --bold - set -x color_aws_vault $blue[3] $orange[1] --bold - set -x color_aws_vault_expired $blue[3] $red[3] --bold - set -x color_username $grey[1] $blue[3] --bold - set -x color_hostname $grey[1] $blue[3] - set -x color_screen $green[1] $white --bold - set -x color_rvm $ruby_red $grey[1] --bold - set -x color_node $green[1] $white --bold - set -x color_virtualfish $blue[2] $grey[1] --bold - set -x color_virtualgo $go_blue $black --bold - set -x color_desk $blue[2] $grey[1] --bold - set -x color_nix $blue[2] $grey[1] --bold - end -end diff --git a/fish/.config/fish/functions/__bobthefish_display_colors.fish b/fish/.config/fish/functions/__bobthefish_display_colors.fish deleted file mode 100644 index 210a803..0000000 --- a/fish/.config/fish/functions/__bobthefish_display_colors.fish +++ /dev/null @@ -1,3 +0,0 @@ -function __bobthefish_display_colors -d 'Print example prompts using the current color scheme' - bobthefish_display_colors -end diff --git a/fish/.config/fish/functions/__fish_colors.fish b/fish/.config/fish/functions/__fish_colors.fish new file mode 100644 index 0000000..38e3464 --- /dev/null +++ b/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 diff --git a/fish/.config/fish/functions/__bobthefish_glyphs.fish b/fish/.config/fish/functions/__fish_glyphs.fish similarity index 96% rename from fish/.config/fish/functions/__bobthefish_glyphs.fish rename to fish/.config/fish/functions/__fish_glyphs.fish index 1adb236..42a69f0 100644 --- a/fish/.config/fish/functions/__bobthefish_glyphs.fish +++ b/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 diff --git a/fish/.config/fish/functions/bobthefish_display_colors.fish b/fish/.config/fish/functions/bobthefish_display_colors.fish index 39c025f..b33ed9d 100644 --- a/fish/.config/fish/functions/bobthefish_display_colors.fish +++ b/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 diff --git a/fish/.config/fish/functions/fish_mode_prompt.fish b/fish/.config/fish/functions/fish_mode_prompt.fish index e4b38e5..84b00f8 100644 --- a/fish/.config/fish/functions/fish_mode_prompt.fish +++ b/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... diff --git a/fish/.config/fish/functions/fish_prompt.fish b/fish/.config/fish/functions/fish_prompt.fish index 175f7b6..5c004bb 100644 --- a/fish/.config/fish/functions/fish_prompt.fish +++ b/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 diff --git a/fish/.config/fish/functions/fish_title.fish b/fish/.config/fish/functions/fish_title.fish index 91793c2..1c8b3de 100644 --- a/fish/.config/fish/functions/fish_title.fish +++ b/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 diff --git a/fish/.config/fish/functions/icat.fish b/fish/.config/fish/functions/icat.fish new file mode 100644 index 0000000..c3b6c12 --- /dev/null +++ b/fish/.config/fish/functions/icat.fish @@ -0,0 +1,3 @@ +function icat --description 'alias icat kitten icat' + kitten icat $argv +end diff --git a/fish/.config/fish/functions/ls.fish b/fish/.config/fish/functions/ls.fish deleted file mode 100644 index 368baf6..0000000 --- a/fish/.config/fish/functions/ls.fish +++ /dev/null @@ -1,3 +0,0 @@ -function ls --wraps=lsd --description 'alias ls lsd' - lsd $argv -end diff --git a/fish/.config/fish/functions/sudo_rep.fish b/fish/.config/fish/functions/re-sudo.fish similarity index 72% rename from fish/.config/fish/functions/sudo_rep.fish rename to fish/.config/fish/functions/re-sudo.fish index 9e16a23..c42b7f3 100644 --- a/fish/.config/fish/functions/sudo_rep.fish +++ b/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' diff --git a/fish/.config/fish/functions/vim.fish b/fish/.config/fish/functions/vim.fish deleted file mode 100644 index badff72..0000000 --- a/fish/.config/fish/functions/vim.fish +++ /dev/null @@ -1,3 +0,0 @@ -function vim --wraps=nvim --description 'alias vim nvim' - nvim $argv -end diff --git a/kitty/.config/kitty/base.conf b/kitty/.config/kitty/base.conf index 4c5ff36..e79d97f 100644 --- a/kitty/.config/kitty/base.conf +++ b/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 diff --git a/kitty/.config/kitty/current-theme.conf b/kitty/.config/kitty/current-theme.conf index 05564a4..d3075c0 100644 --- a/kitty/.config/kitty/current-theme.conf +++ b/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