.github/pull_request_template.md

@@ -1,8 +0,0 @@
-***************************************************************************
-**NOTE**
-Please verify that the `base repository` above has the intended destination!
-Github by default opens Pull Requests against the parent of a forked repository.
-If this is your personal fork and you didn't intend to open a PR for contribution
-to the original project then adjust the `base repository` accordingly.
-**************************************************************************
-

README.md

@@ -15,6 +15,9 @@ If you are experiencing issues, please make sure you have the latest versions.
 
 ### Install External Dependencies
 
+> **NOTE**
+> [Backup](#FAQ) your previous configuration (if any exists)
+
 External Requirements:
 - Basic utils: `git`, `make`, `unzip`, C Compiler (`gcc`)
 - [ripgrep](https://github.com/BurntSushi/ripgrep#installation)
@@ -27,11 +30,6 @@ External Requirements:
 > See [Install Recipes](#Install-Recipes) for additional Windows and Linux specific notes
 > and quick install snippets
 
-### Install Kickstart
-
-> **NOTE**
-> [Backup](#FAQ) your previous configuration (if any exists)
-
 Neovim's configurations are located under the following paths, depending on your OS:
 
 | OS | PATH |
@@ -81,7 +79,7 @@ nvim
 ```
 
 That's it! Lazy will install all the plugins you have. Use `:Lazy` to view
-current plugin status. Hit `q` to close the window.
+current plugin status.
 
 ### FAQ
 

init.lua

@@ -6,9 +6,6 @@ vim.g.maplocalleader = ' '
 -- Set to true if you have a Nerd Font installed
 vim.g.have_nerd_font = true
 
--- Save start directory as base
-vim.g.base_dir = vim.fn.getcwd()
-
 -- [[ Setting options ]]
 require 'options'
 

lua/custom/plugins/harpoon.lua

@@ -32,15 +32,11 @@ return {
     -- Open harpoon list window
     vim.keymap.set('n', '<leader>ho', function()
       toggle_telescope(harpoon:list())
-    end, { desc = '[H]arpoon [O]pen' })
+    end, { desc = '[H]arpoon [Open]' })
     -- Append to harpoon list
     vim.keymap.set('n', '<leader>ha', function()
       harpoon:list():append()
     end, { desc = '[H]arpoon [A]ppend' })
-    -- Append to harpoon list
-    vim.keymap.set('n', '<leader>hr', function()
-      harpoon:list():remove()
-    end, { desc = '[H]arpoon [R]emove' })
     -- Toggle previous & next buffers stored within Harpoon list
     vim.keymap.set('n', '<C-S-P>', function()
       harpoon:list():prev()

lua/custom/plugins/neoscroll.lua

@@ -1,7 +1,6 @@
 -- Smooth scroll plugin and keymaps
 return {
   'karb94/neoscroll.nvim',
-  enabled = not vim.g.neovide,
   config = function()
     require('neoscroll').setup {
       hide_cursor = false,

lua/keymaps.lua

@@ -38,9 +38,7 @@ vim.keymap.set({ 'n', 'v' }, '<leader>dny', '"_d', { desc = '[D]elete [N]o [Y]an
 vim.keymap.set('v', '<leader>pny', '"_dP', { desc = '[P]aste [N]o [Y]ank' })
 
 -- Populate CMD to prepare for change directory
-vim.keymap.set('n', '<leader>cd ', ':cd ', { desc = 'Prepare CMD for [C]hange [D]irectory' })
--- Navigate to 'base' directory, the initial dir that nvim was run in
-vim.keymap.set('n', '<leader>cdh', '<cmd>cd ' .. vim.g.base_dir .. '<cr>', { desc = '[C]hange [D]irectory to [H]ome' })
+vim.keymap.set('n', '<leader>cd', ':cd ', { desc = 'Prepare CMD for [C]hange [D]irectory' })
 
 -- Delete current buffer without closing window
 vim.keymap.set('n', '<leader>bd', '<cmd>bp<bar>sp<bar>bn<bar>bd<cr>', { desc = '[B]uffer [D]elete' })

lua/kickstart/plugins/conform.lua

@@ -1,17 +1,6 @@
 return {
   { -- Autoformat
     'stevearc/conform.nvim',
-    lazy = false,
-    keys = {
-      {
-        '<leader>f',
-        function()
-          require('conform').format { async = true, lsp_fallback = true }
-        end,
-        mode = '',
-        desc = '[F]ormat buffer',
-      },
-    },
     opts = {
       notify_on_error = false,
       format_on_save = function(bufnr)

lua/kickstart/plugins/debug.lua

@@ -13,14 +13,16 @@ return {
     -- Installs the debug adapters for you
     'williamboman/mason.nvim',
     'jay-babu/mason-nvim-dap.nvim',
+
+    -- Debugger dependencies
+    'leoluz/nvim-dap-go',
   },
   config = function()
     local dap = require 'dap'
     local dapui = require 'dapui'
 
     require('mason-nvim-dap').setup {
-      automatic_installation = true,
-      ensure_installed = {},
+      automatic_setup = true,
       handlers = {},
     }
 

lua/kickstart/plugins/gitsigns.lua

@@ -13,8 +13,7 @@ return {
         delete = { text = '_' },
         topdelete = { text = '‾' },
         changedelete = { text = '~' },
-      },
-      on_attach = function(bufnr)
+      }, on_attach = function(bufnr)
         local gs = package.loaded.gitsigns
 
         local function map(mode, l, r, opts)
@@ -54,8 +53,10 @@ return {
         end, { desc = 'reset git hunk' })
         -- normal mode
         map('n', '<leader>hs', gs.stage_hunk, { desc = 'git stage hunk' })
+        map('n', '<leader>hr', gs.reset_hunk, { desc = 'git reset hunk' })
         map('n', '<leader>hS', gs.stage_buffer, { desc = 'git Stage buffer' })
         map('n', '<leader>hu', gs.undo_stage_hunk, { desc = 'undo stage hunk' })
+        map('n', '<leader>hR', gs.reset_buffer, { desc = 'git Reset buffer' })
         map('n', '<leader>hp', gs.preview_hunk, { desc = 'preview git hunk' })
         map('n', '<leader>hb', function()
           gs.blame_line { full = false }

lua/kickstart/plugins/treesitter.lua

@@ -19,7 +19,6 @@ return {
         'vim',
         'svelte',
         'c_sharp',
-        'luadoc',
         'markdown',
         'gitcommit',
         'gitignore',

lua/kickstart/plugins/which-key.lua

@@ -28,7 +28,6 @@ return {
         ['<leader>g'] = { name = '[G]it', _ = 'which_key_ignore' },
         ['<leader>b'] = { name = '[B]uffer/[B]reakpoint', _ = 'which_key_ignore' },
         ['<leader>c'] = { name = '[C]ode/[C]odeium', _ = 'which_key_ignore' },
-        ['<leader>cd'] = { name = '[D]irectory', _ = 'which_key_ignore' },
         ['<leader>d'] = { name = '[D]ocument/[D]elete', _ = 'which_key_ignore' },
         ['<leader>h'] = { name = '[H]unk/[H]arpoon', _ = 'which_key_ignore' },
         ['<leader>t'] = { name = '[T]oggle', _ = 'which_key_ignore' },

lua/options.lua

@@ -84,12 +84,4 @@ vim.opt.cursorline = true
 vim.opt.scrolloff = 8
 vim.opt.sidescrolloff = 12
 
--- Options specifically targeted at Neovide
-if vim.g.neovide then
-  vim.o.guifont = 'CaskaydiaCove Nerd Font Mono:h14'
-  vim.g.neovide_hide_mouse_when_typing = true
-  vim.g.neovide_cursor_animation_length = 0
-  vim.g.neovide_cursor_trail_length = 0
-end
-
 -- vim: ts=2 sts=2 sw=2 et