From 1772a26fa0acd16f215d42be1f6302fc25dabf97 Mon Sep 17 00:00:00 2001 From: Arpan Swaroop Date: Tue, 14 Jan 2025 12:12:30 -0600 Subject: [PATCH 1/8] configuring thinkpad rebase merge conflicts idk --- init.lua | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/init.lua b/init.lua index b98ffc6198a..b5e25e02303 100644 --- a/init.lua +++ b/init.lua @@ -91,7 +91,7 @@ vim.g.mapleader = ' ' vim.g.maplocalleader = ' ' -- Set to true if you have a Nerd Font installed and selected in the terminal -vim.g.have_nerd_font = false +vim.g.have_nerd_font = true -- [[ Setting options ]] -- See `:help vim.o` @@ -102,7 +102,7 @@ vim.g.have_nerd_font = false vim.o.number = true -- You can also add relative line numbers, to help with jumping. -- Experiment for yourself to see if you like it! --- vim.o.relativenumber = true +vim.o.relativenumber = true -- Enable mouse mode, can be useful for resizing splits for example! vim.o.mouse = 'a' @@ -173,6 +173,8 @@ vim.o.confirm = true -- See `:help hlsearch` vim.keymap.set('n', '', 'nohlsearch') +vim.keymap.set('i', 'kj', '') + -- Diagnostic keymaps vim.keymap.set('n', 'q', vim.diagnostic.setloclist, { desc = 'Open diagnostic [Q]uickfix list' }) @@ -881,20 +883,17 @@ require('lazy').setup({ -- change the command in the config to whatever the name of that colorscheme is. -- -- If you want to see what colorschemes are already installed, you can use `:Telescope colorscheme`. - 'folke/tokyonight.nvim', + 'ellisonleao/gruvbox.nvim', priority = 1000, -- Make sure to load this before all the other start plugins. - config = function() - ---@diagnostic disable-next-line: missing-fields - require('tokyonight').setup { - styles = { - comments = { italic = false }, -- Disable italics in comments - }, - } - + opts = { transparent_mode = false }, + init = function() -- Load the colorscheme here. -- Like many other themes, this one has different styles, and you could load -- any other, such as 'tokyonight-storm', 'tokyonight-moon', or 'tokyonight-day'. - vim.cmd.colorscheme 'tokyonight-night' + vim.cmd.colorscheme 'gruvbox' + + -- You can configure highlights by doing something like: + vim.cmd.hi 'Comment gui=none' end, }, From 25ac5e35843a3ab8e3f29bbd43f67d6870439019 Mon Sep 17 00:00:00 2001 From: Arpan Swaroop Date: Tue, 14 Jan 2025 12:31:44 -0600 Subject: [PATCH 2/8] added oil to nvim config rebase merge conflicts --- init.lua | 10 ++++++---- lua/custom/plugins/init.lua | 16 +++++++++++++++- 2 files changed, 21 insertions(+), 5 deletions(-) diff --git a/init.lua b/init.lua index b5e25e02303..3b117093149 100644 --- a/init.lua +++ b/init.lua @@ -173,7 +173,9 @@ vim.o.confirm = true -- See `:help hlsearch` vim.keymap.set('n', '', 'nohlsearch') +-- CUSTOM KEYMAPS MOVE TO SEPERATE FILE PLEASE!!!!! vim.keymap.set('i', 'kj', '') +vim.keymap.set('n', '-', 'Oil', { desc = 'Open Parent Directory' }) -- Diagnostic keymaps vim.keymap.set('n', 'q', vim.diagnostic.setloclist, { desc = 'Open diagnostic [Q]uickfix list' }) @@ -973,17 +975,17 @@ require('lazy').setup({ -- Uncomment any of the lines below to enable them (you will need to restart nvim). -- -- require 'kickstart.plugins.debug', - -- require 'kickstart.plugins.indent_line', + require 'kickstart.plugins.indent_line', -- require 'kickstart.plugins.lint', - -- require 'kickstart.plugins.autopairs', + require 'kickstart.plugins.autopairs', -- require 'kickstart.plugins.neo-tree', - -- require 'kickstart.plugins.gitsigns', -- adds gitsigns recommend keymaps + require 'kickstart.plugins.gitsigns', -- adds gitsigns recommend keymaps -- NOTE: The import below can automatically add your own plugins, configuration, etc from `lua/custom/plugins/*.lua` -- This is the easiest way to modularize your config. -- -- Uncomment the following line and add your plugins to `lua/custom/plugins/*.lua` to get going. - -- { import = 'custom.plugins' }, + { import = 'custom.plugins' }, -- -- For additional information with loading, sourcing and examples see `:help lazy.nvim-🔌-plugin-spec` -- Or use telescope! diff --git a/lua/custom/plugins/init.lua b/lua/custom/plugins/init.lua index be0eb9d8d7a..f331fb5e948 100644 --- a/lua/custom/plugins/init.lua +++ b/lua/custom/plugins/init.lua @@ -2,4 +2,18 @@ -- I promise not to create any merge conflicts in this directory :) -- -- See the kickstart.nvim README for more information -return {} +return { + { + 'stevearc/oil.nvim', + opts = {}, + dependencies = { { 'echasnovski/mini.icons', opts = {} } }, + config = function() + require('oil').setup { + default_file_explorer = true, + view_options = { + show_hidden = true, + }, + } + end, + }, +} From 22a7d62bcf0fc997d695c1fc5b931e2c603a1c05 Mon Sep 17 00:00:00 2001 From: Arpan Swaroop Date: Thu, 23 Jan 2025 13:10:03 -0600 Subject: [PATCH 3/8] ayo added a plugin --- init.lua | 7 ++++--- lua/custom/plugins/init.lua | 18 ++++++++++++++++++ 2 files changed, 22 insertions(+), 3 deletions(-) diff --git a/init.lua b/init.lua index 3b117093149..6c752219776 100644 --- a/init.lua +++ b/init.lua @@ -885,14 +885,15 @@ require('lazy').setup({ -- change the command in the config to whatever the name of that colorscheme is. -- -- If you want to see what colorschemes are already installed, you can use `:Telescope colorscheme`. - 'ellisonleao/gruvbox.nvim', + 'rose-pine/neovim', priority = 1000, -- Make sure to load this before all the other start plugins. - opts = { transparent_mode = false }, + -- opts = { variant = 'auto', dark_variant = 'main' }, + init = function() -- Load the colorscheme here. -- Like many other themes, this one has different styles, and you could load -- any other, such as 'tokyonight-storm', 'tokyonight-moon', or 'tokyonight-day'. - vim.cmd.colorscheme 'gruvbox' + vim.cmd.colorscheme 'rose-pine' -- You can configure highlights by doing something like: vim.cmd.hi 'Comment gui=none' diff --git a/lua/custom/plugins/init.lua b/lua/custom/plugins/init.lua index f331fb5e948..8c99156ff4c 100644 --- a/lua/custom/plugins/init.lua +++ b/lua/custom/plugins/init.lua @@ -16,4 +16,22 @@ return { } end, }, + { + 'christoomey/vim-tmux-navigator', + cmd = { + 'TmuxNavigateLeft', + 'TmuxNavigateDown', + 'TmuxNavigateUp', + 'TmuxNavigateRight', + 'TmuxNavigatePrevious', + 'TmuxNavigatorProcessList', + }, + keys = { + { '', 'TmuxNavigateLeft' }, + { '', 'TmuxNavigateDown' }, + { '', 'TmuxNavigateUp' }, + { '', 'TmuxNavigateRight' }, + { '', 'TmuxNavigatePrevious' }, + }, + }, } From db7c57ad84f6dd8a382229c186682a417787316c Mon Sep 17 00:00:00 2001 From: Arpan Swaroop Date: Thu, 23 Jan 2025 13:23:11 -0600 Subject: [PATCH 4/8] added undotree --- init.lua | 3 ++- lua/custom/plugins/init.lua | 3 +++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/init.lua b/init.lua index 6c752219776..47f684cff79 100644 --- a/init.lua +++ b/init.lua @@ -176,6 +176,7 @@ vim.keymap.set('n', '', 'nohlsearch') -- CUSTOM KEYMAPS MOVE TO SEPERATE FILE PLEASE!!!!! vim.keymap.set('i', 'kj', '') vim.keymap.set('n', '-', 'Oil', { desc = 'Open Parent Directory' }) +vim.keymap.set('n', 'u', vim.cmd.UndotreeToggle) -- Diagnostic keymaps vim.keymap.set('n', 'q', vim.diagnostic.setloclist, { desc = 'Open diagnostic [Q]uickfix list' }) @@ -893,7 +894,7 @@ require('lazy').setup({ -- Load the colorscheme here. -- Like many other themes, this one has different styles, and you could load -- any other, such as 'tokyonight-storm', 'tokyonight-moon', or 'tokyonight-day'. - vim.cmd.colorscheme 'rose-pine' + vim.cmd.colorscheme 'rose-pine-moon' -- You can configure highlights by doing something like: vim.cmd.hi 'Comment gui=none' diff --git a/lua/custom/plugins/init.lua b/lua/custom/plugins/init.lua index 8c99156ff4c..3da3cb0a441 100644 --- a/lua/custom/plugins/init.lua +++ b/lua/custom/plugins/init.lua @@ -34,4 +34,7 @@ return { { '', 'TmuxNavigatePrevious' }, }, }, + { + 'mbbill/undotree', + }, } From 441b2012d23f8e5f90eef0c02a90ce56836a4df6 Mon Sep 17 00:00:00 2001 From: Arpan Swaroop Date: Thu, 23 Jan 2025 15:07:38 -0600 Subject: [PATCH 5/8] added rust analyzer --- init.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/init.lua b/init.lua index 47f684cff79..20dc082ce72 100644 --- a/init.lua +++ b/init.lua @@ -679,7 +679,7 @@ require('lazy').setup({ -- clangd = {}, -- gopls = {}, -- pyright = {}, - -- rust_analyzer = {}, + rust_analyzer = {}, -- ... etc. See `:help lspconfig-all` for a list of all the pre-configured LSPs -- -- Some languages (like typescript) have entire language plugins that can be useful: From 7e04c35b3f46f328c3b53a1e274375ecad5e902d Mon Sep 17 00:00:00 2001 From: Arpan Swaroop Date: Wed, 5 Feb 2025 16:14:59 -0600 Subject: [PATCH 6/8] added vimtex, dont remember configuration arghhhhhh --- init.lua | 4 ++-- lua/custom/plugins/init.lua | 9 +++++++++ 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/init.lua b/init.lua index 20dc082ce72..6704655b2d0 100644 --- a/init.lua +++ b/init.lua @@ -947,9 +947,9 @@ require('lazy').setup({ main = 'nvim-treesitter.configs', -- Sets main module to use for opts -- [[ Configure Treesitter ]] See `:help nvim-treesitter` opts = { - ensure_installed = { 'bash', 'c', 'diff', 'html', 'lua', 'luadoc', 'markdown', 'markdown_inline', 'query', 'vim', 'vimdoc' }, + ensure_installed = { 'bash', 'c', 'diff', 'html', 'lua', 'luadoc', 'markdown', 'markdown_inline', 'query', 'vim', 'vimdoc', 'rust', 'python' }, -- Autoinstall languages that are not installed - auto_install = true, + auto_install = false, highlight = { enable = true, -- Some languages depend on vim's regex highlighting system (such as Ruby) for indent rules. diff --git a/lua/custom/plugins/init.lua b/lua/custom/plugins/init.lua index 3da3cb0a441..335d58c3dba 100644 --- a/lua/custom/plugins/init.lua +++ b/lua/custom/plugins/init.lua @@ -37,4 +37,13 @@ return { { 'mbbill/undotree', }, + { + 'lervag/vimtex', + lazy = false, -- we don't want to lazy load VimTeX + -- tag = "v2.15", -- uncomment to pin to a specific release + init = function() + -- VimTeX configuration goes here, e.g. + vim.g.vimtex_view_method = 'zathura' + end, + }, } From cccecc9a35b7bc3d8dd003753cd069bac68f97c1 Mon Sep 17 00:00:00 2001 From: Arpan Swaroop Date: Wed, 5 Feb 2025 16:20:32 -0600 Subject: [PATCH 7/8] yayyyy got vimtex to work properly now, opens up zathura --- init.lua | 2 +- lua/custom/plugins/init.lua | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/init.lua b/init.lua index 6704655b2d0..a883dce5e87 100644 --- a/init.lua +++ b/init.lua @@ -88,7 +88,7 @@ P.S. You can delete this when you're done too. It's your config now! :) -- See `:help mapleader` -- NOTE: Must happen before plugins are loaded (otherwise wrong leader will be used) vim.g.mapleader = ' ' -vim.g.maplocalleader = ' ' +vim.g.maplocalleader = ',' -- Set to true if you have a Nerd Font installed and selected in the terminal vim.g.have_nerd_font = true diff --git a/lua/custom/plugins/init.lua b/lua/custom/plugins/init.lua index 335d58c3dba..5362c6d3e04 100644 --- a/lua/custom/plugins/init.lua +++ b/lua/custom/plugins/init.lua @@ -44,6 +44,7 @@ return { init = function() -- VimTeX configuration goes here, e.g. vim.g.vimtex_view_method = 'zathura' + vim.g.vimtex_compiler_method = 'pdflatex' end, }, } From 85e9f96d66f5e168d728db996f7815ab72fdb2cd Mon Sep 17 00:00:00 2001 From: Arpan Swaroop Date: Thu, 21 May 2026 23:34:57 -0400 Subject: [PATCH 8/8] commit to check --- lua/custom/plugins/init.lua | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/lua/custom/plugins/init.lua b/lua/custom/plugins/init.lua index 5362c6d3e04..73f1b48022e 100644 --- a/lua/custom/plugins/init.lua +++ b/lua/custom/plugins/init.lua @@ -36,6 +36,17 @@ return { }, { 'mbbill/undotree', + config = function() + local wk = require 'which-key' + wk.add { + { + 'u', + desc = 'Show undotree', + mode = 'n', + buffer = true, + }, + } + end, }, { 'lervag/vimtex', @@ -46,5 +57,29 @@ return { vim.g.vimtex_view_method = 'zathura' vim.g.vimtex_compiler_method = 'pdflatex' end, + config = function() + local wk = require 'which-key' + vim.api.nvim_create_autocmd('FileType', { + pattern = { 'tex' }, + callback = function() + vim.keymap.set('n', 'm', 'i\\[\\]kA', { buffer = true }) + vim.keymap.set('n', 'p', 'i\\begin{pmatrix}\\end{pmatrix}kA', { buffer = true }) + end, + }) + wk.add { + { + 'm', + desc = 'Insert display math block', + mode = 'n', + buffer = true, + }, + { + 'p', + desc = 'Insert pmatrix block', + mode = 'n', + buffer = true, + }, + } + end, }, }