Completed BOOTSTRAP; Updated tmux, nvim, & zsh

This commit is contained in:
mattr
2024-10-03 16:55:56 -05:00
parent 922fdb0cba
commit be7791c641
5 changed files with 91 additions and 51 deletions

3
.gitignore vendored Normal file
View File

@@ -0,0 +1,3 @@
# Tmux Plugins
tmux/plugins/*

47
BOOTSTRAP.sh Normal file → Executable file
View File

@@ -0,0 +1,47 @@
#!/bin/bash
CONFIGDIR=$HOME/.config
#############################
# zsh
#############################
ZSHFILE="$HOME/.zshrc"
if [ -f "$ZSHFILE" ] || [ -d "$ZSHFILE" ]; then
mv "$ZSHFILE" "$ZSHFILE.old"
fi
ln -s "$PWD/zsh/.zshrc" "$ZSHFILE"
#############################
# kitty
#############################
KITTYDIR="$CONFIGDIR/kitty"
if [ -f "$KITTYDIR" ] || [ -d "$KITTYDIR" ]; then
mv "$KITTYDIR" "$KITTYDIR.old"
fi
ln -s "$PWD/kitty/" "$KITTYDIR"
#############################
# neovim
#############################
NEOVIMFILE="$CONFIGDIR/nvim"
if [ -f "$NEOVIMFILE" ] || [ -d "$NEOVIMFILE" ]; then
mv "$NEOVIMFILE" "$NEOVIMFILE.old"
fi
ln -s "$PWD/nvim/" "$NEOVIMFILE"
#############################
# tmux
#############################
TMUXFILE="$CONFIGDIR/tmux"
if [ -f "$TMUXFILE" ] || [ -d "$TMUXFILE" ]; then
mv "$TMUXFILE" "$TMUXFILE.old"
fi
ln -s "$PWD/tmux/" "$TMUXFILE"

View File

@@ -21,6 +21,8 @@ end)
-- Enable break indent
vim.opt.breakindent = true
-- Enable word break instead of character break
vim.opt.linebreak = true
-- Save undo history
vim.opt.undofile = true
@@ -499,6 +501,7 @@ require('lazy').setup({
'hrsh7th/cmp-nvim-lsp',
'hrsh7th/cmp-path',
},
config = function()
-- See `:help cmp`
local cmp = require 'cmp'
@@ -510,6 +513,7 @@ require('lazy').setup({
luasnip.lsp_expand(args.body)
end,
window = {
completion = cmp.config.window.bordered(),
documentation = cmp.config.window.bordered({
winhighlight = "Normal:Pmenu,FloatBorder:Pmenu,CursorLine:PmenuSel,Search:None",
}),

View File

@@ -1,4 +1,4 @@
set-option -sa terminal-overrides ",xterm*:Tc"
# set-option -sa terminal-overrides ",xterm*:Tc"
set -g mouse on
set -sg escape-time 10
@@ -33,66 +33,51 @@ bind -n S-Right next-window
bind -n M-H previous-window
bind -n M-L next-window
set -g @catppuccin_flavour 'mocha'
# Theme
# set -g @catppuccin_flavour 'mocha'
set -g @catppuccin_window_status_style "rounded"
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"
set -g @catppuccin_status_left_separator " "
set -g @catppuccin_status_right_separator ""
set -g @catppuccin_status_fill "icon"
set -g @catppuccin_status_connect_separator "no"
# Plugins
# To install programs do '<prefix>I'
set -g @plugin 'tmux-plugins/tpm'
set -g @plugin 'tmux-plugins/tmux-sensible'
set -g @plugin 'christoomey/vim-tmux-navigator'
set -g @plugin 'dreamsofcode-io/catppuccin-tmux'
set -g @plugin 'catppuccin/tmux'
# set -g @plugin 'dreamsofcode-io/catppuccin-tmux'
set -g @plugin 'tmux-plugins/tmux-yank'
set -g @plugin 'tmux-plugins/tmux-resurrect'
set -g @plugin 'tmux-plugins/tmux-continuum'
run '~/.tmux/plugins/tpm/tpm'
# More Theme
set -g status-left ""
set -g status-right "#{E:@catppuccin_status_directory}"
set -ag status-right "#{E:@catppuccin_status_user}"
set -ag status-right "#{E:@catppuccin_status_host}"
set -ag status-right "#{E:@catppuccin_status_session}"
# set vi-mode
set-window-option -g mode-keys vi
# set-window-option -g mode-keys vi
# keybindings
bind-key -T copy-mode-vi v send-keys -X begin-selection
bind-key -T copy-mode-vi C-v send-keys -X rectangle-toggle
bind-key -T copy-mode-vi y send-keys -X copy-selection-and-cancel
# bind-key -T copy-mode-vi v send-keys -X begin-selection
# bind-key -T copy-mode-vi C-v send-keys -X rectangle-toggle
# bind-key -T copy-mode-vi y send-keys -X copy-selection-and-cancel
bind '"' split-window -v -c "#{pane_current_path}"
bind % split-window -h -c "#{pane_current_path}"
# DESIGN TWEAKS
# don't do anything when a 'bell' rings
set -g visual-activity off
set -g visual-bell off
set -g visual-silence off
setw -g monitor-activity off
set -g bell-action none
# clock mode
setw -g clock-mode-colour yellow
# copy mode
setw -g mode-style 'fg=black bg=red bold'
# panes
set -g pane-border-style 'fg=red'
set -g pane-active-border-style 'fg=yellow'
# statusbar
set -g status-position bottom
set -g status-justify left
set -g status-style 'fg=red'
set -g status-left ''
set -g status-left-length 10
set -g status-right-style 'fg=black bg=yellow'
set -g status-right '%Y-%m-%d %H:%M '
set -g status-right-length 50
setw -g window-status-current-style 'fg=black bg=red'
setw -g window-status-current-format ' #I #W #F '
setw -g window-status-style 'fg=red bg=black'
setw -g window-status-format ' #I #[fg=white]#W #[fg=yellow]#F '
setw -g window-status-bell-style 'fg=yellow bg=red bold'
# messages
set -g message-style 'fg=yellow bg=red bold'
run '~/.config/tmux/plugins/tpm/tpm'

View File

@@ -176,6 +176,7 @@ export LESS_TERMCAP_so LESS_TERMCAP_ue LESS_TERMCAP_us
# Custom Additions
eval "$(zoxide init zsh --cmd cd)"
eval "$(fzf --zsh)"
alias update-grub=' grub2-mkconfig -o /boot/grub2/grub.cfg'