From 5ed1bc38dc6467a2e69e3b6ad04f9b92f3ca882f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?E=CC=81ric=20NICOLAS?= <ccjmne@gmail.com>
Date: Wed, 30 Oct 2024 16:41:46 +0100
Subject: [PATCH 01/28] Disable linting autocmd for readonly buffers (#1202)
* Disable linting autocmd for readonly buffers
This should avoid linting in buffers outside of the user's control,
having in mind especially the handy LSP pop-ups that describe your
hovered symbol using markdown.
Co-authored-by: Robin Gruyters <2082795+rgruyters@users.noreply.github.com>
* Justify guarding try_lint in readonly buffers
Co-authored-by: Robin Gruyters <2082795+rgruyters@users.noreply.github.com>
---------
Co-authored-by: Robin Gruyters <2082795+rgruyters@users.noreply.github.com>
---
lua/kickstart/plugins/lint.lua | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/lua/kickstart/plugins/lint.lua b/lua/kickstart/plugins/lint.lua
index ca9bc237..907c6bf3 100644
--- a/lua/kickstart/plugins/lint.lua
+++ b/lua/kickstart/plugins/lint.lua
@@ -47,7 +47,12 @@ return {
vim.api.nvim_create_autocmd({ 'BufEnter', 'BufWritePost', 'InsertLeave' }, {
group = lint_augroup,
callback = function()
- lint.try_lint()
+ -- Only run the linter in buffers that you can modify in order to
+ -- avoid superfluous noise, notably within the handy LSP pop-ups that
+ -- describe the hovered symbol using Markdown.
+ if vim.opt_local.modifiable:get() then
+ lint.try_lint()
+ end
end,
})
end,
From fb7f6a1c137ad32eca00926ceefa2b8a69e03d0a Mon Sep 17 00:00:00 2001
From: sam <110125971+samarth-na@users.noreply.github.com>
Date: Wed, 30 Oct 2024 21:19:16 +0530
Subject: [PATCH 02/28] samarth-nagar fix: lazy help tag on line 931 (#1167)
* samarth-nagar fix: lazy help tag on line 931
found in issue #1152
* fixed white space
---------
Co-authored-by: sam <110125971+samarth-nagar@users.noreply.github.com>
---
init.lua | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/init.lua b/init.lua
index ea86b792..e588129f 100644
--- a/init.lua
+++ b/init.lua
@@ -928,8 +928,12 @@ require('lazy').setup({
-- 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.
- -- For additional information, see `:help lazy.nvim-lazy.nvim-structuring-your-plugins`
-- { import = 'custom.plugins' },
+ --
+ -- For additional information with loading, sourcing and examples see `:help lazy.nvim-🔌-plugin-spec`
+ -- Or use telescope!
+ -- In normal mode type `<space>sh` then write `lazy.nvim-plugin`
+ -- you can continue same window with `<space>sr` which resumes last telescope search
}, {
ui = {
-- If you are using a Nerd Font: set icons to an empty table which will use the
From d09d9bc6dc25f3e5de1856a9af4e1af98ab85461 Mon Sep 17 00:00:00 2001
From: gloomy-lemon-debatable
<91877885+gloomy-lemon-debatable@users.noreply.github.com>
Date: Wed, 30 Oct 2024 15:50:27 +0000
Subject: [PATCH 03/28] Change diagnostic symbols if vim.g.have_nerd_font is
true (#1195)
* feat: Change diagnostic symbols if vim.g.have_nerd_font is true
* feat: Comment out changes regarding diagnostic symbols so that only those who want to change them can do so
---------
Co-authored-by: name <email>
---
init.lua | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/init.lua b/init.lua
index e588129f..b58677d1 100644
--- a/init.lua
+++ b/init.lua
@@ -588,6 +588,15 @@ require('lazy').setup({
end,
})
+ -- Change diagnostic symbols in the sign column (gutter)
+ -- if vim.g.have_nerd_font then
+ -- local signs = { Error = '', Warn = '', Hint = '', Info = '' }
+ -- for type, icon in pairs(signs) do
+ -- local hl = 'DiagnosticSign' .. type
+ -- vim.fn.sign_define(hl, { text = icon, texthl = hl, numhl = hl })
+ -- end
+ -- end
+
-- LSP servers and clients are able to communicate to each other what features they support.
-- By default, Neovim doesn't support everything that is in the LSP specification.
-- When you add nvim-cmp, luasnip, etc. Neovim now has *more* capabilities.
From be678aa341bfa88f3b7ad8d85b7b76200d25e15d Mon Sep 17 00:00:00 2001
From: gloomy-lemon-debatable
<91877885+gloomy-lemon-debatable@users.noreply.github.com>
Date: Wed, 30 Oct 2024 17:01:42 +0000
Subject: [PATCH 04/28] Set breakpoint icons and their highlight colors (#1194)
* feat: Set breakpoint icons and their highlight colors
* docs: Delete reference URL (written in PR)
feat: "Break" and "Stop" arguments of vim.api.nvim_set_hl are changed because they are too common nouns
feat: Comment out changes regarding diagnostic symbols so that only those who want to change them can do so
---------
Co-authored-by: name <email>
---
lua/kickstart/plugins/debug.lua | 12 ++++++++++++
1 file changed, 12 insertions(+)
diff --git a/lua/kickstart/plugins/debug.lua b/lua/kickstart/plugins/debug.lua
index 196f2c6d..2226d963 100644
--- a/lua/kickstart/plugins/debug.lua
+++ b/lua/kickstart/plugins/debug.lua
@@ -89,6 +89,18 @@ return {
},
}
+ -- 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
+
dap.listeners.after.event_initialized['dapui_config'] = dapui.open
dap.listeners.before.event_terminated['dapui_config'] = dapui.close
dap.listeners.before.event_exited['dapui_config'] = dapui.close
From 2ba39c69736597b60f6033aa3f8526e7c28343d5 Mon Sep 17 00:00:00 2001
From: Will Winder <wwinder.unh@gmail.com>
Date: Wed, 30 Oct 2024 14:58:52 -0400
Subject: [PATCH 05/28] Remove two because there are more than two. (#1213)
---
init.lua | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/init.lua b/init.lua
index b58677d1..4ce35f4b 100644
--- a/init.lua
+++ b/init.lua
@@ -917,7 +917,7 @@ require('lazy').setup({
-- - Treesitter + textobjects: https://github.com/nvim-treesitter/nvim-treesitter-textobjects
},
- -- The following two comments only work if you have downloaded the kickstart repo, not just copy pasted the
+ -- The following comments only work if you have downloaded the kickstart repo, not just copy pasted the
-- init.lua. If you want these files, they are in the repository, so you can just download them and
-- place them in the correct locations.
From e5dc5f6d1ce598fdbee87e1bbd57062bdc1971b9 Mon Sep 17 00:00:00 2001
From: gloomy-lemon-debatable
<91877885+gloomy-lemon-debatable@users.noreply.github.com>
Date: Wed, 20 Nov 2024 22:37:22 +0900
Subject: [PATCH 06/28] feat: Change to prepare for upcoming deprecation of
configuring diagnostic-signs using sign_define() (#1232)
---
init.lua | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/init.lua b/init.lua
index 4ce35f4b..e3b7b56c 100644
--- a/init.lua
+++ b/init.lua
@@ -590,11 +590,12 @@ require('lazy').setup({
-- Change diagnostic symbols in the sign column (gutter)
-- if vim.g.have_nerd_font then
- -- local signs = { Error = '', Warn = '', Hint = '', Info = '' }
+ -- local signs = { ERROR = '', WARN = '', INFO = '', HINT = '' }
+ -- local diagnostic_signs = {}
-- for type, icon in pairs(signs) do
- -- local hl = 'DiagnosticSign' .. type
- -- vim.fn.sign_define(hl, { text = icon, texthl = hl, numhl = hl })
+ -- diagnostic_signs[vim.diagnostic.severity[type]] = icon
-- end
+ -- vim.diagnostic.config { signs = { text = diagnostic_signs } }
-- end
-- LSP servers and clients are able to communicate to each other what features they support.
From 9dfb1b230f42a56bda0906e4693f4c9c4d5930eb Mon Sep 17 00:00:00 2001
From: Anjishnu Banerjee <107052359+kaezrr@users.noreply.github.com>
Date: Wed, 20 Nov 2024 19:10:51 +0530
Subject: [PATCH 07/28] Fix nvim-dap not lazy loading (#1216)
* Fix nvim-dap not lazy loading
The keys property had local variables 'dap' and 'dap-ui' that used `require` and prevented all DAP related plugins from lazy-loading.
Fixed this by changing keys to a table and substituting the local variables with a lamba function
* Make debug keybind descriptions more consistent
---
lua/kickstart/plugins/debug.lua | 75 +++++++++++++++++++++++----------
1 file changed, 53 insertions(+), 22 deletions(-)
diff --git a/lua/kickstart/plugins/debug.lua b/lua/kickstart/plugins/debug.lua
index 2226d963..753cb0ce 100644
--- a/lua/kickstart/plugins/debug.lua
+++ b/lua/kickstart/plugins/debug.lua
@@ -24,28 +24,59 @@ return {
-- Add your own debuggers here
'leoluz/nvim-dap-go',
},
- keys = function(_, keys)
- local dap = require 'dap'
- local dapui = require 'dapui'
- return {
- -- Basic debugging keymaps, feel free to change to your liking!
- { '<F5>', dap.continue, desc = 'Debug: Start/Continue' },
- { '<F1>', dap.step_into, desc = 'Debug: Step Into' },
- { '<F2>', dap.step_over, desc = 'Debug: Step Over' },
- { '<F3>', dap.step_out, desc = 'Debug: Step Out' },
- { '<leader>b', dap.toggle_breakpoint, desc = 'Debug: Toggle Breakpoint' },
- {
- '<leader>B',
- function()
- dap.set_breakpoint(vim.fn.input 'Breakpoint condition: ')
- end,
- desc = 'Debug: Set Breakpoint',
- },
- -- Toggle to see last session result. Without this, you can't see session output in case of unhandled exception.
- { '<F7>', dapui.toggle, desc = 'Debug: See last session result.' },
- unpack(keys),
- }
- end,
+ keys = {
+ -- Basic debugging keymaps, feel free to change to your liking!
+ {
+ '<F5>',
+ function()
+ require('dap').continue()
+ end,
+ desc = 'Debug: Start/Continue',
+ },
+ {
+ '<F1>',
+ function()
+ require('dap').step_into()
+ end,
+ desc = 'Debug: Step Into',
+ },
+ {
+ '<F2>',
+ function()
+ require('dap').step_over()
+ end,
+ desc = 'Debug: Step Over',
+ },
+ {
+ '<F3>',
+ function()
+ require('dap').step_out()
+ end,
+ desc = 'Debug: Step Out',
+ },
+ {
+ '<leader>b',
+ function()
+ require('dap').toggle_breakpoint()
+ end,
+ desc = 'Debug: Toggle Breakpoint',
+ },
+ {
+ '<leader>B',
+ function()
+ require('dap').set_breakpoint(vim.fn.input 'Breakpoint condition: ')
+ end,
+ desc = 'Debug: Set Breakpoint',
+ },
+ -- Toggle to see last session result. Without this, you can't see session output in case of unhandled exception.
+ {
+ '<F7>',
+ function()
+ require('dapui').toggle()
+ end,
+ desc = 'Debug: See last session result.',
+ },
+ },
config = function()
local dap = require 'dap'
local dapui = require 'dapui'
From 8d1ef972bc32faa86fee21a57f9033b41f612ebb Mon Sep 17 00:00:00 2001
From: Miha <79801427+mihasket@users.noreply.github.com>
Date: Wed, 20 Nov 2024 14:41:50 +0100
Subject: [PATCH 08/28] fix: which-key comment typo (#1227)
---
init.lua | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/init.lua b/init.lua
index e3b7b56c..08717d53 100644
--- a/init.lua
+++ b/init.lua
@@ -279,7 +279,7 @@ require('lazy').setup({
-- set icon mappings to true if you have a Nerd Font
mappings = vim.g.have_nerd_font,
-- If you are using a Nerd Font: set icons.keys to an empty table which will use the
- -- default whick-key.nvim defined Nerd Font icons, otherwise define a string table
+ -- default which-key.nvim defined Nerd Font icons, otherwise define a string table
keys = vim.g.have_nerd_font and {} or {
Up = '<Up> ',
Down = '<Down> ',
From dd9024eb6a4f54f4db82fe5d72e397ae8a25603e Mon Sep 17 00:00:00 2001
From: Joshua <67082011+0x4D5352@users.noreply.github.com>
Date: Sun, 14 Apr 2024 10:27:48 -0500
Subject: [PATCH 09/28] Update README.md
---
README.md | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/README.md b/README.md
index 800ca990..4cd71041 100644
--- a/README.md
+++ b/README.md
@@ -71,7 +71,7 @@ too - it's ignored in the kickstart repo to make maintenance easier, but it's
<details><summary> Linux and Mac </summary>
```sh
-git clone https://github.com/nvim-lua/kickstart.nvim.git "${XDG_CONFIG_HOME:-$HOME/.config}"/nvim
+git clone https://github.com:0x4D5352/my_kickstart.nvim.git "${XDG_CONFIG_HOME:-$HOME/.config}"/nvim
```
</details>
@@ -81,13 +81,13 @@ git clone https://github.com/nvim-lua/kickstart.nvim.git "${XDG_CONFIG_HOME:-$HO
If you're using `cmd.exe`:
```
-git clone https://github.com/nvim-lua/kickstart.nvim.git "%localappdata%\nvim"
+git clone https://github.com:0x4D5352/my_kickstart.nvim.git %userprofile%\AppData\Local\nvim\
```
If you're using `powershell.exe`
```
-git clone https://github.com/nvim-lua/kickstart.nvim.git "${env:LOCALAPPDATA}\nvim"
+git clone https://github.com:0x4D5352/my_kickstart.nvim.git $env:USERPROFILE\AppData\Local\nvim\
```
</details>
From 7023b03281b67b0a02e06ce6c49f5947e55c082c Mon Sep 17 00:00:00 2001
From: Joshua <67082011+0x4D5352@users.noreply.github.com>
Date: Sun, 14 Apr 2024 11:29:20 -0500
Subject: [PATCH 10/28] fix bad git clone quickstart
---
README.md | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/README.md b/README.md
index 4cd71041..a810faea 100644
--- a/README.md
+++ b/README.md
@@ -71,7 +71,7 @@ too - it's ignored in the kickstart repo to make maintenance easier, but it's
<details><summary> Linux and Mac </summary>
```sh
-git clone https://github.com:0x4D5352/my_kickstart.nvim.git "${XDG_CONFIG_HOME:-$HOME/.config}"/nvim
+git clone https://github.com/0x4D5352/my_kickstart.nvim.git "${XDG_CONFIG_HOME:-$HOME/.config}"/nvim
```
</details>
@@ -87,7 +87,7 @@ git clone https://github.com:0x4D5352/my_kickstart.nvim.git %userprofile%\AppDat
If you're using `powershell.exe`
```
-git clone https://github.com:0x4D5352/my_kickstart.nvim.git $env:USERPROFILE\AppData\Local\nvim\
+git clone https://github.com/0x4D5352/my_kickstart.nvim.git $env:USERPROFILE\AppData\Local\nvim\
```
</details>
From f781e66aa677aa426c25ba0fbb7e8bb332f66860 Mon Sep 17 00:00:00 2001
From: Joshua <67082011+0x4D5352@users.noreply.github.com>
Date: Mon, 29 Apr 2024 17:58:10 -0500
Subject: [PATCH 11/28] add new init.lua
---
init.lua | 123 ++++++++++---------------------------------------------
1 file changed, 21 insertions(+), 102 deletions(-)
diff --git a/init.lua b/init.lua
index 08717d53..8c8fdea9 100644
--- a/init.lua
+++ b/init.lua
@@ -1,89 +1,3 @@
---[[
-
-=====================================================================
-==================== READ THIS BEFORE CONTINUING ====================
-=====================================================================
-======== .-----. ========
-======== .----------------------. | === | ========
-======== |.-""""""""""""""""""-.| |-----| ========
-======== || || | === | ========
-======== || KICKSTART.NVIM || |-----| ========
-======== || || | === | ========
-======== || || |-----| ========
-======== ||:Tutor || |:::::| ========
-======== |'-..................-'| |____o| ========
-======== `"")----------------(""` ___________ ========
-======== /::::::::::| |::::::::::\ \ no mouse \ ========
-======== /:::========| |==hjkl==:::\ \ required \ ========
-======== '""""""""""""' '""""""""""""' '""""""""""' ========
-======== ========
-=====================================================================
-=====================================================================
-
-What is Kickstart?
-
- Kickstart.nvim is *not* a distribution.
-
- Kickstart.nvim is a starting point for your own configuration.
- The goal is that you can read every line of code, top-to-bottom, understand
- what your configuration is doing, and modify it to suit your needs.
-
- Once you've done that, you can start exploring, configuring and tinkering to
- make Neovim your own! That might mean leaving Kickstart just the way it is for a while
- or immediately breaking it into modular pieces. It's up to you!
-
- If you don't know anything about Lua, I recommend taking some time to read through
- a guide. One possible example which will only take 10-15 minutes:
- - https://learnxinyminutes.com/docs/lua/
-
- After understanding a bit more about Lua, you can use `:help lua-guide` as a
- reference for how Neovim integrates Lua.
- - :help lua-guide
- - (or HTML version): https://neovim.io/doc/user/lua-guide.html
-
-Kickstart Guide:
-
- TODO: The very first thing you should do is to run the command `:Tutor` in Neovim.
-
- If you don't know what this means, type the following:
- - <escape key>
- - :
- - Tutor
- - <enter key>
-
- (If you already know the Neovim basics, you can skip this step.)
-
- Once you've completed that, you can continue working through **AND READING** the rest
- of the kickstart init.lua.
-
- Next, run AND READ `:help`.
- This will open up a help window with some basic information
- about reading, navigating and searching the builtin help documentation.
-
- This should be the first place you go to look when you're stuck or confused
- with something. It's one of my favorite Neovim features.
-
- MOST IMPORTANTLY, we provide a keymap "<space>sh" to [s]earch the [h]elp documentation,
- which is very useful when you're not exactly sure of what you're looking for.
-
- I have left several `:help X` comments throughout the init.lua
- These are hints about where to find more information about the relevant settings,
- plugins or Neovim features used in Kickstart.
-
- NOTE: Look for lines like this
-
- Throughout the file. These are for you, the reader, to help you understand what is happening.
- Feel free to delete them once you know what you're doing, but they should serve as a guide
- for when you are first encountering a few different constructs in your Neovim config.
-
-If you experience any errors while trying to install kickstart, run `:checkhealth` for more info.
-
-I hope you enjoy your Neovim journey,
-- TJ
-
-P.S. You can delete this when you're done too. It's your config now! :)
---]]
-
-- Set <space> as the leader key
-- See `:help mapleader`
-- NOTE: Must happen before plugins are loaded (otherwise wrong leader will be used)
@@ -91,7 +5,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.opt`
@@ -102,7 +16,7 @@ vim.g.have_nerd_font = false
vim.opt.number = true
-- You can also add relative line numbers, to help with jumping.
-- Experiment for yourself to see if you like it!
--- vim.opt.relativenumber = true
+vim.opt.relativenumber = true
-- Enable mouse mode, can be useful for resizing splits for example!
vim.opt.mouse = 'a'
@@ -176,10 +90,10 @@ vim.keymap.set('n', '<leader>q', vim.diagnostic.setloclist, { desc = 'Open diagn
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
@@ -617,7 +531,7 @@ require('lazy').setup({
local servers = {
-- clangd = {},
-- gopls = {},
- -- pyright = {},
+ pyright = {},
-- rust_analyzer = {},
-- ... etc. See `:help lspconfig-all` for a list of all the pre-configured LSPs
--
@@ -710,7 +624,7 @@ require('lazy').setup({
formatters_by_ft = {
lua = { 'stylua' },
-- Conform can also run multiple formatters sequentially
- -- python = { "isort", "black" },
+ python = { 'isort', 'black' },
--
-- You can use 'stop_after_first' to run the first available formatter from the list
-- javascript = { "prettierd", "prettier", stop_after_first = true },
@@ -738,12 +652,12 @@ require('lazy').setup({
-- `friendly-snippets` contains a variety of premade snippets.
-- See the README about individual language/framework/plugin snippets:
-- https://github.com/rafamadriz/friendly-snippets
- -- {
- -- 'rafamadriz/friendly-snippets',
- -- config = function()
- -- require('luasnip.loaders.from_vscode').lazy_load()
- -- end,
- -- },
+ {
+ 'rafamadriz/friendly-snippets',
+ config = function()
+ require('luasnip.loaders.from_vscode').lazy_load()
+ end,
+ },
},
},
'saadparwaiz1/cmp_luasnip',
@@ -829,6 +743,7 @@ require('lazy').setup({
{ name = 'nvim_lsp' },
{ name = 'luasnip' },
{ name = 'path' },
+ { name = 'copilot' },
},
}
end,
@@ -845,7 +760,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 'tokyonight-night'
+ vim.cmd.colorscheme 'tokyonight-storm'
-- You can configure highlights by doing something like:
vim.cmd.hi 'Comment gui=none'
@@ -897,6 +812,10 @@ require('lazy').setup({
build = ':TSUpdate',
main = 'nvim-treesitter.configs', -- Sets main module to use for opts
-- [[ Configure Treesitter ]] See `:help nvim-treesitter`
+ dependencies = {
+ -- NOTE:: IDK if this can be installed through ensure_installed, but the repo says to do it like so:
+ { 'nushell/tree-sitter-nu' },
+ },
opts = {
ensure_installed = { 'bash', 'c', 'diff', 'html', 'lua', 'luadoc', 'markdown', 'markdown_inline', 'query', 'vim', 'vimdoc' },
-- Autoinstall languages that are not installed
@@ -938,7 +857,7 @@ require('lazy').setup({
-- 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!
From 1afb5a12277465107778433e902e8100b3ef6a6c Mon Sep 17 00:00:00 2001
From: Joshua <67082011+0x4D5352@users.noreply.github.com>
Date: Mon, 29 Apr 2024 17:58:55 -0500
Subject: [PATCH 12/28] Update custom plugins init.lua
---
lua/custom/plugins/init.lua | 17 +++++++++++++++++
1 file changed, 17 insertions(+)
diff --git a/lua/custom/plugins/init.lua b/lua/custom/plugins/init.lua
index be0eb9d8..4c99b251 100644
--- a/lua/custom/plugins/init.lua
+++ b/lua/custom/plugins/init.lua
@@ -3,3 +3,20 @@
--
-- See the kickstart.nvim README for more information
return {}
+
+--[[
+-- Plugins to try:
+-- https://github.com/ThePrimeagen/refactoring.nvim
+-- https://github.com/stevearc/oil.nvim
+-- https://github.com/debugloop/telescope-undo.nvim
+-- https://github.com/nvim-java/nvim-java
+-- https://github.com/epwalsh/obsidian.nvim
+-- https://github.com/nvim-neotest/neotest
+-- https://github.com/rafcamlet/nvim-luapad
+-- https://github.com/ellisonleao/glow.nvim
+-- https://github.com/Vigemus/iron.nvim
+-- https://github.com/TimUntersberger/neofs
+-- https://github.com/vipul-sharma20/nvim-jira
+-- https://github.com/walterl/centerfold
+-- https://github.com/tricktux/pomodoro.vim/tree/master - but fork it into your own in lua
+--]]
From 09208b20e5a6c19ef25c651bd5a8093f393f9a96 Mon Sep 17 00:00:00 2001
From: Joshua <67082011+0x4D5352@users.noreply.github.com>
Date: Mon, 29 Apr 2024 18:00:00 -0500
Subject: [PATCH 13/28] add custom plugins
---
lua/custom/plugins/copilot-cmp.lua | 6 ++++++
lua/custom/plugins/copilot.lua | 7 +++++++
lua/custom/plugins/harpoon.lua | 9 +++++++++
lua/custom/plugins/pkl-ls.lua | 18 ++++++++++++++++++
lua/custom/plugins/pkl-neovim.lua | 7 +++++++
lua/custom/plugins/vim-be-good.lua | 3 +++
lua/custom/plugins/zellij-nav.lua | 22 ++++++++++++++++++++++
7 files changed, 72 insertions(+)
create mode 100644 lua/custom/plugins/copilot-cmp.lua
create mode 100644 lua/custom/plugins/copilot.lua
create mode 100644 lua/custom/plugins/harpoon.lua
create mode 100644 lua/custom/plugins/pkl-ls.lua
create mode 100644 lua/custom/plugins/pkl-neovim.lua
create mode 100644 lua/custom/plugins/vim-be-good.lua
create mode 100644 lua/custom/plugins/zellij-nav.lua
diff --git a/lua/custom/plugins/copilot-cmp.lua b/lua/custom/plugins/copilot-cmp.lua
new file mode 100644
index 00000000..f0adb7a6
--- /dev/null
+++ b/lua/custom/plugins/copilot-cmp.lua
@@ -0,0 +1,6 @@
+return {
+ 'zbirenbaum/copilot-cmp',
+ config = function()
+ require('copilot_cmp').setup()
+ end,
+}
diff --git a/lua/custom/plugins/copilot.lua b/lua/custom/plugins/copilot.lua
new file mode 100644
index 00000000..23c3a554
--- /dev/null
+++ b/lua/custom/plugins/copilot.lua
@@ -0,0 +1,7 @@
+return {
+ 'zbirenbaum/copilot.lua',
+ opts = {
+ suggestion = { enabled = false },
+ panel = { enabled = false },
+ },
+}
diff --git a/lua/custom/plugins/harpoon.lua b/lua/custom/plugins/harpoon.lua
new file mode 100644
index 00000000..1fa20fde
--- /dev/null
+++ b/lua/custom/plugins/harpoon.lua
@@ -0,0 +1,9 @@
+if true then
+ return {}
+end
+-- https://github.com/ThePrimeagen/harpoon/tree/harpoon2 - this branch, follow before removing trueflag above
+return {
+ 'ThePrimeagen/harpoon',
+ branch = 'harpoon2',
+ dependencies = { { 'nvim-lua/plenary.nvim' } },
+}
diff --git a/lua/custom/plugins/pkl-ls.lua b/lua/custom/plugins/pkl-ls.lua
new file mode 100644
index 00000000..dac8b3e6
--- /dev/null
+++ b/lua/custom/plugins/pkl-ls.lua
@@ -0,0 +1,18 @@
+if true then
+ return {}
+end
+return {
+ 'jayadamsmorgan/PklLanguageServer',
+ build = 'mv Editors/Neovim/pklls-nvim/* .',
+ config = function()
+ local capabilities = require('cmp_nvim_lsp').default_capabilities() -- if you are using nvim_cmp for completion
+ require('pklls-nvim.init').setup {
+ capabilities = capabilities, -- change or remove this
+ -- on_attach = custom_on_attach -- change or remove this
+ -- cmd = custom_path_to_pkl_lsp_server
+ }
+ end,
+ dependencies = {
+ 'neovim/nvim-lspconfig',
+ },
+}
diff --git a/lua/custom/plugins/pkl-neovim.lua b/lua/custom/plugins/pkl-neovim.lua
new file mode 100644
index 00000000..a3b6cbfe
--- /dev/null
+++ b/lua/custom/plugins/pkl-neovim.lua
@@ -0,0 +1,7 @@
+return {
+ "https://github.com/apple/pkl-neovim",
+ lazy = true,
+ event = "BufReadPre *.pkl",
+ dependencies = {"nvim-treesitter/nvim-treesitter"},
+ build = function() vim.cmd("TSInstall! pkl") end,
+}
diff --git a/lua/custom/plugins/vim-be-good.lua b/lua/custom/plugins/vim-be-good.lua
new file mode 100644
index 00000000..b1e2a543
--- /dev/null
+++ b/lua/custom/plugins/vim-be-good.lua
@@ -0,0 +1,3 @@
+return {
+ 'ThePrimeagen/vim-be-good',
+}
diff --git a/lua/custom/plugins/zellij-nav.lua b/lua/custom/plugins/zellij-nav.lua
new file mode 100644
index 00000000..d1cd6fea
--- /dev/null
+++ b/lua/custom/plugins/zellij-nav.lua
@@ -0,0 +1,22 @@
+return {
+ "https://git.sr.ht/~swaits/zellij-nav.nvim",
+ lazy = true,
+ event = "VeryLazy",
+ keys = {
+ {
+ "<c-h>", "<cmd>ZellijNavigateLeft<cr>",
+ {silent = true, desc = "navigate left"}
+ }, {
+ "<c-j>", "<cmd>ZellijNavigateDown<cr>",
+ {silent = true, desc = "navigate down"}
+ },
+ {
+ "<c-k>", "<cmd>ZellijNavigateUp<cr>",
+ {silent = true, desc = "navigate up"}
+ }, {
+ "<c-l>", "<cmd>ZellijNavigateRight<cr>",
+ {silent = true, desc = "navigate right"}
+ }
+ },
+ opts = {}
+}
From e95287d321f1b42d2c381a0dfb2f483f02275a78 Mon Sep 17 00:00:00 2001
From: Joshua <67082011+0x4D5352@users.noreply.github.com>
Date: Sun, 14 Apr 2024 10:27:48 -0500
Subject: [PATCH 14/28] Update README.md
---
README.md | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/README.md b/README.md
index a810faea..4cd71041 100644
--- a/README.md
+++ b/README.md
@@ -71,7 +71,7 @@ too - it's ignored in the kickstart repo to make maintenance easier, but it's
<details><summary> Linux and Mac </summary>
```sh
-git clone https://github.com/0x4D5352/my_kickstart.nvim.git "${XDG_CONFIG_HOME:-$HOME/.config}"/nvim
+git clone https://github.com:0x4D5352/my_kickstart.nvim.git "${XDG_CONFIG_HOME:-$HOME/.config}"/nvim
```
</details>
@@ -87,7 +87,7 @@ git clone https://github.com:0x4D5352/my_kickstart.nvim.git %userprofile%\AppDat
If you're using `powershell.exe`
```
-git clone https://github.com/0x4D5352/my_kickstart.nvim.git $env:USERPROFILE\AppData\Local\nvim\
+git clone https://github.com:0x4D5352/my_kickstart.nvim.git $env:USERPROFILE\AppData\Local\nvim\
```
</details>
From 5fbe904f329272fec95f76c2097214da2c7756fa Mon Sep 17 00:00:00 2001
From: Joshua <67082011+0x4D5352@users.noreply.github.com>
Date: Sun, 14 Apr 2024 11:29:20 -0500
Subject: [PATCH 15/28] fix bad git clone quickstart
---
README.md | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/README.md b/README.md
index 4cd71041..a810faea 100644
--- a/README.md
+++ b/README.md
@@ -71,7 +71,7 @@ too - it's ignored in the kickstart repo to make maintenance easier, but it's
<details><summary> Linux and Mac </summary>
```sh
-git clone https://github.com:0x4D5352/my_kickstart.nvim.git "${XDG_CONFIG_HOME:-$HOME/.config}"/nvim
+git clone https://github.com/0x4D5352/my_kickstart.nvim.git "${XDG_CONFIG_HOME:-$HOME/.config}"/nvim
```
</details>
@@ -87,7 +87,7 @@ git clone https://github.com:0x4D5352/my_kickstart.nvim.git %userprofile%\AppDat
If you're using `powershell.exe`
```
-git clone https://github.com:0x4D5352/my_kickstart.nvim.git $env:USERPROFILE\AppData\Local\nvim\
+git clone https://github.com/0x4D5352/my_kickstart.nvim.git $env:USERPROFILE\AppData\Local\nvim\
```
</details>
From 8963521384c7f725b0002ec7b8aedb236963ba04 Mon Sep 17 00:00:00 2001
From: Joshua Nussbaum <67082011+joshuanussbaum@users.noreply.github.com>
Date: Tue, 2 Jul 2024 17:43:52 -0500
Subject: [PATCH 16/28] update mason defaults
---
init.lua | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/init.lua b/init.lua
index 8c8fdea9..227edfd9 100644
--- a/init.lua
+++ b/init.lua
@@ -531,8 +531,10 @@ require('lazy').setup({
local servers = {
-- clangd = {},
-- gopls = {},
- pyright = {},
- -- rust_analyzer = {},
+ -- pyright = {},
+ ruff = {},
+ ruff_lsp = {},
+ 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:
@@ -624,7 +626,7 @@ require('lazy').setup({
formatters_by_ft = {
lua = { 'stylua' },
-- Conform can also run multiple formatters sequentially
- python = { 'isort', 'black' },
+ python = {},
--
-- You can use 'stop_after_first' to run the first available formatter from the list
-- javascript = { "prettierd", "prettier", stop_after_first = true },
From b0f5e73a2353cec185597b357575e2df970d560f Mon Sep 17 00:00:00 2001
From: Joshua Nussbaum <67082011+joshuanussbaum@users.noreply.github.com>
Date: Tue, 2 Jul 2024 17:48:46 -0500
Subject: [PATCH 17/28] updates
---
init.lua | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/init.lua b/init.lua
index 227edfd9..3cffef5d 100644
--- a/init.lua
+++ b/init.lua
@@ -746,6 +746,7 @@ require('lazy').setup({
{ name = 'luasnip' },
{ name = 'path' },
{ name = 'copilot' },
+ { name = 'buffer' },
},
}
end,
@@ -819,7 +820,7 @@ require('lazy').setup({
{ 'nushell/tree-sitter-nu' },
},
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', 'nu' },
-- Autoinstall languages that are not installed
auto_install = true,
highlight = {
@@ -853,7 +854,7 @@ require('lazy').setup({
-- require 'kickstart.plugins.lint',
-- 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.
From f0d9e33ffb937bfa971109e572a113f744c5ab23 Mon Sep 17 00:00:00 2001
From: Joshua Nussbaum <67082011+0x4D5352@users.noreply.github.com>
Date: Sat, 10 Aug 2024 18:20:55 -0500
Subject: [PATCH 18/28] add transparent-nvim and disable copilot
---
lua/custom/plugins/copilot-cmp.lua | 9 +++++++++
lua/custom/plugins/copilot.lua | 3 +++
lua/custom/plugins/transparent-nvim.lua | 3 +++
3 files changed, 15 insertions(+)
create mode 100644 lua/custom/plugins/transparent-nvim.lua
diff --git a/lua/custom/plugins/copilot-cmp.lua b/lua/custom/plugins/copilot-cmp.lua
index f0adb7a6..560f181a 100644
--- a/lua/custom/plugins/copilot-cmp.lua
+++ b/lua/custom/plugins/copilot-cmp.lua
@@ -1,6 +1,15 @@
+if true then
+ return {}
+end
return {
'zbirenbaum/copilot-cmp',
config = function()
require('copilot_cmp').setup()
end,
+ opts = {
+ filetypes = {
+ ['.'] = false,
+ go = true,
+ },
+ },
}
diff --git a/lua/custom/plugins/copilot.lua b/lua/custom/plugins/copilot.lua
index 23c3a554..ca5fa63c 100644
--- a/lua/custom/plugins/copilot.lua
+++ b/lua/custom/plugins/copilot.lua
@@ -1,3 +1,6 @@
+if true then
+ return {}
+end
return {
'zbirenbaum/copilot.lua',
opts = {
diff --git a/lua/custom/plugins/transparent-nvim.lua b/lua/custom/plugins/transparent-nvim.lua
new file mode 100644
index 00000000..c1daa3bc
--- /dev/null
+++ b/lua/custom/plugins/transparent-nvim.lua
@@ -0,0 +1,3 @@
+return {
+ 'xiyaowong/transparent.nvim',
+}
From 75ad6822e19bfd9bcad10734b7b957015ec386b5 Mon Sep 17 00:00:00 2001
From: Joshua Nussbaum <67082011+joshuanussbaum@users.noreply.github.com>
Date: Thu, 26 Sep 2024 19:16:01 -0500
Subject: [PATCH 19/28] disable copilot
---
init.lua | 5 ++++-
lua/custom/plugins/copilot-cmp.lua | 4 ++++
lua/custom/plugins/copilot.lua | 4 ++++
3 files changed, 12 insertions(+), 1 deletion(-)
diff --git a/init.lua b/init.lua
index 3cffef5d..35f92e05 100644
--- a/init.lua
+++ b/init.lua
@@ -237,8 +237,11 @@ require('lazy').setup({
{ '<leader>h', group = 'Git [H]unk', mode = { 'n', 'v' } },
},
},
+ config = function() -- This is the function that runs, AFTER loading
+ require('which-key').setup()
+ end,
},
-
+uu
-- NOTE: Plugins can specify dependencies.
--
-- The dependencies are proper plugin specifications as well - anything
diff --git a/lua/custom/plugins/copilot-cmp.lua b/lua/custom/plugins/copilot-cmp.lua
index 560f181a..983da19c 100644
--- a/lua/custom/plugins/copilot-cmp.lua
+++ b/lua/custom/plugins/copilot-cmp.lua
@@ -7,9 +7,13 @@ return {
require('copilot_cmp').setup()
end,
opts = {
+<<<<<<< HEAD
filetypes = {
['.'] = false,
go = true,
},
+=======
+ filetypes = { ['.'] = false },
+>>>>>>> 605d213 (disable copilot)
},
}
diff --git a/lua/custom/plugins/copilot.lua b/lua/custom/plugins/copilot.lua
index ca5fa63c..6fbac8a3 100644
--- a/lua/custom/plugins/copilot.lua
+++ b/lua/custom/plugins/copilot.lua
@@ -6,5 +6,9 @@ return {
opts = {
suggestion = { enabled = false },
panel = { enabled = false },
+ filetypes = {
+ ['.'] = false,
+ go = true,
+ },
},
}
From bbf6ffa3fd7b23a3461bd04f648c5f85c0d91f80 Mon Sep 17 00:00:00 2001
From: Joshua Nussbaum <67082011+joshuanussbaum@users.noreply.github.com>
Date: Thu, 26 Sep 2024 19:21:12 -0500
Subject: [PATCH 20/28] update readme
---
README.md | 6 +++++-
init.lua | 1 -
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/README.md b/README.md
index a810faea..e7fe9621 100644
--- a/README.md
+++ b/README.md
@@ -71,7 +71,7 @@ too - it's ignored in the kickstart repo to make maintenance easier, but it's
<details><summary> Linux and Mac </summary>
```sh
-git clone https://github.com/0x4D5352/my_kickstart.nvim.git "${XDG_CONFIG_HOME:-$HOME/.config}"/nvim
+git clone https://github.com:0x4D5352/my_kickstart.nvim.git "${XDG_CONFIG_HOME:-$HOME/.config}"/nvim
```
</details>
@@ -87,7 +87,11 @@ git clone https://github.com:0x4D5352/my_kickstart.nvim.git %userprofile%\AppDat
If you're using `powershell.exe`
```
+<<<<<<< HEAD
git clone https://github.com/0x4D5352/my_kickstart.nvim.git $env:USERPROFILE\AppData\Local\nvim\
+=======
+git clone https://github.com:0x4D5352/my_kickstart.nvim.git $env:USERPROFILE\AppData\Local\nvim\
+>>>>>>> 161ac37 (update readme)
```
</details>
diff --git a/init.lua b/init.lua
index 35f92e05..be466280 100644
--- a/init.lua
+++ b/init.lua
@@ -241,7 +241,6 @@ require('lazy').setup({
require('which-key').setup()
end,
},
-uu
-- NOTE: Plugins can specify dependencies.
--
-- The dependencies are proper plugin specifications as well - anything
From ca7acf7b33ec1fa407706874d189ad40edcd8bbc Mon Sep 17 00:00:00 2001
From: Joshua <67082011+0x4D5352@users.noreply.github.com>
Date: Sun, 14 Apr 2024 11:29:20 -0500
Subject: [PATCH 21/28] fix bad git clone quickstart
---
README.md | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/README.md b/README.md
index e7fe9621..a810faea 100644
--- a/README.md
+++ b/README.md
@@ -71,7 +71,7 @@ too - it's ignored in the kickstart repo to make maintenance easier, but it's
<details><summary> Linux and Mac </summary>
```sh
-git clone https://github.com:0x4D5352/my_kickstart.nvim.git "${XDG_CONFIG_HOME:-$HOME/.config}"/nvim
+git clone https://github.com/0x4D5352/my_kickstart.nvim.git "${XDG_CONFIG_HOME:-$HOME/.config}"/nvim
```
</details>
@@ -87,11 +87,7 @@ git clone https://github.com:0x4D5352/my_kickstart.nvim.git %userprofile%\AppDat
If you're using `powershell.exe`
```
-<<<<<<< HEAD
git clone https://github.com/0x4D5352/my_kickstart.nvim.git $env:USERPROFILE\AppData\Local\nvim\
-=======
-git clone https://github.com:0x4D5352/my_kickstart.nvim.git $env:USERPROFILE\AppData\Local\nvim\
->>>>>>> 161ac37 (update readme)
```
</details>
From ed8d615775753ea99055c1c69a499e9d4d295e9f Mon Sep 17 00:00:00 2001
From: Joshua Nussbaum <67082011+joshuanussbaum@users.noreply.github.com>
Date: Thu, 26 Sep 2024 19:22:47 -0500
Subject: [PATCH 22/28] update init.lua
---
init.lua | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/init.lua b/init.lua
index be466280..1526c712 100644
--- a/init.lua
+++ b/init.lua
@@ -531,11 +531,11 @@ require('lazy').setup({
-- - settings (table): Override the default settings passed when initializing the server.
-- For example, to see the options for `lua_ls`, you could go to: https://luals.github.io/wiki/settings/
local servers = {
- -- clangd = {},
- -- gopls = {},
+ clangd = {},
+ gopls = {},
-- pyright = {},
ruff = {},
- ruff_lsp = {},
+ rust_analyzer = {},
rust_analyzer = {},
-- ... etc. See `:help lspconfig-all` for a list of all the pre-configured LSPs
--
From ce6c12f903351f661678d372d31c14c99b0482e4 Mon Sep 17 00:00:00 2001
From: Joshua <67082011+0x4D5352@users.noreply.github.com>
Date: Mon, 29 Apr 2024 18:00:00 -0500
Subject: [PATCH 23/28] add custom plugins
---
lua/custom/plugins/copilot-cmp.lua | 4 ----
1 file changed, 4 deletions(-)
diff --git a/lua/custom/plugins/copilot-cmp.lua b/lua/custom/plugins/copilot-cmp.lua
index 983da19c..560f181a 100644
--- a/lua/custom/plugins/copilot-cmp.lua
+++ b/lua/custom/plugins/copilot-cmp.lua
@@ -7,13 +7,9 @@ return {
require('copilot_cmp').setup()
end,
opts = {
-<<<<<<< HEAD
filetypes = {
['.'] = false,
go = true,
},
-=======
- filetypes = { ['.'] = false },
->>>>>>> 605d213 (disable copilot)
},
}
From e1012f2e14e312ac143b9cd36ff9481e7a581d31 Mon Sep 17 00:00:00 2001
From: Joshua Nussbaum <67082011+joshuanussbaum@users.noreply.github.com>
Date: Thu, 26 Sep 2024 19:23:53 -0500
Subject: [PATCH 24/28] update README
---
README.md | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/README.md b/README.md
index a810faea..4cd71041 100644
--- a/README.md
+++ b/README.md
@@ -71,7 +71,7 @@ too - it's ignored in the kickstart repo to make maintenance easier, but it's
<details><summary> Linux and Mac </summary>
```sh
-git clone https://github.com/0x4D5352/my_kickstart.nvim.git "${XDG_CONFIG_HOME:-$HOME/.config}"/nvim
+git clone https://github.com:0x4D5352/my_kickstart.nvim.git "${XDG_CONFIG_HOME:-$HOME/.config}"/nvim
```
</details>
@@ -87,7 +87,7 @@ git clone https://github.com:0x4D5352/my_kickstart.nvim.git %userprofile%\AppDat
If you're using `powershell.exe`
```
-git clone https://github.com/0x4D5352/my_kickstart.nvim.git $env:USERPROFILE\AppData\Local\nvim\
+git clone https://github.com:0x4D5352/my_kickstart.nvim.git $env:USERPROFILE\AppData\Local\nvim\
```
</details>
From 23aee062688c201c2fc66d1d1a180f7175d86a78 Mon Sep 17 00:00:00 2001
From: Joshua <67082011+0x4D5352@users.noreply.github.com>
Date: Sun, 14 Apr 2024 11:29:20 -0500
Subject: [PATCH 25/28] fix bad git clone quickstart
---
README.md | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/README.md b/README.md
index 4cd71041..a810faea 100644
--- a/README.md
+++ b/README.md
@@ -71,7 +71,7 @@ too - it's ignored in the kickstart repo to make maintenance easier, but it's
<details><summary> Linux and Mac </summary>
```sh
-git clone https://github.com:0x4D5352/my_kickstart.nvim.git "${XDG_CONFIG_HOME:-$HOME/.config}"/nvim
+git clone https://github.com/0x4D5352/my_kickstart.nvim.git "${XDG_CONFIG_HOME:-$HOME/.config}"/nvim
```
</details>
@@ -87,7 +87,7 @@ git clone https://github.com:0x4D5352/my_kickstart.nvim.git %userprofile%\AppDat
If you're using `powershell.exe`
```
-git clone https://github.com:0x4D5352/my_kickstart.nvim.git $env:USERPROFILE\AppData\Local\nvim\
+git clone https://github.com/0x4D5352/my_kickstart.nvim.git $env:USERPROFILE\AppData\Local\nvim\
```
</details>
From 0a17cda3cf3a69bc0114782bc89f8203504a78e5 Mon Sep 17 00:00:00 2001
From: Joshua Nussbaum <67082011+joshuanussbaum@users.noreply.github.com>
Date: Thu, 26 Sep 2024 19:26:23 -0500
Subject: [PATCH 26/28] update init
---
lua/custom/plugins/copilot-cmp.lua | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/lua/custom/plugins/copilot-cmp.lua b/lua/custom/plugins/copilot-cmp.lua
index 560f181a..983da19c 100644
--- a/lua/custom/plugins/copilot-cmp.lua
+++ b/lua/custom/plugins/copilot-cmp.lua
@@ -7,9 +7,13 @@ return {
require('copilot_cmp').setup()
end,
opts = {
+<<<<<<< HEAD
filetypes = {
['.'] = false,
go = true,
},
+=======
+ filetypes = { ['.'] = false },
+>>>>>>> 605d213 (disable copilot)
},
}
From 3df4eaea4c1cff2f99307704fa233a05feb24125 Mon Sep 17 00:00:00 2001
From: Joshua Nussbaum <67082011+joshuanussbaum@users.noreply.github.com>
Date: Thu, 10 Oct 2024 10:48:36 -0500
Subject: [PATCH 27/28] fix copilot-cmp
---
lua/custom/plugins/copilot-cmp.lua | 4 ----
1 file changed, 4 deletions(-)
diff --git a/lua/custom/plugins/copilot-cmp.lua b/lua/custom/plugins/copilot-cmp.lua
index 983da19c..560f181a 100644
--- a/lua/custom/plugins/copilot-cmp.lua
+++ b/lua/custom/plugins/copilot-cmp.lua
@@ -7,13 +7,9 @@ return {
require('copilot_cmp').setup()
end,
opts = {
-<<<<<<< HEAD
filetypes = {
['.'] = false,
go = true,
},
-=======
- filetypes = { ['.'] = false },
->>>>>>> 605d213 (disable copilot)
},
}
From 05385a1076bc1220392c86b7fb45e7f89095ee0e Mon Sep 17 00:00:00 2001
From: Joshua Nussbaum <67082011+joshuanussbaum@users.noreply.github.com>
Date: Thu, 10 Oct 2024 10:50:45 -0500
Subject: [PATCH 28/28] disable cmp
---
init.lua | 238 +++++++++++++++++++++++++++----------------------------
1 file changed, 119 insertions(+), 119 deletions(-)
diff --git a/init.lua b/init.lua
index 1526c712..9b01e25c 100644
--- a/init.lua
+++ b/init.lua
@@ -381,7 +381,7 @@ require('lazy').setup({
{ 'j-hui/fidget.nvim', opts = {} },
-- Allows extra capabilities provided by nvim-cmp
- 'hrsh7th/cmp-nvim-lsp',
+ -- 'hrsh7th/cmp-nvim-lsp',
},
config = function()
-- Brief aside: **What is LSP?**
@@ -519,7 +519,7 @@ require('lazy').setup({
-- When you add nvim-cmp, luasnip, etc. Neovim now has *more* capabilities.
-- So, we create new capabilities with nvim cmp, and then broadcast that to the servers.
local capabilities = vim.lsp.protocol.make_client_capabilities()
- capabilities = vim.tbl_deep_extend('force', capabilities, require('cmp_nvim_lsp').default_capabilities())
+ -- capabilities = vim.tbl_deep_extend('force', capabilities, require('cmp_nvim_lsp').default_capabilities())
-- Enable the following language servers
-- Feel free to add/remove any LSPs that you want here. They will automatically be installed.
@@ -636,123 +636,123 @@ require('lazy').setup({
},
},
- { -- Autocompletion
- 'hrsh7th/nvim-cmp',
- event = 'InsertEnter',
- dependencies = {
- -- Snippet Engine & its associated nvim-cmp source
- {
- 'L3MON4D3/LuaSnip',
- build = (function()
- -- Build Step is needed for regex support in snippets.
- -- This step is not supported in many windows environments.
- -- Remove the below condition to re-enable on windows.
- if vim.fn.has 'win32' == 1 or vim.fn.executable 'make' == 0 then
- return
- end
- return 'make install_jsregexp'
- end)(),
- dependencies = {
- -- `friendly-snippets` contains a variety of premade snippets.
- -- See the README about individual language/framework/plugin snippets:
- -- https://github.com/rafamadriz/friendly-snippets
- {
- 'rafamadriz/friendly-snippets',
- config = function()
- require('luasnip.loaders.from_vscode').lazy_load()
- end,
- },
- },
- },
- 'saadparwaiz1/cmp_luasnip',
-
- -- Adds other completion capabilities.
- -- nvim-cmp does not ship with all sources by default. They are split
- -- into multiple repos for maintenance purposes.
- 'hrsh7th/cmp-nvim-lsp',
- 'hrsh7th/cmp-path',
- },
- config = function()
- -- See `:help cmp`
- local cmp = require 'cmp'
- local luasnip = require 'luasnip'
- luasnip.config.setup {}
-
- cmp.setup {
- snippet = {
- expand = function(args)
- luasnip.lsp_expand(args.body)
- end,
- },
- completion = { completeopt = 'menu,menuone,noinsert' },
-
- -- For an understanding of why these mappings were
- -- chosen, you will need to read `:help ins-completion`
- --
- -- No, but seriously. Please read `:help ins-completion`, it is really good!
- mapping = cmp.mapping.preset.insert {
- -- Select the [n]ext item
- ['<C-n>'] = cmp.mapping.select_next_item(),
- -- Select the [p]revious item
- ['<C-p>'] = cmp.mapping.select_prev_item(),
-
- -- Scroll the documentation window [b]ack / [f]orward
- ['<C-b>'] = cmp.mapping.scroll_docs(-4),
- ['<C-f>'] = cmp.mapping.scroll_docs(4),
-
- -- Accept ([y]es) the completion.
- -- This will auto-import if your LSP supports it.
- -- This will expand snippets if the LSP sent a snippet.
- ['<C-y>'] = cmp.mapping.confirm { select = true },
-
- -- If you prefer more traditional completion keymaps,
- -- you can uncomment the following lines
- --['<CR>'] = cmp.mapping.confirm { select = true },
- --['<Tab>'] = cmp.mapping.select_next_item(),
- --['<S-Tab>'] = cmp.mapping.select_prev_item(),
-
- -- Manually trigger a completion from nvim-cmp.
- -- Generally you don't need this, because nvim-cmp will display
- -- completions whenever it has completion options available.
- ['<C-Space>'] = cmp.mapping.complete {},
-
- -- Think of <c-l> as moving to the right of your snippet expansion.
- -- So if you have a snippet that's like:
- -- function $name($args)
- -- $body
- -- end
- --
- -- <c-l> will move you to the right of each of the expansion locations.
- -- <c-h> is similar, except moving you backwards.
- ['<C-l>'] = cmp.mapping(function()
- if luasnip.expand_or_locally_jumpable() then
- luasnip.expand_or_jump()
- end
- end, { 'i', 's' }),
- ['<C-h>'] = cmp.mapping(function()
- if luasnip.locally_jumpable(-1) then
- luasnip.jump(-1)
- end
- end, { 'i', 's' }),
-
- -- For more advanced Luasnip keymaps (e.g. selecting choice nodes, expansion) see:
- -- https://github.com/L3MON4D3/LuaSnip?tab=readme-ov-file#keymaps
- },
- sources = {
- {
- name = 'lazydev',
- -- set group index to 0 to skip loading LuaLS completions as lazydev recommends it
- group_index = 0,
- },
- { name = 'nvim_lsp' },
- { name = 'luasnip' },
- { name = 'path' },
- { name = 'copilot' },
- { name = 'buffer' },
- },
- }
- end,
- },
+ -- { -- Autocompletion
+ -- 'hrsh7th/nvim-cmp',
+ -- event = 'InsertEnter',
+ -- dependencies = {
+ -- -- Snippet Engine & its associated nvim-cmp source
+ -- {
+ -- 'L3MON4D3/LuaSnip',
+ -- build = (function()
+ -- -- Build Step is needed for regex support in snippets.
+ -- -- This step is not supported in many windows environments.
+ -- -- Remove the below condition to re-enable on windows.
+ -- if vim.fn.has 'win32' == 1 or vim.fn.executable 'make' == 0 then
+ -- return
+ -- end
+ -- return 'make install_jsregexp'
+ -- end)(),
+ -- dependencies = {
+ -- -- `friendly-snippets` contains a variety of premade snippets.
+ -- -- See the README about individual language/framework/plugin snippets:
+ -- -- https://github.com/rafamadriz/friendly-snippets
+ -- {
+ -- 'rafamadriz/friendly-snippets',
+ -- config = function()
+ -- require('luasnip.loaders.from_vscode').lazy_load()
+ -- end,
+ -- },
+ -- },
+ -- },
+ -- 'saadparwaiz1/cmp_luasnip',
+ --
+ -- -- Adds other completion capabilities.
+ -- -- nvim-cmp does not ship with all sources by default. They are split
+ -- -- into multiple repos for maintenance purposes.
+ -- 'hrsh7th/cmp-nvim-lsp',
+ -- 'hrsh7th/cmp-path',
+ -- },
+ -- config = function()
+ -- -- See `:help cmp`
+ -- local cmp = require 'cmp'
+ -- local luasnip = require 'luasnip'
+ -- luasnip.config.setup {}
+ --
+ -- cmp.setup {
+ -- snippet = {
+ -- expand = function(args)
+ -- luasnip.lsp_expand(args.body)
+ -- end,
+ -- },
+ -- completion = { completeopt = 'menu,menuone,noinsert' },
+ --
+ -- -- For an understanding of why these mappings were
+ -- -- chosen, you will need to read `:help ins-completion`
+ -- --
+ -- -- No, but seriously. Please read `:help ins-completion`, it is really good!
+ -- mapping = cmp.mapping.preset.insert {
+ -- -- Select the [n]ext item
+ -- ['<C-n>'] = cmp.mapping.select_next_item(),
+ -- -- Select the [p]revious item
+ -- ['<C-p>'] = cmp.mapping.select_prev_item(),
+ --
+ -- -- Scroll the documentation window [b]ack / [f]orward
+ -- ['<C-b>'] = cmp.mapping.scroll_docs(-4),
+ -- ['<C-f>'] = cmp.mapping.scroll_docs(4),
+ --
+ -- -- Accept ([y]es) the completion.
+ -- -- This will auto-import if your LSP supports it.
+ -- -- This will expand snippets if the LSP sent a snippet.
+ -- ['<C-y>'] = cmp.mapping.confirm { select = true },
+ --
+ -- -- If you prefer more traditional completion keymaps,
+ -- -- you can uncomment the following lines
+ -- --['<CR>'] = cmp.mapping.confirm { select = true },
+ -- --['<Tab>'] = cmp.mapping.select_next_item(),
+ -- --['<S-Tab>'] = cmp.mapping.select_prev_item(),
+ --
+ -- -- Manually trigger a completion from nvim-cmp.
+ -- -- Generally you don't need this, because nvim-cmp will display
+ -- -- completions whenever it has completion options available.
+ -- ['<C-Space>'] = cmp.mapping.complete {},
+ --
+ -- -- Think of <c-l> as moving to the right of your snippet expansion.
+ -- -- So if you have a snippet that's like:
+ -- -- function $name($args)
+ -- -- $body
+ -- -- end
+ -- --
+ -- -- <c-l> will move you to the right of each of the expansion locations.
+ -- -- <c-h> is similar, except moving you backwards.
+ -- ['<C-l>'] = cmp.mapping(function()
+ -- if luasnip.expand_or_locally_jumpable() then
+ -- luasnip.expand_or_jump()
+ -- end
+ -- end, { 'i', 's' }),
+ -- ['<C-h>'] = cmp.mapping(function()
+ -- if luasnip.locally_jumpable(-1) then
+ -- luasnip.jump(-1)
+ -- end
+ -- end, { 'i', 's' }),
+ --
+ -- -- For more advanced Luasnip keymaps (e.g. selecting choice nodes, expansion) see:
+ -- -- https://github.com/L3MON4D3/LuaSnip?tab=readme-ov-file#keymaps
+ -- },
+ -- sources = {
+ -- {
+ -- name = 'lazydev',
+ -- -- set group index to 0 to skip loading LuaLS completions as lazydev recommends it
+ -- group_index = 0,
+ -- },
+ -- { name = 'nvim_lsp' },
+ -- { name = 'luasnip' },
+ -- { name = 'path' },
+ -- { name = 'copilot' },
+ -- { name = 'buffer' },
+ -- },
+ -- }
+ -- end,
+ -- },
{ -- You can easily change to a different colorscheme.
-- Change the name of the colorscheme plugin below, and then