parent
c36ae93078
commit
31f549abc5
2 changed files with 109 additions and 116 deletions
|
|
@ -66,18 +66,6 @@ return {
|
|||
end
|
||||
end
|
||||
|
||||
local trouble = require("trouble")
|
||||
local symbols = trouble.statusline({
|
||||
mode = "lsp_document_symbols",
|
||||
groups = {},
|
||||
title = false,
|
||||
filter = { range = true },
|
||||
format = "{kind_icon}{symbol.name:Normal}",
|
||||
-- The following line is needed to fix the background color
|
||||
-- Set it to the lualine section you want to use
|
||||
hl_group = "lualine_c_normal",
|
||||
})
|
||||
|
||||
return {
|
||||
options = {
|
||||
theme = "catppuccin",
|
||||
|
|
@ -99,6 +87,45 @@ return {
|
|||
lualine_b = {},
|
||||
lualine_c = {
|
||||
{ "branch", icon = icons.git.branch },
|
||||
{
|
||||
"diff",
|
||||
symbols = {
|
||||
added = icons.git.added,
|
||||
modified = icons.git.modified,
|
||||
removed = icons.git.removed,
|
||||
},
|
||||
source = diff_source,
|
||||
},
|
||||
{ codecompanion_status },
|
||||
{
|
||||
"diagnostics",
|
||||
symbols = {
|
||||
error = icons.diagnostics.Error,
|
||||
warn = icons.diagnostics.Warn,
|
||||
info = icons.diagnostics.Info,
|
||||
hint = icons.diagnostics.Hint,
|
||||
},
|
||||
},
|
||||
"filetype",
|
||||
{
|
||||
"filename",
|
||||
path = 1,
|
||||
symbols = {
|
||||
modified = "●", -- Text to show when the buffer is modified
|
||||
alternate_file = "#", -- Text to show to identify the alternate file
|
||||
directory = "", -- Text to show when the buffer is a directory
|
||||
},
|
||||
},
|
||||
},
|
||||
lualine_x = {
|
||||
{
|
||||
"overseer",
|
||||
},
|
||||
{
|
||||
function()
|
||||
return require("grapple").statusline()
|
||||
end,
|
||||
},
|
||||
{
|
||||
"copilot",
|
||||
cond = function()
|
||||
|
|
@ -126,21 +153,6 @@ return {
|
|||
spinner_color = palete.mauve
|
||||
},
|
||||
},
|
||||
{ codecompanion_status },
|
||||
{
|
||||
symbols.get,
|
||||
cond = symbols.has,
|
||||
},
|
||||
{
|
||||
"overseer",
|
||||
},
|
||||
},
|
||||
lualine_x = {
|
||||
{
|
||||
function()
|
||||
return require("grapple").statusline()
|
||||
end,
|
||||
},
|
||||
},
|
||||
lualine_y = {
|
||||
{
|
||||
|
|
@ -163,83 +175,14 @@ return {
|
|||
},
|
||||
lualine_z = {},
|
||||
},
|
||||
winbar = {
|
||||
lualine_b = {
|
||||
{
|
||||
"filename",
|
||||
path = 1,
|
||||
symbols = {
|
||||
modified = " ●", -- Text to show when the buffer is modified
|
||||
alternate_file = "#", -- Text to show to identify the alternate file
|
||||
directory = "", -- Text to show when the buffer is a directory
|
||||
},
|
||||
},
|
||||
},
|
||||
lualine_y = {
|
||||
{
|
||||
"diff",
|
||||
symbols = {
|
||||
added = icons.git.added,
|
||||
modified = icons.git.modified,
|
||||
removed = icons.git.removed,
|
||||
},
|
||||
source = diff_source,
|
||||
},
|
||||
{
|
||||
"diagnostics",
|
||||
symbols = {
|
||||
error = icons.diagnostics.Error,
|
||||
warn = icons.diagnostics.Warn,
|
||||
info = icons.diagnostics.Info,
|
||||
hint = icons.diagnostics.Hint,
|
||||
},
|
||||
},
|
||||
},
|
||||
},
|
||||
inactive_winbar = {
|
||||
lualine_b = {
|
||||
{
|
||||
"filename",
|
||||
path = 1,
|
||||
symbols = {
|
||||
modified = " ●", -- Text to show when the buffer is modified
|
||||
alternate_file = "#", -- Text to show to identify the alternate file
|
||||
directory = "", -- Text to show when the buffer is a directory
|
||||
},
|
||||
},
|
||||
},
|
||||
lualine_y = {
|
||||
{
|
||||
"diff",
|
||||
symbols = {
|
||||
added = icons.git.added,
|
||||
modified = icons.git.modified,
|
||||
removed = icons.git.removed,
|
||||
},
|
||||
source = diff_source,
|
||||
},
|
||||
{
|
||||
"diagnostics",
|
||||
symbols = {
|
||||
error = icons.diagnostics.Error,
|
||||
warn = icons.diagnostics.Warn,
|
||||
info = icons.diagnostics.Info,
|
||||
hint = icons.diagnostics.Hint,
|
||||
},
|
||||
},
|
||||
},
|
||||
},
|
||||
extensions = {
|
||||
"neo-tree",
|
||||
"lazy",
|
||||
"fugitive",
|
||||
"fzf",
|
||||
"man",
|
||||
"mason",
|
||||
"nvim-tree",
|
||||
"quickfix",
|
||||
"symbols-outline",
|
||||
"trouble",
|
||||
"toggleterm",
|
||||
},
|
||||
}
|
||||
end,
|
||||
|
|
|
|||
|
|
@ -83,6 +83,7 @@ set -g @plugin 'tmux-plugins/tpm'
|
|||
set -g @plugin 'tmux-plugins/tmux-copycat'`
|
||||
set -g @plugin 'laktak/extrakto'
|
||||
set -g @plugin 'christoomey/vim-tmux-navigator'
|
||||
set -g @plugin 'soyuka/tmux-current-pane-hostname'
|
||||
|
||||
# ╭──────────────────────────────────────────────────────────╮
|
||||
# │ Session Management │
|
||||
|
|
@ -101,30 +102,79 @@ set -g @resurrect-processes 'vi vim nvim man "~pnpm dev->pnpm dev *"'
|
|||
set -g @plugin 'catppuccin/tmux'
|
||||
|
||||
set -g @catppuccin_flavor 'macchiato'
|
||||
set -g @catppuccin_status_default "on"
|
||||
set -g @catppuccin_status_background "default"
|
||||
# set -g @catppuccin_status_default "on"
|
||||
# set -g @catppuccin_status_background "default"
|
||||
#
|
||||
# set -g @catppuccin_window_right_separator "█ "
|
||||
# set -g @catppuccin_window_number_position "right"
|
||||
# set -g @catppuccin_window_middle_separator " | "
|
||||
# set -g @catppuccin_window_flags "no"
|
||||
#
|
||||
# set -g @catppuccin_window_default_fill "none"
|
||||
# set -g @catppuccin_window_current_fill "all"
|
||||
#
|
||||
# set -g @catppuccin_window_default_text "#{?window_zoomed_flag, ,}#W"
|
||||
# set -g @catppuccin_window_current_text "#{?window_zoomed_flag, ,}#W"
|
||||
# set -g @catppuccin_window_current_text_color "#{thm_blue}" # text color
|
||||
#
|
||||
# set -g @catppuccin_status_modules_right "directory session"
|
||||
# set -g @catppuccin_status_left_separator ""
|
||||
# set -g @catppuccin_status_right_separator ""
|
||||
# set -g @catppuccin_status_fill "all"
|
||||
# set -g @catppuccin_status_connect_separator "yes"
|
||||
#
|
||||
# set -g @catppuccin_session_color "#{thm_red}"
|
||||
# set -g @catppuccin_directory_color "#{thm_magenta}"
|
||||
# set -g @catppuccin_directory_text "#{pane_current_path}"
|
||||
|
||||
set -g @catppuccin_window_right_separator "█ "
|
||||
set -g @catppuccin_window_number_position "right"
|
||||
set -g @catppuccin_window_middle_separator " | "
|
||||
set -g @catppuccin_window_status "no"
|
||||
# new
|
||||
|
||||
set -g @catppuccin_window_default_fill "none"
|
||||
set -g @catppuccin_window_current_fill "all"
|
||||
set -g @catppuccin_status_background "none"
|
||||
set -g @catppuccin_window_status_style "none"
|
||||
set -g @catppuccin_pane_status_enabled "off"
|
||||
set -g @catppuccin_pane_border_status "off"
|
||||
|
||||
set -g @catppuccin_window_default_text "#{?window_zoomed_flag, ,}#W"
|
||||
set -g @catppuccin_window_current_text "#{?window_zoomed_flag, ,}#W"
|
||||
set -g @catppuccin_window_current_color "#{thm_blue}" # text color
|
||||
# status left look and feel
|
||||
set -g status-left-length 100
|
||||
set -g status-left ""
|
||||
set -ga status-left "#{?client_prefix,#{#[bg=#{@thm_teal},fg=#{@thm_bg},bold] #S },#{#[bg=#{@thm_bg},fg=#{@thm_teal}] #S }}" # session
|
||||
set -ga status-left "#[bg=#{@thm_bg},fg=#{@thm_overlay_0},none]│"
|
||||
set -ga status-left "#[bg=#{@thm_bg},fg=#{@thm_blue}] #{=/-32/...:#{s|$USER|~|:#{b:pane_current_path}}} " # path
|
||||
set -ga status-left "#[bg=#{@thm_bg},fg=#{@thm_overlay_0},none]│"
|
||||
set -ga status-left "#[bg=#{@thm_bg},fg=#{@thm_maroon}] #{pane_current_command} "
|
||||
set -ga status-left "#[bg=#{@thm_bg},fg=#{@thm_overlay_0},none]#{?window_zoomed_flag,│,}"
|
||||
set -ga status-left "#[bg=#{@thm_bg},fg=#{@thm_flamingo}]#{?window_zoomed_flag, zoom ,}"
|
||||
|
||||
set -g @catppuccin_status_modules_right "directory session"
|
||||
set -g @catppuccin_status_left_separator ""
|
||||
set -g @catppuccin_status_right_separator ""
|
||||
set -g @catppuccin_status_fill "all"
|
||||
set -g @catppuccin_status_connect_separator "yes"
|
||||
# status right look and feel
|
||||
set -g status-right-length 100
|
||||
set -g status-right ""
|
||||
set -ga status-right "#{?#{pane_ssh_connected},#{#[bg=#{@thm_mauve},fg=#{@thm_bg},bold] #U@#H },#{#[bg=#{@thm_bg},fg=#{@thm_text}] #U@#H }}" # SSH connection
|
||||
|
||||
set -g @catppuccin_session_color "#{thm_red}"
|
||||
set -g @catppuccin_directory_color "#{thm_magenta}"
|
||||
set -g @catppuccin_directory_text "#{pane_current_path}"
|
||||
# Configure Tmux
|
||||
set -g status-position top
|
||||
set -g status-style "bg=#{@thm_bg}"
|
||||
set -g status-justify "absolute-centre"
|
||||
|
||||
# pane border look and feel
|
||||
setw -g pane-border-status top
|
||||
setw -g pane-border-format ""
|
||||
setw -g pane-active-border-style "bg=#{@thm_bg},fg=#{@thm_overlay_0}"
|
||||
setw -g pane-border-style "bg=#{@thm_bg},fg=#{@thm_surface_0}"
|
||||
setw -g pane-border-lines single
|
||||
|
||||
# window look and feel
|
||||
set -wg automatic-rename on
|
||||
set -g automatic-rename-format "Window"
|
||||
|
||||
set -g window-status-format " #I#{?#{!=:#{window_name},Window},: #W,} "
|
||||
set -g window-status-style "bg=#{@thm_bg},fg=#{@thm_mauve}"
|
||||
set -g window-status-last-style "bg=#{@thm_bg},fg=#{@thm_mauve}"
|
||||
set -g window-status-activity-style "bg=#{@thm_red},fg=#{@thm_bg}"
|
||||
set -g window-status-bell-style "bg=#{@thm_red},fg=#{@thm_bg},bold"
|
||||
set -gF window-status-separator "#[bg=#{@thm_bg},fg=#{@thm_overlay_0}]│"
|
||||
|
||||
set -g window-status-current-format " #I#{?#{!=:#{window_name},Window},: #W,} "
|
||||
set -g window-status-current-style "bg=#{@thm_mauve},fg=#{@thm_bg},bold"
|
||||
|
||||
# ╭──────────────────────────────────────────────────────────╮
|
||||
# │ Scratch FLating Pane │
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue