Skip to content

Commit

Permalink
Merge pull request #68 from TechDufus/tmux_nvim
Browse files Browse the repository at this point in the history
adding tmux plugins and small telescope changes
  • Loading branch information
TechDufus authored Dec 11, 2023
2 parents 08212d6 + 84f3196 commit b71ec16
Show file tree
Hide file tree
Showing 5 changed files with 67 additions and 54 deletions.
2 changes: 1 addition & 1 deletion roles/bash/files/bash/k8s_functions.sh
Original file line number Diff line number Diff line change
Expand Up @@ -68,5 +68,5 @@ function k.node.debug() {
}

complete -o nospace -F __kc_complete kc
omplete -o nospace -F __kgnonly_complete k.node.debug k.node.exec
complete -o nospace -F __kgnonly_complete k.node.debug k.node.exec

2 changes: 1 addition & 1 deletion roles/neovim/files/lua/techdufus/core/options.lua
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ local options = {
mouse = "a", -- allow the mouse to be used in neovim
pumheight = 10, -- pop up menu height
showmode = false, -- we don't need to see things like -- INSERT -- anymore
showtabline = 2, -- always show tabs
showtabline = 0, -- never show tabs
smartcase = true, -- smart case
smartindent = true, -- make indenting smarter again
splitbelow = true, -- force all horizontal splits to go below current window
Expand Down
12 changes: 6 additions & 6 deletions roles/neovim/files/lua/techdufus/plugins/init.lua
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,12 @@ return {
{
"sbdchd/neoformat",
},
{
'akinsho/bufferline.nvim',
version = "*",
dependencies = 'nvim-tree/nvim-web-devicons',
config = true,
},
-- {
-- 'akinsho/bufferline.nvim',
-- version = "*",
-- dependencies = 'nvim-tree/nvim-web-devicons',
-- config = true,
-- },
'crispgm/nvim-go',
'erikzaadi/vim-ansible-yaml',
}
10 changes: 5 additions & 5 deletions roles/neovim/files/lua/techdufus/plugins/telescope.lua
Original file line number Diff line number Diff line change
Expand Up @@ -103,12 +103,12 @@ return {
pickers = {
find_files = {
hidden = true,
previewer = false,
previewer = true,
layout_config = {
horizontal = {
vertical = {
width = 0.5,
height = 0.4,
preview_width = 0.6,
preview_height = 0.5,
},
},
},
Expand Down Expand Up @@ -159,7 +159,7 @@ return {
},
},
lsp_reference = {
show_line = false,
show_line = true,
layout_config = {
horizontal = {
width = 0.9,
Expand All @@ -169,7 +169,7 @@ return {
},
},
treesitter = {
show_line = false,
show_line = true,
sorting_strategy = nil,
layout_config = {
horizontal = {
Expand Down
95 changes: 54 additions & 41 deletions roles/tmux/files/tmux/tmux.conf
Original file line number Diff line number Diff line change
@@ -1,55 +1,68 @@
# Set true color
set-option -sa terminal-overrides ",xterm*:Tc"
set -g default-terminal "screen-256color"
set -g terminal-overrides ',xterm-256color:RGB'
set -g mouse on
set -sg escape-time 50
set -g base-index 1 # Start indexing windows at 1 instead of 0
set -g pane-base-index 1 # Same for panes
setw -g pane-base-index 1 # Same for panes
set -g renumber-windows on # Re-index windows when a window is closed
set -g history-limit 1000000 # Set history limit to 1000000
set -g mode-keys vi # Set vi mode
set -g status-position top # Set status bar to top
set -g pane-active-border-style 'fg=magenta,bg=default'
set -g pane-border-style 'fg=brightblack,bg=default'
set -g status-interval 1

# Fix Home and End keys
bind-key -n Home send Escape "OH"
bind-key -n End send Escape "OF"

# Start windows and panes at 1, not 0
set -g base-index 1
set -g pane-base-index 1
set-window-option -g pane-base-index 1
set-option -g renumber-windows on

# Center the window list
set -g status-justify centre

# Set prefix
# unbind C-b
# set -g prefix C-Space
# bind C-Space send-prefix

# Shift Alt vim keys to switch windows
bind -n M-H previous-window
bind -n M-L next-window

# Open new terminals at current dir
# bind c new-window -c "#{pane_current_path}"
bind '"' split-window -c "#{pane_current_path}"
bind % split-window -h -c "#{pane_current_path}"

# Resize Panes
bind-key -r -T prefix C-Up resize-pane -U
bind-key -r -T prefix C-Down resize-pane -D
bind-key -r -T prefix C-Left resize-pane -L
bind-key -r -T prefix C-Right resize-pane -R
bind-key -n Home send Escape "OH" # Fix Home Key
bind-key -n End send Escape "OF" # Fix End Key
bind-key -n M-H previous-window # Alt + Shift + h
bind-key -n M-L next-window # Alt + Shift + l
bind-key '"' split-window -c "#{pane_current_path}" # Horizontal Split window with current path
bind-key % split-window -h -c "#{pane_current_path}" # Vertical Split window with current path
bind-key -r -T prefix C-Up resize-pane -U # Resize pane up
bind-key -r -T prefix C-Down resize-pane -D # Resize pane down
bind-key -r -T prefix C-Left resize-pane -L # Resize pane left
bind-key -r -T prefix C-Right resize-pane -R # Resize pane right

set -g status-interval 1
set -g @pomodoro_granularity 'on'
set -g @pomodoro_sound 'on'
# This is waiting for merge https://github.com/catppuccin/tmux/pull/47
set -g @cotppuccin_prepend "#{pomodoro_status} "
set -g @fzf-url-fzf-options '-p 60%,30% --prompt=" " --border-label=" Open URL "'
set -g @fzf-url-history-limit '2000'


set -g @plugin 'tmux-plugins/tpm'
set -g @plugin 'tmux-plugins/tmux-sensible'
set -g @plugin 'tmux-plugins/tmux-yank'
set -g @plugin 'tmux-plugins/tmux-resurrect'
set -g @plugin 'tmux-plugins/tmux-continuum'
set -g @plugin 'sainnhe/tmux/fzf'
set -g @plugin 'wfxr/tmux-fzf-url'
set -g @plugin 'christoomey/vim-tmux-navigator'
set -g @plugin 'catppuccin/tmux'
set -g @catppuccin_date_time "%Y-%m-%d %H:%M:%S CST"
set -g @catppuccin_prepend 'TESTING'
set -g @plugin 'olimorris/tmux-pomodoro-plus'
set -g @plugin 'omerxx/tmux-sessionx'
# set -g @catppuccin_date_time "%Y-%m-%d %H:%M:%S CST"
# set -g @catppuccin_prepend 'TESTING'
# set -g @plugin 'olimorris/tmux-pomodoro-plus'

set -g @sessionx-bind 'o'
set -g @continuum-restore 'on'
set -g @resurrect-strategy-nvim 'session'
set -g @catppuccin_window_left_separator ""
set -g @catppuccin_window_right_separator " "
set -g @catppuccin_window_middle_separator ""
set -g @catppuccin_window_number_position "right"
set -g @catppuccin_window_default_fill "number"
set -g @catppuccin_window_default_text "#W"
set -g @catppuccin_window_current_fill "number"
set -g @catppuccin_window_current_text "#W#{?window_zoomed_flag,(),}"
set -g @catppuccin_status_modules_right "directory meetings date_time"
set -g @catppuccin_status_modules_left "session"
set -g @catppuccin_status_left_separator ""
set -g @catppuccin_status_right_separator ""
set -g @catppuccin_status_right_separator_inverse "no"
set -g @catppuccin_status_fill "icon"
set -g @catppuccin_status_connect_separator "no"
set -g @catppuccin_directory_text "#{pane_current_path}"
set -g @catppuccin_meetings_text "#($HOME/.config/tmux/scripts/cal.sh)"
set -g @catppuccin_date_time_text "%H:%M"

run -b '~/.tmux/plugins/tpm/tpm'

0 comments on commit b71ec16

Please sign in to comment.