This commit is contained in:
2025-05-31 21:55:36 -04:00
parent 93f4a51aaf
commit 9baeb16a9c
3 changed files with 59 additions and 10 deletions

View File

@@ -6,8 +6,6 @@ return {
"williamboman/mason-lspconfig.nvim", "williamboman/mason-lspconfig.nvim",
"j-hui/fidget.nvim", "j-hui/fidget.nvim",
"stevearc/conform.nvim", "stevearc/conform.nvim",
-- Completion-related plugins
"hrsh7th/nvim-cmp", "hrsh7th/nvim-cmp",
"hrsh7th/cmp-nvim-lsp", "hrsh7th/cmp-nvim-lsp",
"hrsh7th/cmp-buffer", "hrsh7th/cmp-buffer",
@@ -17,7 +15,6 @@ return {
}, },
config = function() config = function()
-- Autocomplete Setup
local cmp = require("cmp") local cmp = require("cmp")
local luasnip = require("luasnip") local luasnip = require("luasnip")
local capabilities = require("cmp_nvim_lsp").default_capabilities() local capabilities = require("cmp_nvim_lsp").default_capabilities()
@@ -42,7 +39,6 @@ return {
}), }),
}) })
-- LSP + Tools Setup
require("conform").setup({ require("conform").setup({
formatters_by_ft = {}, formatters_by_ft = {},
}) })
@@ -85,6 +81,14 @@ return {
end, end,
}, },
}) })
vim.diagnostic.config({
virtual_text = true,
signs = true,
underline = true,
update_in_insert = false,
severity_sort = true,
})
end, end,
}, },
} }

View File

@@ -1,14 +1,50 @@
set -g default-terminal "tmux-256color"
set -ga terminal-overrides ',xterm-256color:Tc'
set -s escape-time 0 set -s escape-time 0
set-option -sa terminal-features ',xterm-256color:RGB'
set-option -g allow-passthrough on
unbind C-b unbind C-b
set-option -g prefix C-s set-option -g prefix C-SPACE
bind-key C-s send-prefix bind-key C-SPACE send-prefix
bind r source-file ~/.config/tmux/tmux.conf
set -g base-index 1
set -g status-style 'bg=#333333 fg=#5eacd3' # set-option remain-on-exit on
set -g renumber-windows on # renumber all windows when any window is closed
set -g escape-time 0 # zero-out escape time delay
set-window-option -g mode-keys vi
# style
set -g status-position top
set -g status-justify absolute-centre
set -g status-style 'fg=color7 bg=default'
set -g status-right ''
# set -g status-right ' #(cd #{pane_current_path}; git rev-parse --abbrev-ref HEAD)'
# set -g status-right ''
set -g status-left '#S'
set -g status-left-style 'fg=color8'
set -g status-right-length 0
set -g status-left-length 100
setw -g window-status-current-style 'fg=colour1 bg=default bold'
setw -g window-status-current-format '#I:#W '
setw -g window-status-style 'fg=color8'
# vim-like pane switching
bind -r ^ last-window
bind -r k select-pane -U bind -r k select-pane -U
bind -r j select-pane -D bind -r j select-pane -D
bind -r h select-pane -L bind -r h select-pane -L
bind -r l select-pane -R bind -r l select-pane -R
# Scripts that are baked into tmux
bind G new-window -n 'lazygit' lazygit
bind-key f run-shell "tmux neww ~/.config/scripts/tmux-sessionizer.sh"
bind-key F run-shell "tmux display-popup -E ~/.config/scripts/clone.sh"
bind-key O run-shell "tmux neww ~/.config/scripts/op.sh"
bind-key o run-shell "tmux neww ~/.config/scripts/oa.sh"
bind-key g run-shell "~/.config/scripts/open_github.sh"
bind-key -r N run-shell "~/.config/scripts/tmux-sessionizer.sh ~/documents/notes"
bind-key -r P run-shell "~/.config/scripts/tmux-sessionizer.sh ~/documents/projects"
bind-key -r D run-shell "~/.config/scripts/tmux-sessionizer.sh ~/.config"
bind-key -r H run-shell "~/.config/scripts/tmux-sessionizer.sh ~"
bind-key -r K run-shell "~/.config/scripts/tmux-sessionizer.sh ~/qmk_firmware/keyboards/ferris/keymaps/sylvanfranklinferrissweep"
bind-key -r J run-shell "~/.config/scripts/tmux-sessionizer.sh ~/Journal"
bind-key b set-option status

View File

@@ -62,3 +62,12 @@ eval "$(/home/linuxbrew/.linuxbrew/bin/brew shellenv)"
# Tmux startup if not already in tmux # Tmux startup if not already in tmux
if [ "$TMUX" = "" ]; then tmux; fi if [ "$TMUX" = "" ]; then tmux; fi
# BEGIN opam configuration
# This is useful if you're using opam as it adds:
# - the correct directories to the PATH
# - auto-completion for the opam binary
# This section can be safely removed at any time if needed.
[[ ! -r '/home/owen/.opam/opam-init/init.zsh' ]] || source '/home/owen/.opam/opam-init/init.zsh' > /dev/null 2> /dev/null
# END opam configuration