Merge pull request #23 from nbur4556/fix/postmerge-20260701

Fix/postmerge 20260701

doc/smoketest.md

@@ -0,0 +1,60 @@
+# Smoketest
+
+A manual smoketest checklist to ensure features are working:
+
+## Plugins
+### Default
+- [ ] Whichkey should have accurate keybindings
+    - g -> [G]it
+    - n -> [N]otepad
+    - s -> [S]earch
+    - t -> [T]oggle
+
+### Kickstart
+Kickstart plugins *that are enabled* should be working
+- [ ] Autopairs
+    - Brackets, parenthesis, etc, should automatically close
+- [ ] IndentLine
+    - Should see visual indentation guides for indented lines
+
+### Custom
+Custom plugins should be working
+- [ ] Oil
+    - Shortcut `<leader>-` should open Oil
+- [ ] Snacks
+    - Should load dashboard at start, and `<leader>=` should open dashboard
+    - `<leader>gb` should open the remote git repository in a browser
+    - `<leader>gl` should open lazy git
+    - `<leader>no` should open a scratchpad
+    - `<leader>ns` browses existing notes in scratchpad
+    - `<leader><C-t>` should open a terminal
+- [ ] VimTmuxNavigator
+    - Should be able to navigate between nvim and tmux panes using `<C-j>`, `<C-k>`, `<C-h>`, `<C-l>` for each respective direction
+- [ ] Remote SSHFS
+    - Should be able to remotely access a directory using the `:RemoteSSHFSConnect` command
+- [ ] Guttermarks
+    - Marks (place a mark with `m<char>`) should be displayed in the gutter by their character
+
+### Themes
+- [ ] Catppuccin Theme
+- [ ] Rose Pine Theme
+
+## Settings
+- [ ] Nerd fonts should be enabled
+- [ ] Line numbers should be relative
+- [ ] Virtual Diagnostic Lines (errors/warnings) should be beneath the applicable line
+- [ ] Arrow key navigation should be disabled
+- [ ] Should connect to godot server when running
+
+## LSP
+
+- [ ] LSP, autocomplete, and formatting should work for the following file types
+    - Javascript `.js`, `.jsx`
+    - Typescript `.ts`, `.tsx`
+    - Svelte `.svelte`
+    - C# `.cs`
+    - Lua `.lua`
+- [ ] Mason should ensure that the following tools are installed
+    - Clangd
+    - Pyright
+    - Omnisharp

init.lua

@@ -194,8 +194,8 @@ do
     underline = { severity = { min = vim.diagnostic.severity.WARN } },
 
     -- Can switch between these as you prefer
-    virtual_text = true, -- Text shows up at the end of the line
+    virtual_text = false, -- Text shows up at the end of the line
-    virtual_lines = false, -- Text shows up underneath the line, with virtual lines
+    virtual_lines = true, -- Text shows up underneath the line, with virtual lines
 
     -- Auto open the float, so you can easily read the errors when jumping with `[d` and `]d`
     jump = {
@@ -220,10 +220,10 @@ do
   vim.keymap.set('t', '<Esc><Esc>', '<C-\\><C-n>', { desc = 'Exit terminal mode' })
 
   -- TIP: Disable arrow keys in normal mode
-  -- vim.keymap.set('n', '<left>', '<cmd>echo "Use h to move!!"<CR>')
+  vim.keymap.set('n', '<left>', '<cmd>echo "Use h to move!!"<CR>')
-  -- vim.keymap.set('n', '<right>', '<cmd>echo "Use l to move!!"<CR>')
+  vim.keymap.set('n', '<right>', '<cmd>echo "Use l to move!!"<CR>')
-  -- vim.keymap.set('n', '<up>', '<cmd>echo "Use k to move!!"<CR>')
+  vim.keymap.set('n', '<up>', '<cmd>echo "Use k to move!!"<CR>')
-  -- vim.keymap.set('n', '<down>', '<cmd>echo "Use j to move!!"<CR>')
+  vim.keymap.set('n', '<down>', '<cmd>echo "Use j to move!!"<CR>')
 
   -- Keybinds to make split navigation easier.
   --  Use CTRL+<hjkl> to switch between windows
@@ -372,7 +372,10 @@ do
       { '<leader>s', group = '[S]earch', mode = { 'n', 'v' } },
       { '<leader>t', group = '[T]oggle' },
       { '<leader>h', group = 'Git [H]unk', mode = { 'n', 'v' } }, -- Enable gitsigns recommended keymaps first
+      -- TODO: LSP actions (anything with `gr`) should be with the leader key
       { 'gr', group = 'LSP Actions', mode = { 'n' } },
+      { '<leader>g', group = '[G]it' },
+      { '<leader>n', group = '[N]otepad' },
     },
   }
 
@@ -390,6 +393,9 @@ do
     },
   }
 
+  vim.pack.add { gh 'catppuccin/nvim' }
+  vim.pack.add { gh 'rose-pine/neovim' }
+
   -- 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'.
@@ -416,6 +422,7 @@ do
   --  - va)  - [V]isually select [A]round [)]paren
   --  - yiiq - [Y]ank [I]nside [I]+1 [Q]uote
   --  - ci'  - [C]hange [I]nside [']quote
+  --FIX: mini.ai does not seem to be working correctly. Conflicts?
   require('mini.ai').setup {
     -- NOTE: Avoid conflicts with the built-in incremental selection mappings on Neovim>=0.12 (see `:help treesitter-incremental-selection`)
     mappings = {
@@ -430,6 +437,7 @@ do
   -- - saiw) - [S]urround [A]dd [I]nner [W]ord [)]Paren
   -- - sd'   - [S]urround [D]elete [']quotes
   -- - sr)'  - [S]urround [R]eplace [)] [']
+  --FIX: mini.surround does not seem to be working correctly. Conflicts?
   require('mini.surround').setup()
 
   -- Simple and easy statusline.
@@ -693,9 +701,9 @@ do
   --  See `:help lsp-config` for information about keys and how to configure
   ---@type table<string, vim.lsp.Config>
   local servers = {
-    -- clangd = {},
+    clangd = {},
     -- gopls = {},
-    -- pyright = {},
+    pyright = {},
     -- rust_analyzer = {},
     --
     -- Some languages (like typescript) have entire language plugins that can be useful:
@@ -704,6 +712,8 @@ do
     -- But for many setups, the LSP (`ts_ls`) will work just fine
     -- ts_ls = {},
 
+    omnisharp = {}, -- Used to format C# code
+
     stylua = {}, -- Used to format Lua code
 
     -- Special Lua Config, as recommended by neovim help docs
@@ -761,6 +771,9 @@ do
   local ensure_installed = vim.tbl_keys(servers or {})
   vim.list_extend(ensure_installed, {
     -- You can add other tools here that you want Mason to install
+    'clangd',
+    'pyright',
+    'omnisharp',
   })
 
   require('mason-tool-installer').setup { ensure_installed = ensure_installed }

lua/custom/plugins/guttermarks.lua

@@ -1,4 +1 @@
-return {
+vim.pack.add { "https://github.com/dimtion/guttermarks.nvim" }
-  'dimtion/guttermarks.nvim',
-  event = { 'BufReadPost', 'BufNewFile', 'BufWritePre', 'FileType' },
-}

lua/custom/plugins/mini.lua

@@ -1,32 +1,9 @@
-return {
+require('mini.git').setup()
-  'nvim-mini/mini.nvim',
-  config = function()
-    -- Better Around/Inside textobjects
-    --
-    -- Examples:
-    --  - va)  - [V]isually select [A]round [)]paren
-    --  - yinq - [Y]ank [I]nside [N]ext [Q]uote
-    --  - ci'  - [C]hange [I]nside [']quote
-    require('mini.ai').setup { n_lines = 500 }
 
-    -- Add/delete/replace surroundings (brackets, quotes, etc.)
+vim.keymap.set('n', '<leader>ga', '<cmd>Git add -A<CR>', { desc = 'Git add all' })
-    --
+vim.keymap.set('n', '<leader>gc', '<cmd>Git commit<CR>', { desc = 'Git commit' })
-    -- - saiw) - [S]urround [A]dd [I]nner [W]ord [)]Paren
+vim.keymap.set('n', '<leader>gs', '<cmd>Git status<CR>', { desc = 'Git status' })
-    -- - sd'   - [S]urround [D]elete [']quotes
+vim.keymap.set('n', '<leader>gg', '<cmd>Git log --graph --oneline --all<CR>', { desc = 'Git graph' })
-    -- - sr)'  - [S]urround [R]eplace [)] [']
-    require('mini.surround').setup()
 
-    require('mini.move').setup()
+require('mini.move').setup()
-    require('mini.git').setup()
+-- usage: Alt = directional keys should move the line in normal mode
-
-    local statusline = require 'mini.statusline'
-    statusline.setup { use_icons = vim.g.have_nerd_font }
-    ---@diagnostic disable-next-line: duplicate-set-field
-    statusline.section_location = function() return '%2l:%-2v' end
-
-    vim.keymap.set('n', '<leader>ga', '<cmd>Git add -A<CR>', { desc = 'Git add all' })
-    vim.keymap.set('n', '<leader>gc', '<cmd>Git commit<CR>', { desc = 'Git commit' })
-    vim.keymap.set('n', '<leader>gs', '<cmd>Git status<CR>', { desc = 'Git status' })
-    vim.keymap.set('n', '<leader>gg', '<cmd>Git log --graph --oneline --all<CR>', { desc = 'Git graph' })
-  end,
-}

lua/custom/plugins/oil.lua

@@ -1,7 +1,4 @@
-return {
+vim.pack.add { 'https://github.com/stevearc/oil.nvim' }
-  'stevearc/oil.nvim',
+require('oil').setup {
-  config = function()
+  vim.keymap.set('n', '-', '<CMD>Oil<CR>', { desc = 'Open parent directory' }),
-    require('oil').setup()
-    vim.keymap.set('n', '-', '<CMD>Oil<CR>', { desc = 'Open parent directory' })
-  end,
 }

lua/custom/plugins/remote-sshfs.lua

@@ -1,8 +1,5 @@
-return {
+vim.pack.add { "https://github.com/nosduco/remote-sshfs.nvim"}
-  'nosduco/remote-sshfs.nvim',
+require('remote-sshfs').setup()
-  dependencies = { 'nvim-telescope/telescope.nvim', 'nvim-lua/plenary.nvim' },
-  opts = {},
-}
 
 -- Usage: :RemoteSSHFSConnect <user>@<ipaddress>:/path/to/file
 -- Sometimes you have to force close, and that causes permission failed on reconnect.

lua/custom/plugins/snacks.lua

@@ -1,24 +1,23 @@
-return {
+--TODO: design a style and features for my dashboard (add opening parent directory with Oil)
-  'folke/snacks.nvim',
+--TODO: determine a method for deleting scratches easily
-  priority = 1000,
+vim.pack.add { 'https://github.com/folke/snacks.nvim' }
-  lazy = false,
+require('snacks').setup {
-  ---@type snacks.Config
+  dashboard = {
-  opts = {
+    enabled = true,
-    --TODO: Use this for a bit and compare to mini dashboard
+    sections = {
-    --TODO: design a style and featuers for my dashboard (add opening parent directory with Oil)
+      { section = 'header' },
-    dashboard = { enabled = true },
+      { section = 'keys', gap = 1, padding = 1 },
+    },
+  },
   gitbrowse = { enabled = true },
   lazygit = { enabled = true },
-    --TODO: determine a method for deleting scratches easily
   scratch = { enabled = true },
   terminal = { enabled = true },
-  },
-  keys = {
-    { '<leader>=', function() Snacks.dashboard.open() end, desc = 'Dashboard' },
-    { '<leader>gb', function() Snacks.gitbrowse.open() end, desc = 'Open Git Repository in Browser' },
-    { '<leader>gl', function() Snacks.lazygit.open() end, desc = 'Open Lazy Git' },
-    { '<leader>no', function() Snacks.scratch() end, desc = 'Open Notepad' },
-    { '<leader>ns', function() Snacks.scratch.select() end, desc = 'Select Note' },
-    { '<leader><C-t>', function() Snacks.terminal() end, desc = 'Open Terminal' },
-  },
 }
+
+vim.keymap.set('n', '<leader>=', function() Snacks.dashboard.open() end, { desc = 'Dashboard' })
+vim.keymap.set('n', '<leader>gb', function() Snacks.gitbrowse.open() end, { desc = 'Open [G]it Repository in [B]rowser' })
+vim.keymap.set('n', '<leader>gl', function() Snacks.lazygit.open() end, { desc = 'Open [L]azy [G]it' })
+vim.keymap.set('n', '<leader>no', function() Snacks.scratch() end, { desc = '[O]pen [N]otepad' })
+vim.keymap.set('n', '<leader>ns', function() Snacks.scratch.select() end, { desc = '[S]elect [N]ote' })
+vim.keymap.set('n', '<leader><C-t>', function() Snacks.terminal() end, { desc = 'Open [T]erminal' })

lua/custom/plugins/typescript-tools.lua

@@ -1,5 +1,2 @@
-return {
+vim.pack.add { 'https://github.com/pmizio/typescript-tools.nvim' }
-  'pmizio/typescript-tools.nvim',
+require('typescript-tools').setup {}
-  dependencies = { 'nvim-lua/plenary.nvim', 'neovim/nvim-lspconfig' },
-  opts = {},
-}

lua/custom/plugins/vimtmuxnavigator.lua

@@ -1,3 +1 @@
-return {
+vim.pack.add { 'https://github.com/christoomey/vim-tmux-navigator' }
-  'christoomey/vim-tmux-navigator',
-}