diff --git a/init.lua b/init.lua
index a01bf630..07081d3c 100644
--- a/init.lua
+++ b/init.lua
@@ -260,418 +260,65 @@ require('lazy').setup({
--
-- Use the `dependencies` key to specify the dependencies of a particular plugin
- --[[
- { -- Fuzzy Finder (files, lsp, etc)
- 'nvim-telescope/telescope.nvim',
- event = 'VimEnter',
- branch = '0.1.x',
- dependencies = {
- 'nvim-lua/plenary.nvim',
- { -- If encountering errors, see telescope-fzf-native README for installation instructions
- 'nvim-telescope/telescope-fzf-native.nvim',
-
- -- `build` is used to run some command when the plugin is installed/updated.
- -- This is only run then, not every time Neovim starts up.
- build = 'make',
-
- -- `cond` is a condition used to determine whether this plugin should be
- -- installed and loaded.
- cond = function()
- return vim.fn.executable 'make' == 1
- end,
- },
- { 'nvim-telescope/telescope-ui-select.nvim' },
-
- -- Useful for getting pretty icons, but requires a Nerd Font.
- { '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(),
+ { -- blink autocompletion
+ 'saghen/blink.cmp',
+ dependencies = { 'rafamadriz/friendly-snippets' },
+ version = '*',
+ ---@module 'blink.cmp'
+ ---@type blink.cmp.Config
+ opts = {
+ completion = {
+ list = {
+ selection = {
+ preselect = false,
},
},
- }
+ },
+ keymap = {
+ preset = 'enter',
+ [''] = { 'select_next', 'fallback' },
+ [''] = { 'select_prev', 'fallback' },
+ },
+ appearance = {
+ nerd_font_variant = 'normal',
+ },
+ completion = {
+ documentation = { auto_show = true },
+ },
+ sources = {
+ -- add lazydev to your completion providers
+ default = { 'lazydev', 'lsp', 'path', 'snippets', 'buffer' },
+ providers = {
+ lazydev = {
+ name = 'LazyDev',
+ module = 'lazydev.integrations.blink',
+ -- make lazydev completions top priority (see `:h blink.cmp`)
+ score_offset = 100,
+ },
+ },
+ },
+ },
+ opts_extend = { 'sources.default' },
+ },
- -- Enable Telescope extensions if they are installed
- pcall(require('telescope').load_extension, 'fzf')
- pcall(require('telescope').load_extension, 'ui-select')
-
- -- See `:help telescope.builtin`
- local builtin = require 'telescope.builtin'
- vim.keymap.set('n', 'sh', builtin.help_tags, { desc = '[S]earch [H]elp' })
- vim.keymap.set('n', 'sk', builtin.keymaps, { desc = '[S]earch [K]eymaps' })
- vim.keymap.set('n', 'sf', builtin.find_files, { desc = '[S]earch [F]iles' })
- vim.keymap.set('n', 'ss', builtin.builtin, { desc = '[S]earch [S]elect Telescope' })
- vim.keymap.set('n', 'sw', builtin.grep_string, { desc = '[S]earch current [W]ord' })
- vim.keymap.set('n', 'sg', builtin.live_grep, { desc = '[S]earch by [G]rep' })
- vim.keymap.set('n', 'sd', builtin.diagnostics, { desc = '[S]earch [D]iagnostics' })
- vim.keymap.set('n', 'sr', builtin.resume, { desc = '[S]earch [R]esume' })
- vim.keymap.set('n', 's.', builtin.oldfiles, { desc = '[S]earch Recent Files ("." for repeat)' })
- -- vim.keymap.set('n', '', builtin.buffers, { desc = '[ ] Find existing buffers' })
-
- -- Slightly advanced example of overriding default behavior and theme
- vim.keymap.set('n', '/', function()
- -- You can pass additional configuration to Telescope to change the theme, layout, etc.
- builtin.current_buffer_fuzzy_find(require('telescope.themes').get_dropdown {
- winblend = 10,
- previewer = false,
- })
- end, { desc = '[/] Fuzzily search in current buffer' })
-
- -- It's also possible to pass additional configuration options.
- -- See `:help telescope.builtin.live_grep()` for information about particular keys
- vim.keymap.set('n', 's/', function()
- builtin.live_grep {
- grep_open_files = true,
- prompt_title = 'Live Grep in Open Files',
- }
- end, { desc = '[S]earch [/] in Open Files' })
-
- -- Shortcut for searching your Neovim configuration files
- vim.keymap.set('n', 'sn', function()
- builtin.find_files { cwd = vim.fn.stdpath 'config' }
- end, { desc = '[S]earch [N]eovim files' })
+ { -- FZF (Telescope replacement)
+ 'ibhagwan/fzf-lua',
+ -- optional for icon support
+ dependencies = { 'nvim-tree/nvim-web-devicons' },
+ -- or if using mini.icons/mini.nvim
+ -- dependencies = { 'echasnovski/mini.icons' },
+ opts = {},
+ -- [[ fzf keybinds]]
+ config = function()
+ local fzf = require 'fzf-lua'
+ vim.keymap.set('n', 'sw', fzf.grep_cword, { desc = '[S]earch [W]ord' })
+ vim.keymap.set('n', 'sf', fzf.files, { desc = '[S]earch [F]iles' })
+ vim.keymap.set('n', 'sg', fzf.live_grep, { desc = '[S]earch by [G]rep' })
+ vim.keymap.set('n', 'sg', fzf.live_grep, { desc = '[S]earch by [G]rep' })
+ vim.keymap.set('n', 'sr', fzf.resume, { desc = '[S]earch [R]esume' })
+ vim.keymap.set('n', '/', fzf.blines, { desc = '[/] Fuzzily search in current buffer' })
end,
},
- --]]
-
- { -- LSP
- --[[ init.lua LSP config
- {
- 'folke/lazydev.nvim',
- ft = 'lua', -- only load on lua files
- opts = {
- library = {
- -- See the configuration section for more details
- -- Load luvit types when the `vim.uv` word is found
- { path = '${3rd}/luv/library', words = { 'vim%.uv' } },
- },
- },
- },
- --]]
- { -- blink autocompletion
- 'saghen/blink.cmp',
- dependencies = { 'rafamadriz/friendly-snippets' },
- version = '*',
- ---@module 'blink.cmp'
- ---@type blink.cmp.Config
- opts = {
- completion = {
- list = {
- selection = {
- preselect = false,
- },
- },
- },
- keymap = {
- preset = 'enter',
- [''] = { 'select_next', 'fallback' },
- [''] = { 'select_prev', 'fallback' },
- },
- appearance = {
- nerd_font_variant = 'normal',
- },
- completion = {
- documentation = { auto_show = true },
- },
- sources = {
- -- add lazydev to your completion providers
- default = { 'lazydev', 'lsp', 'path', 'snippets', 'buffer' },
- providers = {
- lazydev = {
- name = 'LazyDev',
- module = 'lazydev.integrations.blink',
- -- make lazydev completions top priority (see `:h blink.cmp`)
- score_offset = 100,
- },
- },
- },
- },
- opts_extend = { 'sources.default' },
- },
- --[[ Mason (LSP package manager)
- {
- 'williamboman/mason.nvim',
- dependencies = { 'WhoIsSethDaniel/mason-tool-installer.nvim' },
- config = function()
- local ensure_installed = vim.tbl_keys {}
- vim.list_extend(ensure_installed, {
- 'stylua', -- Used to format Lua code
- {
- 'lua-language-server',
- settings = {
- Lua = {
- completion = {
- callSnippet = 'Replace',
- },
- },
- },
- },
- 'clangd',
- 'rust-analyzer',
- 'powershell-editor-services',
- })
- require('mason-tool-installer').setup { ensure_installed = ensure_installed }
- require('mason').setup()
- end,
- },
- --]]
-
- { -- FZF (Telescope replacement)
- 'ibhagwan/fzf-lua',
- -- optional for icon support
- dependencies = { 'nvim-tree/nvim-web-devicons' },
- -- or if using mini.icons/mini.nvim
- -- dependencies = { 'echasnovski/mini.icons' },
- opts = {},
- -- [[ fzf keybinds]]
- config = function()
- local fzf = require 'fzf-lua'
- vim.keymap.set('n', 'sw', fzf.grep_cword, { desc = '[S]earch [W]ord' })
- vim.keymap.set('n', 'sf', fzf.files, { desc = '[S]earch [F]iles' })
- vim.keymap.set('n', 'sg', fzf.live_grep, { desc = '[S]earch by [G]rep' })
- vim.keymap.set('n', 'sg', fzf.live_grep, { desc = '[S]earch by [G]rep' })
- vim.keymap.set('n', 'sr', fzf.resume, { desc = '[S]earch [R]esume' })
- vim.keymap.set('n', '/', fzf.blines, { desc = '[/] Fuzzily search in current buffer' })
- end,
- },
-
- --[[ LSP loading info in the bottom-right corner
- {
- 'j-hui/fidget.nvim',
- opts = {},
- },
- --]]
- },
-
- --[[
- { -- LSP Configuration & Plugins
- 'neovim/nvim-lspconfig',
- dependencies = {
- -- Automatically install LSPs and related tools to stdpath for Neovim
- 'williamboman/mason.nvim',
- 'williamboman/mason-lspconfig.nvim',
- 'WhoIsSethDaniel/mason-tool-installer.nvim',
-
- -- Useful status updates for LSP.
- -- NOTE: `opts = {}` is the same as calling `require('fidget').setup({})`
- { 'j-hui/fidget.nvim', opts = {} },
-
- -- `neodev` configures Lua LSP for your Neovim config, runtime and plugins
- -- used for completion, annotations and signatures of Neovim apis
- { 'folke/neodev.nvim', opts = {} },
- },
- config = function()
- vim.api.nvim_create_autocmd('LspAttach', {
- group = vim.api.nvim_create_augroup('kickstart-lsp-attach', { clear = true }),
- callback = function(event)
- -- NOTE: Remember that Lua is a real programming language, and as such it is possible
- --
- -- to define small helper and utility functions so you don't have to repeat yourself.
- --
- -- In this case, we create a function that lets us more easily define mappings specific
- -- for LSP related items. It sets the mode, buffer and description for us each time.
- local map = function(keys, func, desc)
- vim.keymap.set('n', keys, func, { buffer = event.buf, desc = 'LSP: ' .. desc })
- end
-
- -- 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 .
- map('gd', require('telescope.builtin').lsp_definitions, '[G]oto [D]efinition')
-
- -- Find references for the word under your cursor.
- map('gr', require('telescope.builtin').lsp_references, '[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.
- map('gI', require('telescope.builtin').lsp_implementations, '[G]oto [I]mplementation')
-
- -- 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*.
- map('D', require('telescope.builtin').lsp_type_definitions, 'Type [D]efinition')
-
- -- Fuzzy find all the symbols in your current document.
- -- Symbols are things like variables, functions, types, etc.
- map('ds', require('telescope.builtin').lsp_document_symbols, '[D]ocument [S]ymbols')
-
- -- Fuzzy find all the symbols in your current workspace.
- -- Similar to document symbols, except searches over your entire project.
- map('ws', require('telescope.builtin').lsp_dynamic_workspace_symbols, '[W]orkspace [S]ymbols')
-
- -- Rename the variable under your cursor.
- -- Most Language Servers support renaming across files, etc.
- map('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('ca', vim.lsp.buf.code_action, '[C]ode [A]ction')
-
- -- Opens a popup that displays documentation about the word under your cursor
- -- See `:help K` for why this keymap.
- map('K', vim.lsp.buf.hover, 'Hover Documentation')
-
- -- WARN: This is not Goto Definition, this is Goto Declaration.
- -- For example, in C this would take you to the header.
- map('gD', 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.
- -- See `:help CursorHold` for information about when this is executed
- --
- -- on_attach = function(client, bufnr)
- -- vim.api.nvim_buf_set_option(bufnr, 'omnifunc', 'v:lua.vim.lsp.omnifunc')
- -- end,
- -- 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.server_capabilities.documentHighlightProvider then
- vim.api.nvim_create_autocmd({ 'CursorHold', 'CursorHoldI' }, {
- buffer = event.buf,
- callback = vim.lsp.buf.document_highlight,
- })
-
- vim.api.nvim_create_autocmd({ 'CursorMoved', 'CursorMovedI' }, {
- buffer = event.buf,
- callback = vim.lsp.buf.clear_references,
- })
- 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.
- -- 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())
-
- -- 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 = {},
- powershell_es = {},
- -- ... 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 (`tsserver`) will work just fine
- -- tsserver = {},
- --
- 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.
- require('mason').setup()
-
- -- 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
- })
- require('mason-tool-installer').setup { ensure_installed = ensure_installed }
-
- require('mason-lspconfig').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 tsserver)
- server.capabilities = vim.tbl_deep_extend('force', {}, capabilities, server.capabilities or {})
- require('lspconfig')[server_name].setup(server)
- end,
-
- powershell_es = function()
- local lspconfig = require 'lspconfig'
- lspconfig.powershell_es.setup {
- init_options = { enableProfileLoading = false },
- filetypes = { 'ps1' },
- on_attach = function(client, bufnr)
- vim.api.nvim_buf_set_option(bufnr, 'omnifunc', 'v:lua.vim.lsp.omnifunc')
- end,
- settings = { powershell = { codeFormatting = { Preset = 'OTBS' } } },
- }
- end,
- },
- }
- -- Godot's LSP - Requires Godot to be running
- if vim.fn.has 'win32' == 1 then
- require('lspconfig')['gdscript'].setup {
- cmd = { 'ncat', '127.0.0.1', '6005' },
- name = 'godot',
- }
- else
- require('lspconfig')['gdscript'].setup {
- cmd = vim.lsp.rpc.connect('127.0.0.1', 6005),
- name = 'godot',
- }
- end
- end,
- },
- --]]
{ -- DAP for Godot - https://docs.godotengine.org/en/stable/tutorials/editor/external_editor.html#lsp-dap-support
'mfussenegger/nvim-dap',
@@ -733,117 +380,6 @@ 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').filetype_extend('rust', { 'rust' })
- 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
- -- original: [''] = cmp.mapping.select_next_item(),
- [''] = cmp.mapping.select_next_item(),
- -- Select the [p]revious item
- -- original: [''] = cmp.mapping.select_prev_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.
- -- original: [''] = cmp.mapping.confirm { select = true },
- [''] = cmp.mapping.confirm { select = true },
-
- -- 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()
- end
- end, { 'i', 's' }),
- [''] = 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 = 'nvim_lsp' },
- { name = 'luasnip' },
- { name = 'path' },
- },
- }
- end,
- },
- --]]
-
{ -- Install cutpuccin colorscheme
'catppuccin/nvim',
name = 'cutppuccin',