diff --git a/init.lua b/init.lua
index 367a2cfd..3b109f20 100644
--- a/init.lua
+++ b/init.lua
@@ -178,32 +178,9 @@ require('lazy').setup({
'mbbill/undotree',
- -- NOTE: Plugins can be added with a link (or for a github repo: 'owner/repo' link).
- 'tpope/vim-sleuth', -- Detect tabstop and shiftwidth automatically
+ 'tpope/vim-sleuth',
- -- NOTE: Plugins can also be added by using a table,
- -- with the first argument being the link and the following
- -- keys can be used to configure plugin behavior/loading/etc.
- --
- -- Use `opts = {}` to automatically pass options to a plugin's `setup()` function, forcing the plugin to be loaded.
- --
-
- -- Alternatively, use `config = function() ... end` for full control over the configuration.
- -- If you prefer to call `setup` explicitly, use:
- -- {
- -- 'lewis6991/gitsigns.nvim',
- -- config = function()
- -- require('gitsigns').setup({
- -- -- Your gitsigns configuration here
- -- })
- -- end,
- -- }
- --
- -- Here is a more advanced example where we pass configuration
- -- options to `gitsigns.nvim`.
- --
- -- See `:help gitsigns` to understand what the configuration keys do
- { -- Adds git related signs to the gutter, as well as utilities for managing changes
+ {
'lewis6991/gitsigns.nvim',
opts = {
signs = {
@@ -315,37 +292,9 @@ require('lazy').setup({
{ 'nvim-tree/nvim-web-devicons', enabled = vim.g.have_nerd_font },
},
config = function()
- -- Telescope is a fuzzy finder that comes with a lot of different things that
- -- it can fuzzy find! It's more than just a "file finder", it can search
- -- many different aspects of Neovim, your workspace, LSP, and more!
- --
- -- The easiest way to use Telescope, is to start by doing something like:
- -- :Telescope help_tags
- --
- -- After running this command, a window will open up and you're able to
- -- type in the prompt window. You'll see a list of `help_tags` options and
- -- a corresponding preview of the help.
- --
- -- Two important keymaps to use while in Telescope are:
- -- - Insert mode:
- -- - Normal mode: ?
- --
- -- This opens a window that shows you all of the keymaps for the current
- -- Telescope picker. This is really useful to discover what Telescope can
- -- do as well as how to actually do it!
-- [[ Configure Telescope ]]
- -- See `:help telescope` and `:help telescope.setup()`
require('telescope').setup {
- -- You can put your default mappings / updates / etc. in here
- -- All the info you're looking for is in `:help telescope.setup()`
- --
- -- defaults = {
- -- mappings = {
- -- i = { [''] = 'to_fuzzy_refine' },
- -- },
- -- },
- -- pickers = {}
extensions = {
['ui-select'] = {
require('telescope.themes').get_dropdown(),
@@ -426,35 +375,6 @@ require('lazy').setup({
'saghen/blink.cmp',
},
config = function()
- -- Brief aside: **What is LSP?**
- --
- -- LSP is an initialism you've probably heard, but might not understand what it is.
- --
- -- LSP stands for Language Server Protocol. It's a protocol that helps editors
- -- and language tooling communicate in a standardized fashion.
- --
- -- In general, you have a "server" which is some tool built to understand a particular
- -- language (such as `gopls`, `lua_ls`, `rust_analyzer`, etc.). These Language Servers
- -- (sometimes called LSP servers, but that's kind of like ATM Machine) are standalone
- -- processes that communicate with some "client" - in this case, Neovim!
- --
- -- LSP provides Neovim with features like:
- -- - Go to definition
- -- - Find references
- -- - Autocompletion
- -- - Symbol Search
- -- - and more!
- --
- -- Thus, Language Servers are external tools that must be installed separately from
- -- Neovim. This is where `mason` and related plugins come into play.
- --
- -- If you're wondering about lsp vs treesitter, you can check out the wonderfully
- -- and elegantly composed help section, `:help lsp-vs-treesitter`
-
- -- This function gets run when an LSP attaches to a particular buffer.
- -- That is to say, every time a new file is opened that is associated with
- -- an lsp (for example, opening `main.rs` is associated with `rust_analyzer`) this
- -- function will be executed to configure the current buffer
vim.api.nvim_create_autocmd('LspAttach', {
group = vim.api.nvim_create_augroup('kickstart-lsp-attach', { clear = true }),
callback = function(event)
@@ -518,11 +438,6 @@ require('lazy').setup({
end
end
- -- The following two autocommands are used to highlight references of the
- -- word under your cursor when your cursor rests there for a little while.
- -- See `:help CursorHold` for information about when this is executed
- --
- -- When you move your cursor, the highlights will be cleared (the second autocommand).
local client = vim.lsp.get_client_by_id(event.data.client_id)
if client and client_supports_method(client, vim.lsp.protocol.Methods.textDocument_documentHighlight, event.buf) then
local highlight_augroup = vim.api.nvim_create_augroup('kickstart-lsp-highlight', { clear = false })
@@ -547,10 +462,6 @@ require('lazy').setup({
})
end
- -- The following code creates a keymap to toggle inlay hints in your
- -- code, if the language server you are using supports them
- --
- -- This may be unwanted, since they displace some of your code
if client and client_supports_method(client, vim.lsp.protocol.Methods.textDocument_inlayHint, event.buf) then
map('th', function()
vim.lsp.inlay_hint.enable(not vim.lsp.inlay_hint.is_enabled { bufnr = event.buf })
@@ -588,64 +499,21 @@ require('lazy').setup({
},
}
- -- 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 blink.cmp, luasnip, etc. Neovim now has *more* capabilities.
- -- So, we create new capabilities with blink.cmp, and then broadcast that to the servers.
local capabilities = require('blink.cmp').get_lsp_capabilities()
- -- Enable the following language servers
- -- Feel free to add/remove any LSPs that you want here. They will automatically be installed.
- --
- -- Add any additional override configuration in the following tables. Available keys are:
- -- - cmd (table): Override the default command used to start the server
- -- - filetypes (table): Override the default list of associated filetypes for the server
- -- - capabilities (table): Override fields in capabilities. Can be used to disable certain LSP features.
- -- - 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 = {},
- -- pyright = {},
- -- 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:
- -- https://github.com/pmizio/typescript-tools.nvim
- --
- -- But for many setups, the LSP (`ts_ls`) will work just fine
- -- ts_ls = {},
- --
lua_ls = {
- -- cmd = { ... },
- -- filetypes = { ... },
- -- capabilities = {},
settings = {
Lua = {
completion = {
callSnippet = 'Replace',
},
- -- You can toggle below to ignore Lua_LS's noisy `missing-fields` warnings
- -- diagnostics = { disable = { 'missing-fields' } },
},
},
},
}
- -- Ensure the servers and tools above are installed
- --
- -- To check the current status of installed tools and/or manually install
- -- other tools, you can run
- -- :Mason
- --
- -- You can press `g?` for help in this menu.
- --
- -- `mason` had to be setup earlier: to configure its options see the
- -- `dependencies` table for `nvim-lspconfig` above.
- --
- -- You can add other tools here that you want Mason to install
- -- for you, so that they are available from within Neovim.
local ensure_installed = vim.tbl_keys(servers or {})
vim.list_extend(ensure_installed, {
'stylua', -- Used to format Lua code
@@ -658,9 +526,6 @@ require('lazy').setup({
handlers = {
function(server_name)
local server = servers[server_name] or {}
- -- This handles overriding only values explicitly passed
- -- by the server configuration above. Useful when disabling
- -- certain features of an LSP (for example, turning off formatting for ts_ls)
server.capabilities = vim.tbl_deep_extend('force', {}, capabilities, server.capabilities or {})
require('lspconfig')[server_name].setup(server)
end,
@@ -686,9 +551,6 @@ require('lazy').setup({
opts = {
notify_on_error = false,
format_on_save = function(bufnr)
- -- Disable "format_on_save lsp_fallback" for languages that don't
- -- have a well standardized coding style. You can add additional
- -- languages here or re-enable it for the disabled ones.
local disable_filetypes = { c = true, cpp = true }
if disable_filetypes[vim.bo[bufnr].filetype] then
return nil
@@ -701,11 +563,6 @@ require('lazy').setup({
end,
formatters_by_ft = {
lua = { 'stylua' },
- -- Conform can also run multiple formatters sequentially
- -- 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 },
},
},
},
@@ -720,24 +577,12 @@ require('lazy').setup({
'L3MON4D3/LuaSnip',
version = '2.*',
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,
- -- },
},
opts = {},
},
@@ -747,52 +592,17 @@ require('lazy').setup({
--- @type blink.cmp.Config
opts = {
keymap = {
- -- 'default' (recommended) for mappings similar to built-in completions
- -- to accept ([y]es) the completion.
- -- This will auto-import if your LSP supports it.
- -- This will expand snippets if the LSP sent a snippet.
- -- 'super-tab' for tab to accept
- -- 'enter' for enter to accept
- -- 'none' for no mappings
- --
- -- For an understanding of why the 'default' preset is recommended,
- -- 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
[''] = cmp.mapping.select_next_item(),
- -- Select the [p]revious item
[''] = cmp.mapping.select_prev_item(),
- -- Scroll the documentation window [b]ack / [f]orward
[''] = cmp.mapping.scroll_docs(-4),
[''] = 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.
[''] = cmp.mapping.confirm { select = true },
- -- If you prefer more traditional completion keymaps,
- -- you can uncomment the following lines
- --[''] = cmp.mapping.confirm { select = true },
- --[''] = cmp.mapping.select_next_item(),
- --[''] = 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.
[''] = cmp.mapping.complete {},
- -- Think of as moving to the right of your snippet expansion.
- -- So if you have a snippet that's like:
- -- function $name($args)
- -- $body
- -- end
- --
- -- will move you to the right of each of the expansion locations.
- -- is similar, except moving you backwards.
[''] = cmp.mapping(function()
if luasnip.expand_or_locally_jumpable() then
luasnip.expand_or_jump()
@@ -803,180 +613,98 @@ require('lazy').setup({
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
- },
-
- appearance = {
- -- 'mono' (default) for 'Nerd Font Mono' or 'normal' for 'Nerd Font'
- -- Adjusts spacing to ensure icons are aligned
- nerd_font_variant = 'mono',
- },
-
- completion = {
- -- By default, you may press `` to show the documentation.
- -- Optionally, set `auto_show = true` to show the documentation after a delay.
- documentation = { auto_show = false, auto_show_delay_ms = 500 },
- },
-
- sources = {
- default = { 'lsp', 'path', 'snippets', 'lazydev' },
- providers = {
- lazydev = { module = 'lazydev.integrations.blink', score_offset = 100 },
},
- },
- snippets = { preset = 'luasnip' },
-
- -- Blink.cmp includes an optional, recommended rust fuzzy matcher,
- -- which automatically downloads a prebuilt binary when enabled.
- --
- -- By default, we use the Lua implementation instead, but you may enable
- -- the rust implementation via `'prefer_rust_with_warning'`
- --
- -- See :h blink-cmp-config-fuzzy for more information
- fuzzy = { implementation = 'lua' },
-
- -- Shows a signature help window while you type arguments for a function
- signature = { enabled = true },
- },
- },
-
- { -- You can easily change to a different colorscheme.
- -- Change the name of the colorscheme plugin below, and then
- -- change the command in the config to whatever the name of that colorscheme is.
- --
- -- If you want to see what colorschemes are already installed, you can use `:Telescope colorscheme`.
- 'folke/tokyonight.nvim',
- priority = 1000, -- Make sure to load this before all the other start plugins.
- config = function()
- ---@diagnostic disable-next-line: missing-fields
- require('tokyonight').setup {
- styles = {
- comments = { italic = false }, -- Disable italics in comments
+ appearance = {
+ nerd_font_variant = 'mono',
},
- }
- -- 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'
- end,
- },
+ completion = {
+ documentation = { auto_show = false, auto_show_delay_ms = 500 },
+ },
- -- Highlight todo, notes, etc in comments
- { 'folke/todo-comments.nvim', event = 'VimEnter', dependencies = { 'nvim-lua/plenary.nvim' }, opts = { signs = false } },
+ sources = {
+ default = { 'lsp', 'path', 'snippets', 'lazydev' },
+ providers = {
+ lazydev = { module = 'lazydev.integrations.blink', score_offset = 100 },
+ },
+ },
- { -- Collection of various small independent plugins/modules
- 'echasnovski/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 }
+ snippets = { preset = 'luasnip' },
- -- Add/delete/replace surroundings (brackets, quotes, etc.)
- --
- -- - saiw) - [S]urround [A]dd [I]nner [W]ord [)]Paren
- -- - sd' - [S]urround [D]elete [']quotes
- -- - sr)' - [S]urround [R]eplace [)] [']
- require('mini.surround').setup()
+ fuzzy = { implementation = 'lua' },
- -- Simple and easy statusline.
- -- You could remove this setup call if you don't like it,
- -- and try some other statusline plugin
- local statusline = require 'mini.statusline'
- -- set use_icons to true if you have a Nerd Font
- statusline.setup { use_icons = vim.g.have_nerd_font }
-
- -- You can configure sections in the statusline by overriding their
- -- default behavior. For example, here we set the section for
- -- cursor location to LINE:COLUMN
- ---@diagnostic disable-next-line: duplicate-set-field
- statusline.section_location = function()
- return '%2l:%-2v'
- end
-
- -- ... and there is more!
- -- Check out: https://github.com/echasnovski/mini.nvim
- end,
- },
- { -- Highlight, edit, and navigate code
- 'nvim-treesitter/nvim-treesitter',
- build = ':TSUpdate',
- main = 'nvim-treesitter.configs', -- Sets main module to use for opts
- -- [[ Configure Treesitter ]] See `:help nvim-treesitter`
- opts = {
- ensure_installed = { 'bash', 'c', 'diff', 'html', 'lua', 'luadoc', 'markdown', 'markdown_inline', 'query', 'vim', 'vimdoc' },
- -- Autoinstall languages that are not installed
- auto_install = true,
- highlight = {
- enable = true,
- -- Some languages depend on vim's regex highlighting system (such as Ruby) for indent rules.
- -- If you are experiencing weird indenting issues, add the language to
- -- the list of additional_vim_regex_highlighting and disabled languages for indent.
- additional_vim_regex_highlighting = { 'ruby' },
+ signature = { enabled = true },
},
- indent = { enable = true, disable = { 'ruby' } },
},
- -- There are additional nvim-treesitter modules that you can use to interact
- -- with nvim-treesitter. You should go explore a few and see what interests you:
- --
- -- - Incremental selection: Included, see `:help nvim-treesitter-incremental-selection-mod`
- -- - Show your current context: https://github.com/nvim-treesitter/nvim-treesitter-context
- -- - Treesitter + textobjects: https://github.com/nvim-treesitter/nvim-treesitter-textobjects
- },
- -- 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.
+ { -- You can easily change to a different colorscheme.
+ 'folke/tokyonight.nvim',
+ priority = 1000, -- Make sure to load this before all the other start plugins.
+ config = function()
+ ---@diagnostic disable-next-line: missing-fields
+ require('tokyonight').setup {
+ styles = {
+ comments = { italic = false }, -- Disable italics in comments
+ },
+ }
- -- NOTE: Next step on your Neovim journey: Add/Configure additional plugins for Kickstart
- --
- -- Here are some example plugins that I've included in the Kickstart repository.
- -- 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.lint',
- -- require 'kickstart.plugins.autopairs',
- -- require 'kickstart.plugins.neo-tree',
- -- 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.
- --
- -- Uncomment the following line and add your plugins to `lua/custom/plugins/*.lua` to get going.
- -- { import = 'custom.plugins' },
- --
- -- For additional information with loading, sourcing and examples see `:help lazy.nvim-🔌-plugin-spec`
- -- Or use telescope!
- -- In normal mode type `sh` then write `lazy.nvim-plugin`
- -- you can continue same window with `sr` which resumes last telescope search
-}, {
- ui = {
- -- If you are using a Nerd Font: set icons to an empty table which will use the
- -- default lazy.nvim defined Nerd Font icons, otherwise define a unicode icons table
- icons = vim.g.have_nerd_font and {} or {
- cmd = '⌘',
- config = '🛠',
- event = '📅',
- ft = '📂',
- init = '⚙',
- keys = '🗝',
- plugin = '🔌',
- runtime = '💻',
- require = '🌙',
- source = '📄',
- start = '🚀',
- task = '📌',
- lazy = '💤 ',
+ vim.cmd.colorscheme 'tokyonight-night'
+ end,
},
- },
+
+ -- Highlight todo, notes, etc in comments
+ { 'folke/todo-comments.nvim', event = 'VimEnter', dependencies = { 'nvim-lua/plenary.nvim' }, opts = { signs = false } },
+
+ { -- Collection of various small independent plugins/modules
+ 'echasnovski/mini.nvim',
+ config = function()
+ require('mini.ai').setup { n_lines = 500 }
+
+ require('mini.surround').setup()
+
+ local statusline = require 'mini.statusline'
+ statusline.setup { use_icons = vim.g.have_nerd_font }
+
+ statusline.section_location = function()
+ return '%2l:%-2v'
+ end
+ end,
+ },
+ { -- Highlight, edit, and navigate code
+ 'nvim-treesitter/nvim-treesitter',
+ build = ':TSUpdate',
+ main = 'nvim-treesitter.configs', -- Sets main module to use for opts
+ -- [[ Configure Treesitter ]] See `:help nvim-treesitter`
+ opts = {
+ ensure_installed = { 'bash', 'c', 'diff', 'html', 'lua', 'luadoc', 'markdown', 'markdown_inline', 'query', 'vim', 'vimdoc' },
+ auto_install = true,
+ highlight = {
+ enable = true,
+ additional_vim_regex_highlighting = { 'ruby' },
+ },
+ indent = { enable = true, disable = { 'ruby' } },
+ },
+ },
+ }, {
+ ui = {
+ icons = vim.g.have_nerd_font and {} or {
+ cmd = '⌘',
+ config = '🛠',
+ event = '📅',
+ ft = '📂',
+ init = '⚙',
+ keys = '🗝',
+ plugin = '🔌',
+ runtime = '💻',
+ require = '🌙',
+ source = '📄',
+ start = '🚀',
+ task = '📌',
+ lazy = '💤 ',
+ },
+ },
+ }
})
require('rose-pine').setup {
@@ -1029,38 +757,13 @@ require('rose-pine').setup {
},
palette = {
- -- Override the builtin palette per variant
- -- moon = {
- -- base = '#18191a',
- -- overlay = '#363738',
- -- },
},
- -- NOTE: Highlight groups are extended (merged) by default. Disable this
- -- per group via `inherit = false`
highlight_groups = {
- -- Comment = { fg = "foam" },
- -- StatusLine = { fg = "love", bg = "love", blend = 15 },
- -- VertSplit = { fg = "muted", bg = "muted" },
- -- Visual = { fg = "base", bg = "text", inherit = false },
},
before_highlight = function(group, highlight, palette)
- -- Disable all undercurls
- -- if highlight.undercurl then
- -- highlight.undercurl = false
- -- end
- --
- -- Change palette colour
- -- if highlight.fg == palette.pine then
- -- highlight.fg = palette.foam
- -- end
end,
}
vim.cmd 'colorscheme rose-pine'
--- vim.cmd("colorscheme rose-pine-main")
--- vim.cmd("colorscheme rose-pine-moon")
--- vim.cmd("colorscheme rose-pine-dawn")
--- The line beneath this is called `modeline`. See `:help modeline`
--- vim: ts=2 sts=2 sw=2 et