Neovim: Add github copilot

nvim/init.lua

@@ -631,6 +631,8 @@ require('lazy').setup({
           enabled = false,
         },
 
+        -- Rust is autoconfigured by mrcjkb/rustaceanvim
+
         eslint_d = {},
         tailwindcss = {},
 
@@ -671,6 +673,8 @@ require('lazy').setup({
         'stylua', -- Used to format Lua code
         'goimports', -- Used to format Go code
         'gofumpt', -- Used to format Go code
+        -- 'rust_analyzer', -- Do not include manually. Setup by mrcjkb/rustaceanvim
+        'codelldb', -- For debugging Rust
       })
       require('mason-tool-installer').setup { ensure_installed = ensure_installed }
 
@@ -726,6 +730,7 @@ require('lazy').setup({
         lua = { 'stylua' },
         templ = { 'templ' },
         typescript = { 'eslint_d' },
+        --rust = { 'clippy' },
         -- Conform can also run multiple formatters sequentially
         -- python = { "isort", "black" },
         --

nvim/lua/custom/plugins/copilot.lua

@@ -0,0 +1,8 @@
+-- https://github.com/github/copilot.vim
+return {
+  'github/copilot.vim',
+  -- 'zbirenbaum/copilot.lua',
+  -- config = function()
+  --   require('copilot').setup()
+  -- end,
+}

nvim/lua/custom/plugins/rust.lua

@@ -0,0 +1,15 @@
+-- A heavily modified fork of rust-tools.nvim
+-- https://github.com/mrcjkb/rustaceanvim
+--
+-- NOTE: rust-analyzer is installed via rustup
+-- `rustup component add rust-analyzer`
+return {
+  'mrcjkb/rustaceanvim',
+  version = '^5', -- Recommended
+  lazy = false, -- This plugin is already lazy
+  -- init = function()
+  --   -- Configure rustaceanvim here
+  --   vim.g.rustaceanvim = {
+  --   }
+  -- end,
+}

nvim/lua/kickstart/plugins/debug.lua

@@ -21,7 +21,8 @@ return {
     'jay-babu/mason-nvim-dap.nvim',
 
     -- Add your own debuggers here
-    'leoluz/nvim-dap-go',
+    -- 'leoluz/nvim-dap-go',
+    'David-Kunz/jester',
   },
   keys = {
     -- Basic debugging keymaps, feel free to change to your liking!
@@ -104,32 +105,19 @@ return {
       --    Feel free to remove or use ones that you like more! :)
       --    Don't feel like these are good choices.
       icons = { expanded = '▾', collapsed = '▸', current_frame = '*' },
-      controls = {
-        icons = {
-          pause = '⏸',
-          play = '▶',
-          step_into = '⏎',
-          step_over = '⏭',
-          step_out = '⏮',
-          step_back = 'b',
-          run_last = '▶▶',
-          terminate = '⏹',
-          disconnect = '⏏',
-        },
-      },
     }
 
     -- Change breakpoint icons
-    -- vim.api.nvim_set_hl(0, 'DapBreak', { fg = '#e51400' })
-    -- vim.api.nvim_set_hl(0, 'DapStop', { fg = '#ffcc00' })
-    -- local breakpoint_icons = vim.g.have_nerd_font
-    --     and { Breakpoint = '', BreakpointCondition = '', BreakpointRejected = '', LogPoint = '', Stopped = '' }
-    --   or { Breakpoint = '●', BreakpointCondition = '⊜', BreakpointRejected = '⊘', LogPoint = '◆', Stopped = '⭔' }
-    -- for type, icon in pairs(breakpoint_icons) do
-    --   local tp = 'Dap' .. type
-    --   local hl = (type == 'Stopped') and 'DapStop' or 'DapBreak'
-    --   vim.fn.sign_define(tp, { text = icon, texthl = hl, numhl = hl })
-    -- end
+    vim.api.nvim_set_hl(0, 'DapBreak', { fg = '#e51400' })
+    vim.api.nvim_set_hl(0, 'DapStop', { fg = '#ffcc00' })
+    local breakpoint_icons = vim.g.have_nerd_font
+        and { Breakpoint = '', BreakpointCondition = '', BreakpointRejected = '', LogPoint = '', Stopped = '' }
+      or { Breakpoint = '●', BreakpointCondition = '⊜', BreakpointRejected = '⊘', LogPoint = '◆', Stopped = '⭔' }
+    for type, icon in pairs(breakpoint_icons) do
+      local tp = 'Dap' .. type
+      local hl = (type == 'Stopped') and 'DapStop' or 'DapBreak'
+      vim.fn.sign_define(tp, { text = icon, texthl = hl, numhl = hl })
+    end
 
     dap.listeners.after.event_initialized['dapui_config'] = dapui.open
     dap.listeners.before.event_terminated['dapui_config'] = dapui.close
@@ -143,5 +131,12 @@ return {
     --     detached = vim.fn.has 'win32' == 0,
     --   },
     -- }
+
+    require('jester').setup {
+      path_to_jest_run = './node_modules/jest/bin/jest.js', -- used to run tests
+      path_to_jest_debug = './node_modules/jest/bin/jest.js', -- used for debugging
+      args = { '--no-cache', '--coverage', 'false' },
+      runtimeArgs = { '--inspect-brk', '$path_to_jest', '--no-coverage', '--coverage', 'false', '-t', '$result', '--', '$file' },
+    }
   end,
 }

nvim/lua/kickstart/plugins/gitsigns.lua

@@ -53,10 +53,9 @@ return {
           gitsigns.reset_hunk { vim.fn.line '.', vim.fn.line 'v' }
         end, { desc = 'git [r]eset hunk' })
         -- normal mode
-        map('n', '<leader>hs', gitsigns.stage_hunk, { desc = 'git [s]tage hunk' })
+        map('n', '<leader>hs', gitsigns.stage_hunk, { desc = 'git [s]tage or unstage hunk' })
         map('n', '<leader>hr', gitsigns.reset_hunk, { desc = 'git [r]eset hunk' })
         map('n', '<leader>hS', gitsigns.stage_buffer, { desc = 'git [S]tage buffer' })
-        map('n', '<leader>hu', gitsigns.undo_stage_hunk, { desc = 'git [u]ndo stage hunk' })
         map('n', '<leader>hR', gitsigns.reset_buffer, { desc = 'git [R]eset buffer' })
         map('n', '<leader>hp', gitsigns.preview_hunk, { desc = 'git [p]review hunk' })
         map('n', '<leader>hb', gitsigns.blame_line, { desc = 'git [b]lame line' })
@@ -66,7 +65,6 @@ return {
         end, { desc = 'git [D]iff against last commit' })
         -- Toggles
         map('n', '<leader>tb', gitsigns.toggle_current_line_blame, { desc = '[T]oggle git show [b]lame line' })
-        map('n', '<leader>tD', gitsigns.toggle_deleted, { desc = '[T]oggle git show [D]eleted' })
       end,
     },
   },