Skip to content

Commit

Permalink
fix fzf/fish/gruvbox interaction (WHY?)
Browse files Browse the repository at this point in the history
  • Loading branch information
qbedard committed Jan 18, 2020
1 parent 1ec9f2a commit 1ca9af2
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 9 deletions.
1 change: 1 addition & 0 deletions kitty.conf
Original file line number Diff line number Diff line change
Expand Up @@ -626,6 +626,7 @@ clipboard_control no-append write-clipboard write-primary
#: one running on a remote server via SSH can read your clipboard.

# term xterm-kitty
term xterm-256color

#: The value of the TERM environment variable to set. Changing this
#: can break many terminal programs, only change it if you know what
Expand Down
14 changes: 9 additions & 5 deletions shell/fish/config.fish
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,6 @@
# curl -L https://get.oh-my.fish | fish
# end

source "$HOME/.dotfiles/shell/fish/gruvbox_colors.fish"
# gruvbox_colors

set theme_color_scheme gruvbox
set -g theme_nerd_fonts yes
set -g theme_date_format "+%a %b %d %l:%M%p"
Expand All @@ -29,8 +26,6 @@ export PATH="$HOME/Library/Python/3.7/bin:$PATH"
export PATH="$HOME/.poetry/bin:$PATH"

# ----- Aliases ----- #
alias tmux "env TERM=tmux-256color tmux"

# TODO: Test these
alias e "nvim"
alias v "nvim"
Expand Down Expand Up @@ -151,3 +146,12 @@ function colortest
printf "\n";
}'
end

if status is-interactive
and not set -q TMUX
# TODO: Find out why the hell this borks fzf when not inside this conditional
bash "$HOME/.local/share/nvim/site/plugged/gruvbox/gruvbox_256palette.sh"
# attach to session "main" if it exists, otherwise create it
# TODO: Attach only if none attached
exec tmux new-session -A -s main
end
9 changes: 5 additions & 4 deletions tmux.conf
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,11 @@ set-option -g repeat-time 500
# Mouse
set-option -g mouse on

# Italics
# set -g default-terminal 'tmux-256color'
set -g default-terminal 'screen-256color'
set -as terminal-overrides ',xterm*:Tc:sitm=\E[3m'
# Color/Italics
set -g default-terminal 'tmux-256color'
set -as terminal-overrides ',xterm*:Tc'
# set -g default-terminal 'screen-256color'
# set -as terminal-overrides ',xterm*:Tc:sitm=\E[3m'

# -------------------------------------------------------------------
# Window Options
Expand Down

0 comments on commit 1ca9af2

Please sign in to comment.