Fix some color issues and inconsistencies

This commit is contained in:
Daniel Flanagan 2023-04-16 02:17:40 -05:00
parent 8524915c77
commit 175713f08a
Signed by: lytedev
GPG key ID: 5B2020A0F9921EF4
5 changed files with 48 additions and 33 deletions

View file

@ -34,7 +34,7 @@ D = "kill_to_line_end"
"C-h" = "jump_view_left"
"C-l" = "jump_view_right"
"L" = "repeat_last_motion"
space = { q = ":reflow 80", Q = ":reflow 120", v = ":run-shell-command fish -c 'env > /tmp/env'" }
space = { q = ":reflow 80", Q = ":reflow 120", v = ":run-shell-command fish -c 'env > /tmp/env'", J = ":bp", K = ":bn" }
[keys.select]
space = { q = ":reflow 80", Q = ":reflow 120" }

View file

@ -64,8 +64,8 @@
"ui.cursor.primary" = { fg = "white", modifiers = ["reversed"] }
"ui.cursor.match" = { fg = "gray", bg = "white", modifiers = ["reversed"] }
"ui.selection" = { bg = "black", fg = "white" }
"ui.selection.primary" = { bg = "black", fg = "white" }
"ui.selection" = { bg = "black" }
"ui.selection.primary" = { bg = "black" }
"ui.linenr" = { fg = "gray" }
"ui.linenr.selected" = { fg = "white" }
@ -83,3 +83,6 @@
diagnostic = { underline = { style = "curl" } }
"diagnostic.error" = { underline = { style = "curl", color = "red" } }
"ui.bufferline" = { fg = "gray", bg = "bg" }
"ui.bufferline.active" = { fg = "blue" }

View file

@ -41,18 +41,20 @@ map ctrl+shift+p>u kitten hints --type=url --program @
shell_integration disabled
enable_audio_bell no
enable_audio_bell yes
visual_bell_duration 0.25
visual_bell_color #333033
url_style single
strip_trailing_spaces smart
# open_url_modifiers ctrl
background #111111
foreground #f8f8f2
background #110811
foreground #f8f2f8
# black
color0 #111111
color0 #333033
# red
color1 #f92672
# green
@ -66,7 +68,7 @@ color5 #ae81ff
# cyan
color6 #a1efe4
# white
color7 #f8f8f2
color7 #f8f2f8
# TODO: where did these colors come from? donokai?
# color8 #75715e
@ -77,7 +79,7 @@ color7 #f8f8f2
# color13 #f5f4f1
# color14 #cc6633
# color15 #f9f8f5
# color18 #333333
color18 #333033
# # light theme
#

View file

@ -2,60 +2,75 @@ unbind C-b
set -g prefix C-s
bind s send-prefix
bind v split-window -h
bind b split-window
bind v split-window -h -c "#{pane_current_path}"
bind b split-window -c "#{pane_current_path}"
bind T source-file "$HOME/.tmux.conf" \; display-message "Reloaded $HOME/.tmux.conf"
# dump buffer contents to file
bind O display-message "#(tmux-save-buffer '#S')"
# TODO: dump buffer to file and open in EDITOR?
bind D attach-session -t . -c '#{pane_current_path}' \; display-message "Set session path to #{pane_current_path}"
# toggle status bar
bind H set -s status
# pane navigation
bind -n C-l select-pane -R
bind -n C-k select-pane -U
bind -n C-j select-pane -D
bind -n C-h select-pane -L
# tab creation
bind -n C-t new-window
bind Tab next-window
bind -n C-Tab next-window
bind -n C-S-Tab previous-window
bind s run "tmux split-window -l 12 'tmuxswitcher'"
bind M-l source-file "$XDG_CONFIG_HOME/tmux/layouts/dev.tmux"
# tab nav is the default p and n binds
# window switcher is the default w bind
# session switcher
bind s run "tmux split-window -l 12 'tmuxswitcher'"
set -g update-environment "WAYLAND_DISPLAY DISPLAY"
set -g mouse on
set -g escape-time 0
set -g monitor-activity on
set -g visual-bell on
set -g visual-bell both
set -g bell-action other
set -g mode-keys vi
set -g history-limit 1000000
set -g status on
set -g status-position bottom
set -g status-bg colour0
set -g status-fg colour8
set -g status-style "fg=colour8 bg=default"
# set -g status-bg default
# set -g status-fg colour8
set -g status-interval 5
set -g status-left-length 50
set -g window-status-style "fg=colour8 bg=colour7"
set -g window-status-current-style "fg=colour8 bg=colour7"
set -g window-status-format " #W "
set -g window-status-separator ""
set -g window-status-style "fg=colour8 bg=default"
set -g window-status-format "#W"
set -g window-status-separator " "
set -g window-status-activity-style "fg=colour7 bg=default"
set -g window-status-bell-style "fg=colour1 bg=default"
set -g window-status-current-style "fg=colour4 bg=default"
set -g window-status-current-format " #W "
set -g status-left "#h:#S "
set -g status-right ""
set -g status-left "#h:#S #W "
set -ag status-left "#(pwd | $XDG_CONFIG_HOME/lytedev-dotfiles/common/bin/glancepath) "
set -ag status-left "#(kubeline && printf ' ')"
# set -ag status-right "#(pwd | $XDG_CONFIG_HOME/lytedev-dotfiles/common/bin/glancepath) "
set -ag status-right "#(kubeline && printf ' ')"
set -g status-left-length 1000
# set -g status-right-length 280
# set -ag status-right "#{pane_current_command}"
set -g message-style "fg=colour7 bg=colour0"
set -g message-style "fg=colour7 bg=default"
set -g pane-active-border-style fg=blue
set -g pane-border-style fg=colour0
set -g clock-mode-colour colour8
set -g base-index 1
set -g pane-base-index 1
set -g window-status-current-format ""
set -g window-status-current-format "#W"
# present a menu of urls to open from the visible pane
# TODO: fuzzy search this

View file

@ -1,5 +0,0 @@
splitw -h -p 50
splitw -v -p 67
splitw -v -p 50
resize-pane -x 90
selectp -L