Extended git

doc/smoketest.md

@@ -0,0 +1,72 @@
+# Smoketest
+
+A manual smoketest checklist to ensure features are working:
+
+## Plugins
+### Default
+- [ ] Whichkey groups should have accurate keybindings
+    - c -> LSP: [C]ode
+    - g -> [G]it
+    - n -> [N]otepad
+    - r -> [R]e[N]ame
+    - s -> [S]earch
+    - t -> [T]oggle
+
+### Kickstart
+Kickstart plugins *that are enabled* should be working
+- [ ] Autopairs
+    - Brackets, parenthesis, etc, should automatically close
+- [ ] Git Signs
+    - `<leader>ghs` should stage a hunk of changes
+    - `<leader>ghr` should reset a hunk of changes
+    - `<leader>ghS` should stage a buffer of changes
+    - `<leader>ghR` should reset a buffer of changes
+    - `<leader>ghp` should preview changes in a git hunk
+    - `<leader>gb` should show the git blame line
+    - `<leader>gd` should show the git diff since the index
+    - `<leader>gD` should show the git diff since the last commit
+- [ ] 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>gr` 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
+- [ ] Files should format on save
+
+## 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

@@ -99,7 +99,7 @@ do
   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`
@@ -110,7 +110,10 @@ do
   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
+
+  -- Set to nowrap //TODO: can this be in a separate file than the init.lua to avoid conflicts with upstream?
+  vim.o.wrap = false
 
   -- Enable mouse mode, can be useful for resizing splits for example!
   vim.o.mouse = 'a'
@@ -194,8 +197,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_lines = false, -- Text shows up underneath the line, with virtual lines
+    virtual_text = false, -- Text shows up at the end of the line
+    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 +223,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', '<right>', '<cmd>echo "Use l 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', '<left>', '<cmd>echo "Use h 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', '<down>', '<cmd>echo "Use j to move!!"<CR>')
 
   -- Keybinds to make split navigation easier.
   --  Use CTRL+<hjkl> to switch between windows
@@ -371,8 +374,13 @@ do
     spec = {
       { '<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
-      { 'gr', group = 'LSP Actions', mode = { 'n' } },
+      { '<leader>g', group = '[G]it' },
+      { '<leader>gh', group = '[G]it [H]unk', mode = { 'n', 'v' } }, -- Enable gitsigns recommended keymaps first
+      { '<leader>gt', group = '[G]it [T]oggle', mode = { 'n', 'v' } }, -- Enable gitsigns recommended keymaps first
+      { '<leader>n', group = '[N]otepad' },
+      { '<leader>r', group = '[R]e[N]ame', mode = { 'n' } },
+      { '<leader>c', group = 'LSP: [C]ode', mode = { 'n' } },
+      { '<leader>cg', group = 'LSP: [G]oto', mode = { 'n' } },
     },
   }
 
@@ -390,10 +398,13 @@ 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'.
-  vim.cmd.colorscheme 'tokyonight-night'
+  vim.cmd.colorscheme 'rose-pine'
 
   -- Highlight todo, notes, etc in comments
   vim.pack.add { gh 'folke/todo-comments.nvim' }
@@ -416,6 +427,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 +442,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.
@@ -531,29 +544,29 @@ do
       local buf = event.buf
 
       -- Find references for the word under your cursor.
-      vim.keymap.set('n', 'grr', builtin.lsp_references, { buffer = buf, desc = '[G]oto [R]eferences' })
+      vim.keymap.set('n', '<leader>cgr', builtin.lsp_references, { buffer = buf, desc = '[G]oto [R]eferences' })
 
       -- Jump to the implementation of the word under your cursor.
       -- Useful when your language has ways of declaring types without an actual implementation.
-      vim.keymap.set('n', 'gri', builtin.lsp_implementations, { buffer = buf, desc = '[G]oto [I]mplementation' })
+      vim.keymap.set('n', '<leader>cgi', builtin.lsp_implementations, { buffer = buf, desc = '[G]oto [I]mplementation' })
 
       -- Jump to the definition of the word under your cursor.
       -- This is where a variable was first declared, or where a function is defined, etc.
       -- To jump back, press <C-t>.
-      vim.keymap.set('n', 'grd', builtin.lsp_definitions, { buffer = buf, desc = '[G]oto [D]efinition' })
+      vim.keymap.set('n', '<leader>cgd', builtin.lsp_definitions, { buffer = buf, desc = '[G]oto [D]efinition' })
 
       -- Fuzzy find all the symbols in your current document.
       -- Symbols are things like variables, functions, types, etc.
-      vim.keymap.set('n', 'gO', builtin.lsp_document_symbols, { buffer = buf, desc = 'Open Document Symbols' })
+      vim.keymap.set('n', '<leader>cgO', builtin.lsp_document_symbols, { buffer = buf, desc = 'Open Document Symbols' })
 
       -- Fuzzy find all the symbols in your current workspace.
       -- Similar to document symbols, except searches over your entire project.
-      vim.keymap.set('n', 'gW', builtin.lsp_dynamic_workspace_symbols, { buffer = buf, desc = 'Open Workspace Symbols' })
+      vim.keymap.set('n', '<leader>cgW', builtin.lsp_dynamic_workspace_symbols, { buffer = buf, desc = 'Open Workspace Symbols' })
 
       -- Jump to the type of the word under your cursor.
       -- Useful when you're not sure what type a variable is and you want to see
       -- the definition of its *type*, not where it was *defined*.
-      vim.keymap.set('n', 'grt', builtin.lsp_type_definitions, { buffer = buf, desc = '[G]oto [T]ype Definition' })
+      vim.keymap.set('n', '<leader>cgt', builtin.lsp_type_definitions, { buffer = buf, desc = '[G]oto [T]ype Definition' })
     end,
   })
 
@@ -638,15 +651,15 @@ do
 
       -- Rename the variable under your cursor.
       --  Most Language Servers support renaming across files, etc.
-      map('grn', vim.lsp.buf.rename, '[R]e[n]ame')
-
+      map('<leader>rn', vim.lsp.buf.rename, '[R]e[n]ame')
       -- Execute a code action, usually your cursor needs to be on top of an error
+
       -- or a suggestion from your LSP for this to activate.
-      map('gra', vim.lsp.buf.code_action, '[G]oto Code [A]ction', { 'n', 'x' })
+      map('<leader>ca', vim.lsp.buf.code_action, '[C]ode [A]ction', { 'n', 'x' })
 
       -- WARN: This is not Goto Definition, this is Goto Declaration.
       --  For example, in C this would take you to the header.
-      map('grD', vim.lsp.buf.declaration, '[G]oto [D]eclaration')
+      map('<leader>cgD', vim.lsp.buf.declaration, '[G]oto [D]eclaration')
 
       -- The following two autocommands are used to highlight references of the
       -- word under your cursor when your cursor rests there for a little while.
@@ -692,9 +705,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:
@@ -703,6 +716,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
@@ -760,6 +775,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 }
@@ -782,8 +800,13 @@ do
     format_on_save = function(bufnr)
       -- You can specify filetypes to autoformat on save here:
       local enabled_filetypes = {
-        -- lua = true,
-        -- python = true,
+        lua = true,
+        javascript = true,
+        typescript = true,
+        typescriptreact = true,
+        cs = true,
+        --TODO: not getting any lsp completion for svelte files
+        svelte = true,
       }
       if enabled_filetypes[vim.bo[bufnr].filetype] then
         return { timeout_ms = 500 }
@@ -802,6 +825,11 @@ do
       --
       -- You can use 'stop_after_first' to run the first available formatter from the list
       -- javascript = { "prettierd", "prettier", stop_after_first = true },
+      json = { 'prettierd', 'prettier', stop_after_first = true },
+      javascript = { 'prettierd', 'prettier', stop_after_first = true },
+      typescript = { 'prettierd', 'prettier', stop_after_first = true },
+      typescriptreact = { 'prettierd', 'prettier', stop_after_first = true },
+      svelte = { 'prettierd', 'prettier', stop_after_first = true },
     },
   }
 
@@ -967,17 +995,23 @@ do
   --  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 recommended keymaps
+  require 'kickstart.plugins.gitsigns' -- adds gitsigns recommended keymaps
 
   -- NOTE: You can add your own plugins, configuration, etc from `lua/custom/plugins/*.lua`
   --
   --  Uncomment the following line and add your plugins to `lua/custom/plugins/*.lua` to get going.
-  -- require 'custom.plugins'
+  require 'custom.plugins'
 end
 
+-- FIX: godot-server: should check if the server is already running first...
+local gdprojectfilepath = vim.fn.getcwd() .. '/project.godot'
+local isInGdDirectory = vim.fn.filereadable(gdprojectfilepath) == 1
+
+if isInGdDirectory then vim.fn.serverstart '127.0.0.1:55432' end
+
 -- The line beneath this is called `modeline`. See `:help modeline`
 -- vim: ts=2 sts=2 sw=2 et

lua/custom/plugins/guttermarks.lua

@@ -0,0 +1 @@
+vim.pack.add { "https://github.com/dimtion/guttermarks.nvim" }

lua/custom/plugins/mini.lua

@@ -0,0 +1,9 @@
+require('mini.git').setup()
+
+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' })
+
+require('mini.move').setup()
+-- usage: Alt = directional keys should move the line in normal mode

lua/custom/plugins/oil.lua

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

lua/custom/plugins/remote-sshfs.lua

@@ -0,0 +1,7 @@
+vim.pack.add { "https://github.com/nosduco/remote-sshfs.nvim"}
+require('remote-sshfs').setup()
+
+-- Usage: :RemoteSSHFSConnect <user>@<ipaddress>:/path/to/file
+-- Sometimes you have to force close, and that causes permission failed on reconnect.
+-- When that happens DO NOT DELETE THE DIRECTORY under .sshfd. That will delete everything that mountpoint is connected to *at the connection*
+-- Instead safely unmount with `umount -l ~/.sshfd/[MOUNT_POINT]`

lua/custom/plugins/snacks.lua

@@ -0,0 +1,23 @@
+--TODO: design a style and features for my dashboard (add opening parent directory with Oil)
+--TODO: determine a method for deleting scratches easily
+vim.pack.add { 'https://github.com/folke/snacks.nvim' }
+require('snacks').setup {
+  dashboard = {
+    enabled = true,
+    sections = {
+      { section = 'header' },
+      { section = 'keys', gap = 1, padding = 1 },
+    },
+  },
+  gitbrowse = { enabled = true },
+  lazygit = { enabled = true },
+  scratch = { enabled = true },
+  terminal = { enabled = true },
+}
+
+vim.keymap.set('n', '<leader>=', function() Snacks.dashboard.open() end, { desc = 'Dashboard' })
+vim.keymap.set('n', '<leader>gr', function() Snacks.gitbrowse.open() end, { desc = 'Open [G]it [R]emore Repository in Browser' })
+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

@@ -0,0 +1,2 @@
+vim.pack.add { 'https://github.com/pmizio/typescript-tools.nvim' }
+require('typescript-tools').setup {}

lua/custom/plugins/vimtmuxnavigator.lua

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