Compare commits

..

7 Commits

5 changed files with 72 additions and 22 deletions

View File

@ -3,7 +3,7 @@ alias vim="nvim"
alias lg="lazygit" alias lg="lazygit"
alias ls="eza --long --header --git --group --time-style long-iso" alias ls="eza --long --header --git --group --time-style long-iso"
alias cat="bat --theme=\"Visual Studio Dark+\"" alias cat="bat --theme=\"Visual Studio Dark+\""
alias tree="exa --tree" alias tree="eza --tree"
alias la="ls -lhA" alias la="ls -lhA"
alias calc="qalc" alias calc="qalc"
alias dedsstore="find . -name \".DS_Store\" -delete" alias dedsstore="find . -name \".DS_Store\" -delete"

View File

@ -4,6 +4,12 @@ set-option -g renumber-windows on
set-option -g history-limit 10000 set-option -g history-limit 10000
set -s escape-time 0 set -s escape-time 0
### Fix supporting italics
set -g default-terminal "tmux"
### Use the system clipboard
set -g set-clipboard on
### Reload the config with r ### Reload the config with r
bind-key r source-file ~/.tmux.conf\; display-message "Reloaded config" bind-key r source-file ~/.tmux.conf\; display-message "Reloaded config"
@ -19,12 +25,18 @@ bind '"' split-window -c "#{pane_current_path}"
bind % split-window -h -c "#{pane_current_path}" bind % split-window -h -c "#{pane_current_path}"
### vim/tmux navigation ### vim/tmux navigation
### https://github.com/christoomey/vim-tmux-navigator
set -g focus-events on set -g focus-events on
is_vim='echo "#{pane_current_command}" | grep -iqE "(^|\/)g?(view|n?vim?)(diff)?$"' is_vim="ps -o state= -o comm= -t '#{pane_tty}' \
bind -n C-Left if-shell "$is_vim" "send-keys C-h" "select-pane -L" | grep -iqE '^[^TXZ ]+ +(\\S+\\/)?g?(view|l?n?vim?x?|fzf)(diff)?$'"
bind -n C-Down if-shell "$is_vim" "send-keys C-j" "select-pane -D" bind-key -n 'C-h' if-shell "$is_vim" 'send-keys C-h' 'select-pane -L'
bind -n C-Up if-shell "$is_vim" "send-keys C-k" "select-pane -U" bind-key -n 'C-j' if-shell "$is_vim" 'send-keys C-j' 'select-pane -D'
bind -n C-Right if-shell "$is_vim" "send-keys C-l" "select-pane -R" bind-key -n 'C-k' if-shell "$is_vim" 'send-keys C-k' 'select-pane -U'
bind-key -n 'C-l' if-shell "$is_vim" 'send-keys C-l' 'select-pane -R'
bind-key -T copy-mode-vi 'C-h' select-pane -L
bind-key -T copy-mode-vi 'C-j' select-pane -D
bind-key -T copy-mode-vi 'C-k' select-pane -U
bind-key -T copy-mode-vi 'C-l' select-pane -R
# change windows # change windows
bind -n S-Right next-window bind -n S-Right next-window
@ -33,13 +45,6 @@ bind -n S-Left previous-window
set -g base-index 1 # Windows start at index 1 set -g base-index 1 # Windows start at index 1
setw -g pane-base-index 1 # Panes start at index 1 setw -g pane-base-index 1 # Panes start at index 1
#### Color Scheme
set-option -g status-justify "centre"
set-option -g status-bg colour238 #grey
set-option -g status-fg yellow #yellow
set-option -g window-status-current-style bold
set-option -g display-panes-colour brightred #orange
# clock # clock
set-window-option -g clock-mode-colour green #green set-window-option -g clock-mode-colour green #green
set -g status-right '#(date "+%%Y-%m-%d %%H:%%M:%%S")' set -g status-right '#(date "+%%Y-%m-%d %%H:%%M:%%S")'
@ -47,5 +52,27 @@ set -g status-right '#(date "+%%Y-%m-%d %%H:%%M:%%S")'
# bell # bell
set-window-option -g window-status-bell-style fg=white,bg=red #base2, red set-window-option -g window-status-bell-style fg=white,bg=red #base2, red
set -g default-terminal "tmux" # Color Scheme
set -g @catppuccin_flavour 'latte'
set -g @catppuccin_window_left_separator ""
set -g @catppuccin_window_middle_separator ""
set -g @catppuccin_window_right_separator "█ "
set -g @catppuccin_window_default_text "#W"
set -g @catppuccin_window_default_fill "number"
# set -g @catppuccin_window_current_text "#W"
set -g @catppuccin_window_current_text "#W#{?window_zoomed_flag,  ,}"
set -g @catppuccin_window_current_fill "number"
set -g @catppuccin_status_modules_right "directory date_time session"
set -g @catppuccin_directory_text "#{pane_current_path}"
set -g @catppuccin_status_left_separator " "
set -g @catppuccin_status_fill "icon"
set -g @catppuccin_window_status_enable "no"
# List of plugins
set -g @plugin 'tmux-plugins/tpm'
# set -g @plugin 'tmux-plugins/tmux-sensible'
set -g @plugin 'catppuccin/tmux'
# Initialize TMUX plugin manager (keep this line at the very bottom of tmux.conf)
run '~/.tmux/plugins/tpm/tpm'

View File

@ -506,6 +506,9 @@ require('lazy').setup({
}, },
-- You can toggle below to ignore Lua_LS's noisy `missing-fields` warnings -- You can toggle below to ignore Lua_LS's noisy `missing-fields` warnings
-- diagnostics = { disable = { 'missing-fields' } }, -- diagnostics = { disable = { 'missing-fields' } },
telemetry = {
enable = false,
},
}, },
}, },
}, },

View File

@ -0,0 +1,22 @@
-- Seamless navigation between tmux and vim windows.
-- https://github.com/christoomey/vim-tmux-navigator
return {
'christoomey/vim-tmux-navigator',
cmd = {
'TmuxNavigateLeft',
'TmuxNavigateDown',
'TmuxNavigateUp',
'TmuxNavigateRight',
'TmuxNavigatePrevious',
},
keys = {
{ '<c-h>', '<cmd><C-U>TmuxNavigateLeft<cr>' },
{ '<c-j>', '<cmd><C-U>TmuxNavigateDown<cr>' },
{ '<c-k>', '<cmd><C-U>TmuxNavigateUp<cr>' },
{ '<c-l>', '<cmd><C-U>TmuxNavigateRight<cr>' },
{ '<c-\\>', '<cmd><C-U>TmuxNavigatePrevious<cr>' },
},
init = function()
vim.g.tmux_navigator_disable_when_zoomed = 1
end,
}

View File

@ -5,14 +5,9 @@ return {
event = { 'BufReadPre', 'BufNewFile' }, event = { 'BufReadPre', 'BufNewFile' },
config = function() config = function()
local lint = require 'lint' local lint = require 'lint'
lint.linters_by_ft = {
markdown = { 'markdownlint' },
}
-- To allow other plugins to add linters to require('lint').linters_by_ft, -- Defining in this format allows other plugins to define linters.
-- instead set linters_by_ft like this: -- require('lint').linters_by_ft
-- lint.linters_by_ft = lint.linters_by_ft or {}
-- lint.linters_by_ft['markdown'] = { 'markdownlint' }
-- --
-- However, note that this will enable a set of default linters, -- However, note that this will enable a set of default linters,
-- which will cause errors unless these tools are available: -- which will cause errors unless these tools are available:
@ -28,7 +23,10 @@ return {
-- terraform = { "tflint" }, -- terraform = { "tflint" },
-- text = { "vale" } -- text = { "vale" }
-- } -- }
-- lint.linters_by_ft['markdown'] = { 'markdownlint' }
lint.linters_by_ft['typescript'] = { 'eslint' }
lint.linters_by_ft['javascript'] = { 'eslint' }
-- You can disable the default linters by setting their filetypes to nil: -- You can disable the default linters by setting their filetypes to nil:
-- lint.linters_by_ft['clojure'] = nil -- lint.linters_by_ft['clojure'] = nil
-- lint.linters_by_ft['dockerfile'] = nil -- lint.linters_by_ft['dockerfile'] = nil