diff --git a/.config/alacritty/alacritty.toml b/.config/alacritty/alacritty.toml index b722940..256b8c1 100644 --- a/.config/alacritty/alacritty.toml +++ b/.config/alacritty/alacritty.toml @@ -4,7 +4,7 @@ import = ["~/.config/alacritty/themes/rose-pine.toml"] TERM = "xterm-256color" [font] -size = 14.0 +size = 16.0 [font.bold] style = "Bold" @@ -33,8 +33,8 @@ decorations = "none" opacity = 0.95 [window.dimensions] -columns = 108 -lines = 32 +columns = 98 +lines = 28 [window.padding] x = 0 diff --git a/.config/kitty/kitty.conf b/.config/kitty/kitty.conf index 91241fe..a9169fd 100644 --- a/.config/kitty/kitty.conf +++ b/.config/kitty/kitty.conf @@ -16,14 +16,15 @@ enable_audio_bell no hide_window_decorations yes # tab bar at bottom -tab_bar_style powerline +# if ever wanted to use bottom tab bar change tab_bar_style to powerline from hidden +tab_bar_style hidden tab_bar_min_tabs 1 tab_title_template "{index}:{tab.active_exe}" active_tab_title_template "{index}:{tab.active_exe}*" tab_bar_background none macos_quit_when_last_window_closed yes -macos_titlebar_color none +macos_titlebar_color background macos_show_window_title_in none shell_integration enabled @@ -31,16 +32,6 @@ shell_integration enabled map kitty_mod+enter no_op map cmd+enter no_op -map cmd+n launch --location=hsplit --cwd=current -map cmd+shift+n launch --location=vsplit --cwd=current - -map cmd+\ resize_window reset - -# use tmux(idk skill issues) -map ctrl+h neighboring_window left -map ctrl+l neighboring_window right -map ctrl+k neighboring_window up -map ctrl+j neighboring_window down # Jump to tabs map cmd+1 goto_tab 1 diff --git a/.config/nvim/lua/lilJ/lazy/lsp/mason.lua b/.config/nvim/lua/lilJ/lazy/lsp/mason.lua index 422c3d4..2466857 100644 --- a/.config/nvim/lua/lilJ/lazy/lsp/mason.lua +++ b/.config/nvim/lua/lilJ/lazy/lsp/mason.lua @@ -93,8 +93,9 @@ return { [server_name] = { analyses = { unusedparams = true, + shadow = true, }, - usePlaceholders = true, + staticcheck = true, }, }, } @@ -110,6 +111,21 @@ return { }, }) end, + + ["gopls"] = function() + lspconfig.gopls.setup({ + capabilities = capabilities, + on_attach = on_attach, + settings = { + gopls = { + gofumpt = true, + }, + }, + flags = { + debounce_text_changes = 150, + }, + }) + end, }, }) end, diff --git a/.config/nvim/lua/lilJ/lazy/telescope.lua b/.config/nvim/lua/lilJ/lazy/telescope.lua index c2c3ce0..36fd509 100644 --- a/.config/nvim/lua/lilJ/lazy/telescope.lua +++ b/.config/nvim/lua/lilJ/lazy/telescope.lua @@ -22,7 +22,7 @@ return { vim.keymap.set('n', 'f', builtin.find_files, {}) vim.keymap.set('n', '', builtin.git_files, {}) - -- vim.keymap.set('n', 'fg', builtin.live_grep, {}) + vim.keymap.set('n', '', builtin.live_grep, {}) -- vim.keymap.set('n', 'fh', builtin.help_tags, {}) end } diff --git a/.config/tmux/plugins/catppuccin-tmux b/.config/tmux/plugins/catppuccin-tmux new file mode 160000 index 0000000..b4e0715 --- /dev/null +++ b/.config/tmux/plugins/catppuccin-tmux @@ -0,0 +1 @@ +Subproject commit b4e0715356f820fc72ea8e8baf34f0f60e891718 diff --git a/.config/tmux/plugins/tmux b/.config/tmux/plugins/tmux new file mode 160000 index 0000000..2ff900d --- /dev/null +++ b/.config/tmux/plugins/tmux @@ -0,0 +1 @@ +Subproject commit 2ff900dc7a1579085cc2362fe459a1ecff78eec4 diff --git a/.config/tmux/plugins/tmux-sensible b/.config/tmux/plugins/tmux-sensible new file mode 160000 index 0000000..25cb91f --- /dev/null +++ b/.config/tmux/plugins/tmux-sensible @@ -0,0 +1 @@ +Subproject commit 25cb91f42d020f675bb0a2ce3fbd3a5d96119efa diff --git a/.config/tmux/plugins/tmux-yank b/.config/tmux/plugins/tmux-yank new file mode 160000 index 0000000..acfd36e --- /dev/null +++ b/.config/tmux/plugins/tmux-yank @@ -0,0 +1 @@ +Subproject commit acfd36e4fcba99f8310a7dfb432111c242fe7392 diff --git a/.config/tmux/plugins/tpm b/.config/tmux/plugins/tpm new file mode 160000 index 0000000..99469c4 --- /dev/null +++ b/.config/tmux/plugins/tpm @@ -0,0 +1 @@ +Subproject commit 99469c4a9b1ccf77fade25842dc7bafbc8ce9946 diff --git a/.config/tmux/plugins/vim-tmux-navigator b/.config/tmux/plugins/vim-tmux-navigator new file mode 160000 index 0000000..38b1d04 --- /dev/null +++ b/.config/tmux/plugins/vim-tmux-navigator @@ -0,0 +1 @@ +Subproject commit 38b1d0402c4600543281dc85b3f51884205674b6 diff --git a/.config/tmux/tmux.conf b/.config/tmux/tmux.conf new file mode 100644 index 0000000..00bb0de --- /dev/null +++ b/.config/tmux/tmux.conf @@ -0,0 +1,33 @@ +set-option -sa terminal-overrides ',xterm*:Tc' +set -s escape-time 0 + +unbind-key C-b +set-option -g prefix C-x +bind-key C-x send-prefix + +set -g @plugin 'catppuccin/tmux' +set -g @catppuccin_user 'on' +set -g @plugin 'tmux-plugins/tpm' +set -g @plugin 'tmux-plugins/tmux-yank' +set -g @plugin 'tmux-plugins/tmux-sensible' +set -g @plugin 'christoomey/vim-tmux-navigator' +set -g @plugin 'dreamsofcode-io/catppuccin-tmux' +run '~/.config/tmux/plugins/tpm/tpm' + +set -g mouse on +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 + +unbind '"' +unbind % + +bind - split-window -v -c #{pane_current_path}' +bind _ split-window -h -c #{pane_current_path}' + +bind -r ^ last-window +bind -r k select-pane -U +bind -r j select-pane -D +bind -r h select-pane -L +bind -r l select-pane -R diff --git a/.gitignore b/.gitignore index 5509140..17539d0 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ *.DS_Store +*/tmux/plugins