From 5e349c574c794a35be3aca7016a601f7c22982a3 Mon Sep 17 00:00:00 2001 From: Barak Michener Date: Wed, 15 May 2024 13:04:41 -0700 Subject: [PATCH] [tmux] catpuccin and status lines --- .config/alacritty/alacritty.toml | 11 +++-- .tmux.conf | 97 +++++++++++++++++++++++++++++++--------- .vim/lua/lualine_setup.lua | 3 ++ .vim/nvim.lua | 2 +- 4 files changed, 89 insertions(+), 24 deletions(-) diff --git a/.config/alacritty/alacritty.toml b/.config/alacritty/alacritty.toml index 402633c..e11bc79 100644 --- a/.config/alacritty/alacritty.toml +++ b/.config/alacritty/alacritty.toml @@ -33,20 +33,24 @@ foreground = "#fffbf6" TERM = "xterm-256color" [font] -size = 20.0 +size = 19.0 [font.bold] style = "Semi-Condensed" +#style = "Regular" [font.bold_italic] -style = "Semi-Condensed Italic" +style = "Semi-Condensed Oblique" +#style = "Italic" [font.italic] -style = "Light Semi-Condensed Italic" +style = "Light Semi-Condensed Oblique" +#style = "Light Italic" [font.normal] family = "Iosevka Berkeley" style = "Light Semi-Condensed" +#style = "Light" [hints] alphabet = "jfkdls;ahgurieowpq" @@ -112,6 +116,7 @@ multiplier = 3 [window] opacity = 0.88 startup_mode = "Windowed" +#decorations = "None" [window.dimensions] columns = 106 diff --git a/.tmux.conf b/.tmux.conf index 2b2a1ed..4d3f71c 100644 --- a/.tmux.conf +++ b/.tmux.conf @@ -37,37 +37,94 @@ bind -r L resize-pane -R 5 #bind | split-window -h #bind - split-window -v +bind-key h select-pane -L +bind-key k select-pane -U +bind-key j select-pane -D +bind-key l select-pane -R + +bind-key u break-pane +#bind-key sdf command-prompt -p "join pane from:" "join-pane -s '%%'" +bind-key y command-prompt -p "send pane to:" "join-pane -t :'%%' \; select-layout main-vertical" +bind-key Enter rotate-window + bind v split-window -h bind = select-layout even-horizontal bind | select-layout main-vertical bind-key C-t new-window "ttyd -R -d -t fontSize=18 tmux attach -t `tmux display -p '#S'`" # Status Bar -#set -g status-bg black +##set -g status-bg black set -g status-interval 1 -#set -g status-left '#[fg=green]#H#[default]' -#set -g status-right '#[fg=green]#(~/src/tpom/tpom) #[fg=cyan,bold]%Y-%m-%d %H:%M:%S#[default]' -set -g status-justify centre # center align window list -set -g status-style fg=white,bg=default -set -g main-pane-width 68% +##set -g status-left '#[fg=green]#H#[default]' +##set -g status-right '#[fg=green]#(~/src/tpom/tpom) #[fg=cyan,bold]%Y-%m-%d %H:%M:%S#[default]' +#set -g status-justify centre # center align window list +#set -g status-style fg=white,bg=default -# default window title colors -set-window-option -g window-status-style fg=white,bg=default,dim +## default window title colors +#set-window-option -g window-status-style fg=white,bg=default,dim -# active window title colors -set-window-option -g window-status-current-style fg=cyan,bg=default,bright +## active window title colors +#set -g main-pane-width 68% +#set-window-option -g window-status-current-style fg=cyan,bg=default,bright -set-window-option -g window-style fg=#aaaaaa,bg=terminal -set-window-option -g window-active-style fg=terminal,bg=terminal - -set -g status-left '#[fg=green][ #h ][' -set -g status-left-length 40 -set -g status-right '#[fg=green]][#(battery) #{pane_width}x#{pane_height} #[bright]#[fg=blue]%Y-%m-%d #[fg=white]%I:%M #[dim]#[fg=green]]' -set -g status-right-length 40 +#set-window-option -g window-style fg=#999999,bg=terminal +#set-window-option -g window-active-style fg=terminal,bg=terminal +#set -g status-left '#[fg=green][ #h ][' +#set -g status-left-length 40 +#set -g status-right '#[fg=green]][#(battery) #{pane_width}x#{pane_height} #[bright]#[fg=blue]%Y-%m-%d #[fg=white]%I:%M #[dim]#[fg=green]]' +#set -g status-right-length 40 +set-window-option -g window-status-activity-style none # Notifying if other windows has activities -setw -g monitor-activity on -set -g visual-activity on +set -g monitor-activity on +set -g visual-activity off +set -g visual-bell on +set -g bell-action none +set -g activity-action none # Highlighting the active window in status bar -setw -g window-status-current-style bg=red,bright +#setw -g window-status-current-style bg=red,bright +set -g @catppuccin_flavour 'mocha' # or frappe, macchiato, mocha + +set -g @catppuccin_window_status_enable "yes" +set -g @catppuccin_window_number_position "left" +set -g @catppuccin_window_left_separator "" +set -g @catppuccin_window_right_separator " " +set -g @catppuccin_window_middle_separator " " +set -g @catppuccin_window_connect_separator "yes" + +set -g @catppuccin_window_default_color "#{thm_gray}" +set -g @catppuccin_window_default_background "#{thm_green}" +set -g @catppuccin_window_default_fill "all" +set -g @catppuccin_window_default_text "#W" + +set -g @catppuccin_window_current_fill "all" +set -g @catppuccin_window_current_text "#W" +set -g @catppuccin_window_current_color "#{thm_blue}" +set -g @catppuccin_window_current_background "#{thm_bg}" + +set -g @catppuccin_icon_window_last "󰖰" +set -g @catppuccin_icon_window_current "󰫣" +set -g @catppuccin_icon_window_zoom "󰁌" +set -g @catppuccin_icon_window_mark "󰃀" +set -g @catppuccin_icon_window_silent "󰂛" +set -g @catppuccin_icon_window_activity "󱅫" +set -g @catppuccin_icon_window_bell "󰂞" + +set -g @catppuccin_status_modules_right "directory battery host date_time" +set -g @catppuccin_status_left_separator "" +set -g @catppuccin_status_right_separator "" +set -g @catppuccin_status_fill "icon" +set -g @catppuccin_status_connect_separator "yes" +set -g @catppuccin_date_time_text "%Y-%m-%d %H:%M:%S" + +set -g @catppuccin_pane_status_enabled "yes" + + +set -g @catppuccin_directory_text "#{pane_current_path}" +set -g @plugin 'catppuccin/tmux' + + +set -g @plugin 'tmux-plugins/tmux-battery' +set -g @plugin 'tmux-plugins/tpm' +run -b '~/.tmux/plugins/tpm/tpm' diff --git a/.vim/lua/lualine_setup.lua b/.vim/lua/lualine_setup.lua index 7f8b242..b99cd3e 100644 --- a/.vim/lua/lualine_setup.lua +++ b/.vim/lua/lualine_setup.lua @@ -9,6 +9,9 @@ local config = { function() return require('lsp-progress').progress() end, + }, + lualine_x = { + 'filetype', } } } diff --git a/.vim/nvim.lua b/.vim/nvim.lua index 0dd841e..e07e4e5 100644 --- a/.vim/nvim.lua +++ b/.vim/nvim.lua @@ -148,7 +148,7 @@ nvim_lsp.pyright.setup({ --} --}) ---nvim_lsp.clangd.setup({ on_attach = on_attach }) +nvim_lsp.clangd.setup({ on_attach = on_attach }) nvim_lsp.tsserver.setup { cmd = { "/home/barak/.yarn/bin/typescript-language-server", "--stdio" } }