diff --git a/bash/.bashrc b/bash/.bashrc index 475c5d5..1ac0632 100644 --- a/bash/.bashrc +++ b/bash/.bashrc @@ -12,6 +12,7 @@ esac if ! command -v fish &>/dev/null; then # don't put duplicate lines or lines starting with space in the history. # See bash(1) for more options + # actually I'll probably not wanna do any history at all with atuin HISTCONTROL=ignoreboth # append to the history file, don't overwrite it @@ -119,7 +120,12 @@ if ! command -v fish &>/dev/null; then . "$HOME/.cargo/env" # impl Bash for FZF - export FZF_DEFAULT_OPTS='--tmux' + export FZF_DEFAULT_OPTS=" \ +--color=bg+:#313244,bg:#1E1E2E,spinner:#F5E0DC,hl:#F38BA8 \ +--color=fg:#CDD6F4,header:#F38BA8,info:#CBA6F7,pointer:#F5E0DC \ +--color=marker:#B4BEFE,fg+:#CDD6F4,prompt:#CBA6F7,hl+:#F38BA8 \ +--color=selected-bg:#45475A \ +--color=border:#6C7086,label:#CDD6F4" eval "$(fzf --bash)" # impl Bash for Autin diff --git a/fish/.config/fish/config.fish b/fish/.config/fish/config.fish index 6b84412..f83cbdc 100644 --- a/fish/.config/fish/config.fish +++ b/fish/.config/fish/config.fish @@ -12,7 +12,6 @@ fish_add_path "$HOME/.local/share/bob/nvim-bin" # --- Tool Initialization --- # Zoxide (replaces cd) -set -x FZF_DEFAULT_OPTS --tmux zoxide init --cmd cd fish | source # Autin (rip unencrypted .bash_history) diff --git a/fish/.config/fish/fish_variables b/fish/.config/fish/fish_variables index 16d225d..a978157 100644 --- a/fish/.config/fish/fish_variables +++ b/fish/.config/fish/fish_variables @@ -1,6 +1,6 @@ # This file contains fish universal variable definitions. # VERSION: 3.0 -SETUVAR --export FZF_DEFAULT_OPTS:\x2d\x2dcolor\x3dbg\x2b\x3a\x23313244\x2cbg\x3a\x231E1E2E\x2cspinner\x3a\x23F5E0DC\x2chl\x3a\x23F38BA8\x20\x2d\x2dcolor\x3dfg\x3a\x23CDD6F4\x2cheader\x3a\x23F38BA8\x2cinfo\x3a\x23CBA6F7\x2cpointer\x3a\x23F5E0DC\x20\x2d\x2dcolor\x3dmarker\x3a\x23B4BEFE\x2cfg\x2b\x3a\x23CDD6F4\x2cprompt\x3a\x23CBA6F7\x2chl\x2b\x3a\x23F38BA8\x20\x2d\x2dcolor\x3dselected\x2dbg\x3a\x2345475A\x20\x2d\x2dcolor\x3dborder\x3a\x236C7086\x2clabel\x3a\x23CDD6F4 # Catppuccin color scheme +SETUVAR --export FZF_DEFAULT_OPTS:\x2d\x2dcolor\x3dbg\x2b\x3a\x23313244\x2cbg\x3a\x231E1E2E\x2cspinner\x3a\x23F5E0DC\x2chl\x3a\x23F38BA8\x20\x2d\x2dcolor\x3dfg\x3a\x23CDD6F4\x2cheader\x3a\x23F38BA8\x2cinfo\x3a\x23CBA6F7\x2cpointer\x3a\x23F5E0DC\x20\x2d\x2dcolor\x3dmarker\x3a\x23B4BEFE\x2cfg\x2b\x3a\x23CDD6F4\x2cprompt\x3a\x23CBA6F7\x2chl\x2b\x3a\x23F38BA8\x20\x2d\x2dcolor\x3dselected\x2dbg\x3a\x2345475A\x20\x2d\x2dcolor\x3dborder\x3a\x236C7086\x2clabel\x3a\x23CDD6F4\x20\x2d\x2dtmux # Catppuccin and tmux SETUVAR __fish_initialized:3800 SETUVAR fish_color_autosuggestion:6c7086 SETUVAR fish_color_cancel:f38ba8