diff --git a/.gitignore b/.gitignore index a52bd495579..8a192cab54d 100644 --- a/.gitignore +++ b/.gitignore @@ -4,11 +4,3 @@ test.sh nvim spell/ - -# In your personal fork, you likely want to comment this, since it's recommended to track -# nvim-pack-lock.json in version control - see :help vim.pack-lockfile -# For the official `nvim-lua/kickstart.nvim` git repository, we leave it ignored to avoid unneeded -# merge conflicts. -nvim-pack-lock.json - -.DS_Store diff --git a/README.md b/README.md index 7c62e907134..5f332e5c9b0 100644 --- a/README.md +++ b/README.md @@ -82,7 +82,7 @@ it's recommended to track it in version control (see `:help vim.pack-lockfile`).
Linux and Mac ```sh -git clone https://github.com/nvim-lua/kickstart.nvim.git "${XDG_CONFIG_HOME:-$HOME/.config}"/nvim +git clone https://github.com/GuustTaillieu/kickstart.nvim.git "${XDG_CONFIG_HOME:-$HOME/.config}"/nvim ```
@@ -92,13 +92,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/GuustTaillieu/kickstart.nvim.git "%localappdata%\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/GuustTaillieu/kickstart.nvim.git "${env:LOCALAPPDATA}\nvim" ``` diff --git a/ftplugin/java.lua b/ftplugin/java.lua new file mode 100644 index 00000000000..5b42dbf37ed --- /dev/null +++ b/ftplugin/java.lua @@ -0,0 +1,157 @@ +-- JDTLS (Java LSP) configuration +local home = vim.env.HOME -- Get the home directory + +local jdtls = require 'jdtls' +local project_name = vim.fn.fnamemodify(vim.fn.getcwd(), ':p:h:t') +local workspace_dir = home .. '/jdtls-workspace/' .. project_name + +local system_os = '' + +-- Determine OS +if vim.fn.has 'mac' == 1 then + system_os = 'mac' +elseif vim.fn.has 'unix' == 1 then + system_os = 'linux' +elseif vim.fn.has 'win32' == 1 or vim.fn.has 'win64' == 1 then + system_os = 'win' +else + print "OS not found, defaulting to 'linux'" + system_os = 'linux' +end + +-- Needed for debugging +local bundles = { + vim.fn.glob(home .. '/.local/share/nvim/mason/share/java-debug-adapter/com.microsoft.java.debug.plugin.jar'), +} + +-- Needed for running/debugging unit tests +vim.list_extend(bundles, vim.split(vim.fn.glob(home .. '/.local/share/nvim/mason/share/java-test/*.jar', 1), '\n')) + +-- See `:help vim.lsp.start_client` for an overview of the supported `config` options. +local config = { + -- The command that starts the language server + -- See: https://github.com/eclipse/eclipse.jdt.ls#running-from-the-command-line + cmd = { + 'java', + '-Declipse.application=org.eclipse.jdt.ls.core.id1', + '-Dosgi.bundles.defaultStartLevel=4', + '-Declipse.product=org.eclipse.jdt.ls.core.product', + '-Dlog.protocol=true', + '-Dlog.level=ALL', + '-javaagent:' .. home .. '/.local/share/nvim/mason/share/jdtls/lombok.jar', + '-Xmx4g', + '--add-modules=ALL-SYSTEM', + '--add-opens', + 'java.base/java.util=ALL-UNNAMED', + '--add-opens', + 'java.base/java.lang=ALL-UNNAMED', + + -- Eclipse jdtls location + '-jar', + home .. '/.local/share/nvim/mason/share/jdtls/plugins/org.eclipse.equinox.launcher.jar', + '-configuration', + home .. '/.local/share/nvim/mason/packages/jdtls/config_' .. system_os, + '-data', + workspace_dir, + }, + + -- This is the default if not provided, you can remove it. Or adjust as needed. + -- One dedicated LSP server & client will be started per unique root_dir + root_dir = require('jdtls.setup').find_root { '.git', 'mvnw', 'pom.xml', 'build.gradle' }, + + -- Here you can configure eclipse.jdt.ls specific settings + -- See https://github.com/eclipse/eclipse.jdt.ls/wiki/Running-the-JAVA-LS-server-from-the-command-line#initialize-request + settings = { + java = { + -- TODO Replace this with the absolute path to your main java version (JDTLS requires JDK 21 or higher) + home = '/usr/lib/jvm/java-21-openjdk', + eclipse = { + downloadSources = true, + }, + configuration = { + updateBuildConfiguration = 'interactive', + -- TODO Update this by adding any runtimes that you need to support your Java projects and removing any that you don't have installed + -- The runtimes' name parameter needs to match a specific Java execution environments. See https://github.com/eclipse-jdtls/eclipse.jdt.ls/wiki/Running-the-JAVA-LS-server-from-the-command-line#initialize-request and search "ExecutionEnvironment". + runtimes = { + { + name = 'JavaSE-21', + path = '/usr/lib/jvm/java-21-openjdk', + }, + { + name = 'JavaSE-25', + path = '/usr/lib/jvm/java-25-openjdk', + }, + }, + }, + maven = { + downloadSources = true, + }, + implementationsCodeLens = { + enabled = true, + }, + referencesCodeLens = { + enabled = true, + }, + references = { + includeDecompiledSources = true, + }, + signatureHelp = { enabled = true }, + format = { + enabled = true, + -- Formatting works by default, but you can refer to a specific file/URL if you choose + -- settings = { + -- url = "https://github.com/google/styleguide/blob/gh-pages/intellij-java-google-style.xml", + -- profile = "GoogleStyle", + -- }, + }, + completion = { + favoriteStaticMembers = { + 'org.hamcrest.MatcherAssert.assertThat', + 'org.hamcrest.Matchers.*', + 'org.hamcrest.CoreMatchers.*', + 'org.junit.jupiter.api.Assertions.*', + 'java.util.Objects.requireNonNull', + 'java.util.Objects.requireNonNullElse', + 'org.mockito.Mockito.*', + }, + importOrder = { + 'java', + 'javax', + 'com', + 'org', + }, + }, + sources = { + organizeImports = { + starThreshold = 9999, + staticStarThreshold = 9999, + }, + }, + codeGeneration = { + toString = { + template = '${object.className}{${member.name()}=${member.value}, ${otherMembers}}', + }, + useBlocks = true, + }, + }, + }, + -- Needed for auto-completion with method signatures and placeholders + capabilities = require('blink-cmp').get_lsp_capabilities(), + flags = { + allow_incremental_sync = true, + }, + init_options = { + -- References the bundles defined above to support Debugging and Unit Testing + bundles = bundles, + extendedClientCapabilities = jdtls.extendedClientCapabilities, + }, +} + +-- Needed for debugging +config['on_attach'] = function(client, bufnr) + jdtls.setup_dap { hotcodereplace = 'auto' } + require('jdtls.dap').setup_dap_main_class_configs() +end + +-- This starts a new client & server, or attaches to an existing client & server based on the `root_dir`. +jdtls.start_or_attach(config) diff --git a/init.lua b/init.lua index aff5250e921..4d0d82df249 100644 --- a/init.lua +++ b/init.lua @@ -20,265 +20,487 @@ ===================================================================== ===================================================================== -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: - - - - : - - Tutor - - - - (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 "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! :) ---]] +-- [[ Setting options ]] +-- See `:help vim.o` + +-- Set to true if you have a Nerd Font installed and selected in the terminal +vim.g.have_nerd_font = true + +-- Key mappings +vim.g.mapleader = ' ' -- Set leader key to space +vim.g.maplocalleader = ' ' -- Set local leader key (NEW) + +-- Make background transparent +vim.api.nvim_set_hl(0, 'Normal', { bg = 'none' }) +vim.api.nvim_set_hl(0, 'NormalNC', { bg = 'none' }) +vim.api.nvim_set_hl(0, 'EndOfBuffer', { bg = 'none' }) +vim.api.nvim_set_hl(0, 'SignColumn', { bg = 'none' }) -- Make sign column transparent +vim.opt.number = true -- Line numbers + +-- Basic settings +vim.opt.relativenumber = true -- Relative line numbers +vim.opt.cursorline = true -- Highlight current line +vim.opt.wrap = false -- Don't wrap lines +vim.opt.scrolloff = 10 -- Keep 10 lines above/below cursor +vim.opt.sidescrolloff = 8 -- Keep 8 columns left/right of cursor + +-- Indentation +vim.opt.tabstop = 2 -- Tab width +vim.opt.shiftwidth = 2 -- Indent width +vim.opt.softtabstop = 2 -- Soft tab stop +vim.opt.expandtab = true -- Use spaces instead of tabs +vim.opt.smartindent = true -- Smart auto-indenting +vim.opt.autoindent = true -- Copy indent from current line +vim.o.breakindent = true + +-- Search settings +vim.opt.ignorecase = true -- Case insensitive search +vim.opt.smartcase = true -- Case sensitive if uppercase in search +vim.opt.hlsearch = false -- Don't highlight search results +vim.opt.incsearch = true -- Show matches as you type + +-- Visual settings +vim.opt.termguicolors = true -- Enable 24-bit colors +vim.opt.signcolumn = 'yes' -- Always show sign column +vim.opt.showmatch = true -- Highlight matching brackets +vim.opt.matchtime = 2 -- How long to show matching bracket +vim.opt.cmdheight = 1 -- Command line height +vim.opt.completeopt = 'menuone,noinsert,noselect' -- Completion options +vim.opt.showmode = false -- Don't show mode in command line +vim.opt.pumheight = 10 -- Popup menu height +vim.opt.pumblend = 10 -- Popup menu transparency +vim.opt.winblend = 0 -- Floating window transparency +vim.opt.concealcursor = '' -- Don't hide cursor line markup +vim.opt.conceallevel = 0 -- Don't hide markup +-- vim.opt.lazyredraw = true -- Don't redraw during macros +vim.opt.synmaxcol = 300 -- Syntax highlighting limit +vim.o.winborder = 'rounded' -- Make floating windows have a rounded border +vim.o.list = true +vim.opt.listchars = { tab = ' ', trail = '·', nbsp = '␣' } -- Sets how whitespace chars will be displayed + +-- Folding settings +vim.opt.foldmethod = 'expr' -- Use expression for folding +-- vim.wo.vim.foldexpr = 'v:lua.vim.treesitter.foldexpr()' -- Use treesitter for folding +vim.opt.foldlevel = 99 -- Start with all folds open + +-- File handling +vim.opt.backup = false -- Don't create backup files +vim.opt.writebackup = false -- Don't create backup before writing +vim.opt.swapfile = false -- Don't create swap files +vim.opt.undofile = true -- Persistent undo +vim.o.undofile = true -- Save undo history +vim.opt.undodir = vim.fn.expand '~/.vim/undodir' -- Undo directory +vim.opt.updatetime = 250 -- Faster completion +vim.opt.timeoutlen = 500 -- Key timeout duration +vim.opt.ttimeoutlen = 0 -- Key code timeout +vim.opt.autoread = true -- Auto reload files changed outside vim +vim.opt.autowrite = false -- Don't auto save + +-- Behavior settings +vim.opt.hidden = true -- Allow hidden buffers +vim.opt.errorbells = false -- No error bells +vim.opt.backspace = 'indent,eol,start' -- Better backspace behavior +vim.opt.autochdir = false -- Don't auto change directory +vim.opt.iskeyword:append '-' -- Treat dash as part of word +vim.opt.path:append '**' -- include subdirectories in search +vim.opt.selection = 'exclusive' -- Selection behavior +vim.opt.mouse = 'a' -- Enable mouse support +vim.opt.clipboard:append 'unnamedplus' -- Use system clipboard +vim.opt.modifiable = true -- Allow buffer modifications +vim.opt.encoding = 'UTF-8' -- Set encoding +vim.opt.splitbelow = true -- Horizontal splits go below +vim.opt.splitright = true -- Vertical splits go right +vim.o.inccommand = 'split' +vim.o.confirm = true -- Ask before closing (unsaved changes) + +-- Sync clipboard between OS and Neovim. +-- Schedule the setting after `UiEnter` because it can increase startup-time. +-- Remove this option if you want your OS clipboard to remain independent. +-- See `:help 'clipboard'` +vim.schedule(function() vim.o.clipboard = 'unnamedplus' end) + +-- Don't show the mode, since it's already in the status line +vim.o.showmode = false + +-- [[ Basic Keymaps ]] + +vim.keymap.set('n', 'Ss', 'SessionSave', { desc = 'Save session' }) +vim.keymap.set('n', 'Sl', 'SessionLoad', { desc = 'Load session' }) + +vim.keymap.set('n', '', 'w', { desc = 'Save file' }) + +-- Clear highlights on search when pressing in normal mode +vim.keymap.set('n', '', 'nohlsearch', { desc = 'Clear search highlights' }) +vim.keymap.set('n', '', 'nohlsearch', { desc = 'Clear search highlights' }) + +-- Diagnostic keymaps +-- vim.keymap.set('n', 'dq', vim.diagnostic.setloclist, { desc = 'Open diagnostic [Q]uickfix list' }) + +-- Exit terminal mode in the builtin terminal with a shortcut that is a bit easier +-- NOTE: This won't work in all terminal emulators/tmux/etc. Try your own mapping +-- or just use to exit terminal mode +vim.keymap.set('t', '', '', { desc = 'Exit terminal mode' }) + +-- Keybinds to make split navigation easier. +-- Use CTRL+ to switch between windows +-- +-- See `:help wincmd` for a list of all window commands +vim.keymap.set('n', '', '', { desc = 'Move focus to the left window' }) +vim.keymap.set('n', '', '', { desc = 'Move focus to the right window' }) +vim.keymap.set('n', '', '', { desc = 'Move focus to the lower window' }) +vim.keymap.set('n', '', '', { desc = 'Move focus to the upper window' }) + +-- Splitting & Resizing +vim.keymap.set('n', 'w|', 'vsplit', { desc = 'Split window vertically' }) +vim.keymap.set('n', 'w-', 'split', { desc = 'Split window horizontally' }) + +vim.keymap.set('n', '', 'resize +2', { desc = 'Increase window height' }) +vim.keymap.set('n', '', 'resize -2', { desc = 'Decrease window height' }) +vim.keymap.set('n', '', 'vertical resize +2', { desc = 'Increase window width' }) +vim.keymap.set('n', '', 'vertical resize -2', { desc = 'Decrease window width' }) + +-- Ctrl-Shift-letter doesnt work with my setup -> Fixed by using xxd and using litteral input str +vim.keymap.set('n', '^[[1;9h', 'H', { desc = 'Move window to the left' }) +vim.keymap.set('n', '^[[1;9l', 'L', { desc = 'Move window to the right' }) +vim.keymap.set('n', '^[[1;9j', 'J', { desc = 'Move window to the lower' }) +vim.keymap.set('n', '^[[1;9k', 'K', { desc = 'Move window to the upper' }) + +vim.diagnostic.config { + update_in_insert = false, + severity_sort = true, + float = { border = 'rounded', source = 'if_many' }, + underline = { severity = { min = vim.diagnostic.severity.WARN } }, + + -- Can switch between these as you prefer + virtual_text = true, -- Text shows up at the end of the line + virtual_lines = false, -- Text shows up underneath the line, with virtual lines + + -- Auto open the float, so you can easily read the errors when jumping with `[d` and `]d` + jump = { + on_jump = function(_, bufnr) + vim.diagnostic.open_float { + bufnr = bufnr, + scope = 'cursor', + focus = false, + } + end, + }, +} + +vim.keymap.set('n', 'q', vim.diagnostic.setloclist, { desc = 'Open diagnostic [Q]uickfix list' }) + +-- Center screen when jumping +vim.keymap.set('n', 'n', 'nzzzv', { desc = 'Next search result (centered)' }) +vim.keymap.set('n', 'N', 'Nzzzv', { desc = 'Previous search result (centered)' }) +vim.keymap.set('n', '', 'zz', { desc = 'Half page down (centered)' }) +vim.keymap.set('n', '', 'zz', { desc = 'Half page up (centered)' }) + +-- Delete without yanking +vim.keymap.set({ 'n', 'v' }, 'D', '"_d', { desc = 'Delete without yanking' }) + +-- Paste without yanking +vim.keymap.set('x', 'p', [["_dP]], { desc = 'Paste without yanking' }) + +-- Buffer navigation +vim.keymap.set('n', 'bn', 'bnext', { desc = 'Next buffer' }) +vim.keymap.set('n', 'bp', 'bprevious', { desc = 'Previous buffer' }) + +-- Move lines up/down +vim.keymap.set('n', '', 'm .+1==', { desc = 'Move line down' }) +vim.keymap.set('n', '', 'm .-2==', { desc = 'Move line up' }) +vim.keymap.set('v', '', "m '>+1gv=gv", { desc = 'Move selection down' }) +vim.keymap.set('v', '', "m '<-2gv=gv", { desc = 'Move selection up' }) + +-- Better indenting in visual mode +vim.keymap.set('v', '<', '', '>gv', { desc = 'Indent right and reselect' }) + +-- Better J behavior +vim.keymap.set('n', 'J', 'mzJ`z', { desc = 'Join lines and keep cursor position' }) + +-- ============================================================================ +-- USEFUL FUNCTIONS +-- ============================================================================ + +-- Copy Full File-Path +vim.keymap.set('n', 'yp', function() + local path = vim.fn.expand '%:p' + vim.fn.setreg('+', path) + print('file:', path) +end) + +-- Copy all content of the current buffer +vim.keymap.set('n', 'ya', function() + vim.fn.setreg('+', vim.api.nvim_buf_get_lines(0, 0, -1, false)) + vim.notify 'Copied all content of the current buffer' +end) + +-- Delete all content of the current buffer +vim.keymap.set('n', 'da', function() vim.api.nvim_buf_set_lines(0, 0, -1, false, {}) end) + +-- Select all content of the current buffer +vim.keymap.set('n', 'sa', function() vim.api.nvim_feedkeys('ggVG', 'n', false) end) + +-- Basic autocommands +local augroup = vim.api.nvim_create_augroup('UserConfig', {}) + +-- Highlight yanked text +vim.api.nvim_create_autocmd('TextYankPost', { + desc = 'Highlight when yanking (copying) text', + group = vim.api.nvim_create_augroup('kickstart-highlight-yank', { clear = true }), + callback = function() vim.hl.on_yank() end, +}) + +-- Return to last edit position when opening files +vim.api.nvim_create_autocmd('BufReadPost', { + group = augroup, + callback = function() + local mark = vim.api.nvim_buf_get_mark(0, '"') + local lcount = vim.api.nvim_buf_line_count(0) + if mark[1] > 0 and mark[1] <= lcount then pcall(vim.api.nvim_win_set_cursor, 0, mark) end + end, +}) + +-- Set filetype-specific settings +vim.api.nvim_create_autocmd('FileType', { + group = augroup, + pattern = { 'lua', 'python' }, + callback = function() + vim.opt_local.tabstop = 4 + vim.opt_local.shiftwidth = 4 + end, +}) + +vim.api.nvim_create_autocmd('FileType', { + group = augroup, + pattern = { 'javascript', 'typescript', 'javascriptreact', 'typescriptreact', 'json', 'html', 'css', 'go' }, + callback = function() + vim.opt_local.tabstop = 2 + vim.opt_local.shiftwidth = 2 + end, +}) + +-- Auto-close terminal when process exits +vim.api.nvim_create_autocmd('TermClose', { + group = augroup, + callback = function() + if vim.v.event.status == 0 then vim.api.nvim_buf_delete(0, {}) end + end, +}) + +-- Disable line numbers in terminal +vim.api.nvim_create_autocmd('TermOpen', { + group = augroup, + callback = function() + vim.opt_local.number = false + vim.opt_local.relativenumber = false + vim.opt_local.signcolumn = 'no' + end, +}) + +-- Auto-resize splits when window is resized +vim.api.nvim_create_autocmd('VimResized', { + group = augroup, + callback = function() vim.cmd 'tabdo wincmd =' end, +}) + +-- Create directories when saving files +vim.api.nvim_create_autocmd('BufWritePre', { + callback = function() + local filepath = vim.fn.expand ':p:h' + if filepath:match '^oil://' or vim.uv.fs_realpath(filepath) == nil then return end + if vim.fn.isdirectory(filepath) == 0 then vim.fn.mkdir(filepath, 'p') end + end, +}) + +-- Command-line completion +vim.opt.wildmenu = true +vim.opt.wildmode = 'longest:full,full' +vim.opt.wildignore:append { '*.o', '*.obj', '*.pyc', '*.class', '*.jar' } + +-- Better diff options +vim.opt.diffopt:append 'linematch:60' + +-- Performance improvements +vim.opt.redrawtime = 10000 +vim.opt.maxmempattern = 20000 + +-- Create undo directory if it doesn't exist +local undodir = vim.fn.expand '~/.vim/undodir' +if vim.fn.isdirectory(undodir) == 0 then vim.fn.mkdir(undodir, 'p') end + +-- ============================================================================ +-- FLOATING TERMINAL +-- ============================================================================ + +-- terminal +local terminal_state = { + buf = nil, + win = nil, + is_open = false, +} + +local function FloatingTerminal() + -- If terminal is already open, close it (toggle behavior) + if terminal_state.is_open and vim.api.nvim_win_is_valid(terminal_state.win) then + vim.api.nvim_win_close(terminal_state.win, false) + terminal_state.is_open = false + return + end --- ============================================================ --- SECTION 1: OPTIONS --- Core Neovim settings, leaders, options, basic keymaps, basic autocmds --- ============================================================ -do - -- Enable faster startup by caching compiled Lua modules - vim.loader.enable() + -- Create buffer if it doesn't exist or is invalid + if not terminal_state.buf or not vim.api.nvim_buf_is_valid(terminal_state.buf) then + terminal_state.buf = vim.api.nvim_create_buf(false, true) + -- Set buffer options for better terminal experience + vim.api.nvim_buf_set_option(terminal_state.buf, 'bufhidden', 'hide') + end - -- Set as the leader key - -- See `:help mapleader` - -- NOTE: Must happen before plugins are loaded (otherwise wrong leader will be used) - vim.g.mapleader = ' ' - vim.g.maplocalleader = ' ' + -- Calculate window dimensions + local width = math.floor(vim.o.columns * 0.8) + local height = math.floor(vim.o.lines * 0.8) + local row = math.floor((vim.o.lines - height) / 2) + local col = math.floor((vim.o.columns - width) / 2) + + -- Create the floating window + terminal_state.win = vim.api.nvim_open_win(terminal_state.buf, true, { + relative = 'editor', + width = width, + height = height, + row = row, + col = col, + style = 'minimal', + border = 'rounded', + }) - -- Set to true if you have a Nerd Font installed and selected in the terminal - vim.g.have_nerd_font = false + -- Set transparency for the floating window + vim.api.nvim_win_set_option(terminal_state.win, 'winblend', 0) - -- [[ Setting options ]] - -- See `:help vim.o` - -- NOTE: You can change these options as you wish! - -- For more options, you can see `:help option-list` + -- Set transparent background for the window + vim.api.nvim_win_set_option(terminal_state.win, 'winhighlight', 'Normal:FloatingTermNormal,FloatBorder:FloatingTermBorder') - -- Make line numbers default - vim.o.number = true - -- You can also add relative line numbers, to help with jumping. - -- Experiment for yourself to see if you like it! - -- vim.o.relativenumber = true + -- Define highlight groups for transparency + vim.api.nvim_set_hl(0, 'FloatingTermNormal', { bg = 'none' }) + vim.api.nvim_set_hl(0, 'FloatingTermBorder', { bg = 'none' }) - -- Enable mouse mode, can be useful for resizing splits for example! - vim.o.mouse = 'a' + -- Start terminal if not already running + local has_terminal = false + local lines = vim.api.nvim_buf_get_lines(terminal_state.buf, 0, -1, false) + for _, line in ipairs(lines) do + if line ~= '' then + has_terminal = true + break + end + end - -- Don't show the mode, since it's already in the status line - vim.o.showmode = false + if not has_terminal then vim.fn.termopen(os.getenv 'SHELL') end - -- Sync clipboard between OS and Neovim. - -- Schedule the setting after `UiEnter` because it can increase startup-time. - -- Remove this option if you want your OS clipboard to remain independent. - -- See `:help 'clipboard'` - vim.schedule(function() vim.o.clipboard = 'unnamedplus' end) + terminal_state.is_open = true + vim.cmd 'startinsert' - -- Enable break indent - vim.o.breakindent = true + -- Set up auto-close on buffer leave + vim.api.nvim_create_autocmd('BufLeave', { + buffer = terminal_state.buf, + callback = function() + if terminal_state.is_open and vim.api.nvim_win_is_valid(terminal_state.win) then + vim.api.nvim_win_close(terminal_state.win, false) + terminal_state.is_open = false + end + end, + once = true, + }) +end - -- Enable undo/redo changes even after closing and reopening a file - vim.o.undofile = true +-- Function to explicitly close the terminal +local function CloseFloatingTerminal() + if terminal_state.is_open and vim.api.nvim_win_is_valid(terminal_state.win) then + vim.api.nvim_win_close(terminal_state.win, false) + terminal_state.is_open = false + end +end - -- Case-insensitive searching UNLESS \C or one or more capital letters in the search term - vim.o.ignorecase = true - vim.o.smartcase = true +-- Key mappings +vim.keymap.set('n', 'tft', FloatingTerminal, { noremap = true, silent = true, desc = 'Toggle floating terminal' }) +vim.keymap.set('n', 'tt', 'horizontal terminal', { noremap = true, silent = true, desc = 'Toggle terminal' }) +vim.keymap.set('t', '', function() + if terminal_state.is_open then + vim.api.nvim_win_close(terminal_state.win, false) + terminal_state.is_open = false + end +end, { noremap = true, silent = true, desc = 'Close floating terminal from terminal mode' }) + +-- ============================================================================ +-- TABS +-- ============================================================================ + +-- Tab display settings +vim.opt.showtabline = 1 -- Always show tabline (0=never, 1=when multiple tabs, 2=always) +vim.opt.tabline = '' -- Use default tabline (empty string uses built-in) + +-- Transparent tabline appearance +vim.cmd [[ + hi TabLineFill guibg=NONE ctermfg=242 ctermbg=NONE +]] + +-- Alternative navigation (more intuitive) +vim.keymap.set('n', 'tn', 'tabnew', { desc = 'New tab' }) +vim.keymap.set('n', 'tx', 'tabclose', { desc = 'Close tab' }) + +-- Tab moving +vim.keymap.set('n', 'tm', 'tabmove', { desc = 'Move tab' }) +vim.keymap.set('n', 't>', 'tabmove +1', { desc = 'Move tab right' }) +vim.keymap.set('n', 't<', 'tabmove -1', { desc = 'Move tab left' }) + +-- Function to open file in new tab +local function open_file_in_tab() + vim.ui.input({ prompt = 'File to open in new tab: ', completion = 'file' }, function(input) + if input and input ~= '' then vim.cmd('tabnew ' .. input) end + end) +end - -- Keep signcolumn on by default - vim.o.signcolumn = 'yes' +-- Function to duplicate current tab +local function duplicate_tab() + local current_file = vim.fn.expand '%:p' + if current_file ~= '' then + vim.cmd('tabnew ' .. current_file) + else + vim.cmd 'tabnew' + end +end - -- Decrease update time - vim.o.updatetime = 250 +-- Function to close tabs to the right +local function close_tabs_right() + local current_tab = vim.fn.tabpagenr() + local last_tab = vim.fn.tabpagenr '$' - -- Decrease mapped sequence wait time - vim.o.timeoutlen = 300 + for i = last_tab, current_tab + 1, -1 do + vim.cmd(i .. 'tabclose') + end +end - -- Configure how new splits should be opened - vim.o.splitright = true - vim.o.splitbelow = true +-- Function to close tabs to the left +local function close_tabs_left() + local current_tab = vim.fn.tabpagenr() - -- Sets how neovim will display certain whitespace characters in the editor. - -- See `:help 'list'` - -- and `:help 'listchars'` - -- - -- Notice listchars is set using `vim.opt` instead of `vim.o`. - -- It is very similar to `vim.o` but offers an interface for conveniently interacting with tables. - -- See `:help lua-options` - -- and `:help lua-guide-options` - vim.o.list = true - vim.opt.listchars = { tab = '» ', trail = '·', nbsp = '␣' } - - -- Preview substitutions live, as you type! - vim.o.inccommand = 'split' - - -- Show which line your cursor is on - vim.o.cursorline = true - - -- Minimal number of screen lines to keep above and below the cursor. - vim.o.scrolloff = 10 - - -- if performing an operation that would fail due to unsaved changes in the buffer (like `:q`), - -- instead raise a dialog asking if you wish to save the current file(s) - -- See `:help 'confirm'` - vim.o.confirm = true + for i = current_tab - 1, 1, -1 do + vim.cmd '1tabclose' + end end --- ============================================================ --- SECTION 2: KEYMAPS --- basic keymaps --- ============================================================ -do - -- [[ Basic Keymaps ]] - -- See `:help vim.keymap.set()` - - -- Clear highlights on search when pressing in normal mode - -- See `:help hlsearch` - vim.keymap.set('n', '', 'nohlsearch') - - -- Diagnostic Config & Keymaps - -- See `:help vim.diagnostic.Opts` - vim.diagnostic.config { - update_in_insert = false, - severity_sort = true, - float = { border = 'rounded', source = 'if_many' }, - underline = { severity = { min = vim.diagnostic.severity.WARN } }, - - -- Can switch between these as you prefer - virtual_text = true, -- Text shows up at the end of the line - virtual_lines = false, -- Text shows up underneath the line, with virtual lines - - -- Auto open the float, so you can easily read the errors when jumping with `[d` and `]d` - jump = { - on_jump = function(_, bufnr) - vim.diagnostic.open_float { - bufnr = bufnr, - scope = 'cursor', - focus = false, - } - end, - }, - } - - vim.keymap.set('n', 'q', vim.diagnostic.setloclist, { desc = 'Open diagnostic [Q]uickfix list' }) - - -- Exit terminal mode in the builtin terminal with a shortcut that is a bit easier - -- for people to discover. Otherwise, you normally need to press , which - -- is not what someone will guess without a bit more experience. - -- - -- NOTE: This won't work in all terminal emulators/tmux/etc. Try your own mapping - -- or just use to exit terminal mode - vim.keymap.set('t', '', '', { desc = 'Exit terminal mode' }) - - -- TIP: Disable arrow keys in normal mode - -- vim.keymap.set('n', '', 'echo "Use h to move!!"') - -- vim.keymap.set('n', '', 'echo "Use l to move!!"') - -- vim.keymap.set('n', '', 'echo "Use k to move!!"') - -- vim.keymap.set('n', '', 'echo "Use j to move!!"') - - -- Keybinds to make split navigation easier. - -- Use CTRL+ to switch between windows - -- - -- See `:help wincmd` for a list of all window commands - vim.keymap.set('n', '', '', { desc = 'Move focus to the left window' }) - vim.keymap.set('n', '', '', { desc = 'Move focus to the right window' }) - vim.keymap.set('n', '', '', { desc = 'Move focus to the lower window' }) - vim.keymap.set('n', '', '', { desc = 'Move focus to the upper window' }) - - -- NOTE: Some terminals have colliding keymaps or are not able to send distinct keycodes - -- vim.keymap.set("n", "", "H", { desc = "Move window to the left" }) - -- vim.keymap.set("n", "", "L", { desc = "Move window to the right" }) - -- vim.keymap.set("n", "", "J", { desc = "Move window to the lower" }) - -- vim.keymap.set("n", "", "K", { desc = "Move window to the upper" }) - - -- [[ Basic Autocommands ]] - -- See `:help lua-guide-autocommands` - - -- Highlight when yanking (copying) text - -- Try it with `yap` in normal mode - -- See `:help vim.hl.on_yank()` - vim.api.nvim_create_autocmd('TextYankPost', { - desc = 'Highlight when yanking (copying) text', - group = vim.api.nvim_create_augroup('kickstart-highlight-yank', { clear = true }), - callback = function() vim.hl.on_yank() end, - }) -end +-- Enhanced keybindings +vim.keymap.set('n', 'tO', open_file_in_tab, { desc = 'Open file in new tab' }) +vim.keymap.set('n', 'td', duplicate_tab, { desc = 'Duplicate current tab' }) +vim.keymap.set('n', 'tr', close_tabs_right, { desc = 'Close tabs to the right' }) +vim.keymap.set('n', 'tL', close_tabs_left, { desc = 'Close tabs to the left' }) + +vim.keymap.set('n', 'x', 'q', { desc = 'Smart close buffer/tab' }) -- ============================================================ -- SECTION 3: PLUGIN MANAGER INTRO -- vim.pack intro, build hooks -- ============================================================ do - -- [[ Intro to `vim.pack` ]] - -- `vim.pack` is a new plugin manager built into Neovim, - -- which provides a Lua interface for installing and managing plugins. - -- - -- See `:help vim.pack`, `:help vim.pack-examples` or the - -- excellent blog post from the creator of vim.pack and mini.nvim: - -- https://echasnovski.com/blog/2026-03-13-a-guide-to-vim-pack - -- - -- To inspect plugin state and pending updates, run - -- :lua vim.pack.update(nil, { offline = true }) - -- - -- To update plugins, run - -- :lua vim.pack.update() - -- - -- - -- Throughout the rest of the config there will be examples - -- of how to install and configure plugins using `vim.pack`. - -- - -- In this section we set up some autocommands to run build - -- steps for certain plugins after they are installed or updated. - local function run_build(name, cmd, cwd) local result = vim.system(cmd, { cwd = cwd }):wait() if result.code ~= 0 then @@ -319,665 +541,11 @@ do }) end ----Because most plugins are hosted on GitHub, you can use the helper ----function to have less repetition in the following sections. ----@param repo string ----@return string -local function gh(repo) return 'https://github.com/' .. repo end +-- Uncomment the following line and add your plugins to `lua/custom/plugins/*.lua` to get going. +require 'kickstart.plugins' +require 'custom.plugins' --- ============================================================ --- SECTION 4: UI / CORE UX PLUGINS --- guess-indent, gitsigns, which-key, colorscheme, todo-comments, mini modules --- ============================================================ -do - -- [[ Installing and Configuring Plugins ]] - -- - -- To install a plugin simply call `vim.pack.add` with its git url. - -- This will download the default branch of the plugin, which will usually be `main` or `master` - -- You can also have more advanced specs, which we will talk about later. - -- - -- For most plugins its not enough to install them, you also need to call their `.setup()` to start them. - -- - -- For example, lets say we want to install `guess-indent.nvim` - a plugin for - -- automatically detecting and setting the indentation. - -- - -- We first install it from https://github.com/NMAC427/guess-indent.nvim - -- and then call its `setup()` function to start it with default settings. - vim.pack.add { gh 'NMAC427/guess-indent.nvim' } - require('guess-indent').setup {} - - -- Here is a more advanced configuration example that passes options to `gitsigns.nvim` - -- - -- See `:help gitsigns` to understand what each configuration key does. - -- Adds git related signs to the gutter, as well as utilities for managing changes - vim.pack.add { gh 'lewis6991/gitsigns.nvim' } - require('gitsigns').setup { - signs = { - add = { text = '+' }, ---@diagnostic disable-line: missing-fields - change = { text = '~' }, ---@diagnostic disable-line: missing-fields - delete = { text = '_' }, ---@diagnostic disable-line: missing-fields - topdelete = { text = '‾' }, ---@diagnostic disable-line: missing-fields - changedelete = { text = '~' }, ---@diagnostic disable-line: missing-fields - }, - } - - -- Useful plugin to show you pending keybinds. - vim.pack.add { gh 'folke/which-key.nvim' } - require('which-key').setup { - -- Delay between pressing a key and opening which-key (milliseconds) - delay = 0, - icons = { mappings = vim.g.have_nerd_font }, - -- Document existing key chains - spec = { - { 's', group = '[S]earch', mode = { 'n', 'v' } }, - { 't', group = '[T]oggle' }, - { 'h', group = 'Git [H]unk', mode = { 'n', 'v' } }, -- Enable gitsigns recommended keymaps first - { 'gr', group = 'LSP Actions', mode = { 'n' } }, - }, - } - - -- [[ Colorscheme ]] - -- You can easily change to a different colorscheme. - -- Change the name of the colorscheme plugin below, and then - -- change the command under that to load whatever the name of that colorscheme is. - -- - -- If you want to see what colorschemes are already installed, you can use `:Telescope colorscheme`. - vim.pack.add { gh 'folke/tokyonight.nvim' } - ---@diagnostic disable-next-line: missing-fields - require('tokyonight').setup { - styles = { - comments = { italic = false }, -- Disable italics in comments - }, - } - - -- 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' - - -- Highlight todo, notes, etc in comments - vim.pack.add { gh 'folke/todo-comments.nvim' } - require('todo-comments').setup { signs = false } - - -- [[ mini.nvim ]] - -- A collection of various small independent plugins/modules - vim.pack.add { gh 'nvim-mini/mini.nvim' } - - -- If a nerd font is available, load the icons module for pretty icons in various plugins. - if vim.g.have_nerd_font then - require('mini.icons').setup() - -- Used for backwards compatibility with plugins that require `nvim-web-devicons` (e.g. telescope.nvim) - MiniIcons.mock_nvim_web_devicons() - end - - -- Better Around/Inside textobjects - -- - -- Examples: - -- - va) - [V]isually select [A]round [)]paren - -- - yiiq - [Y]ank [I]nside [I]+1 [Q]uote - -- - ci' - [C]hange [I]nside [']quote - require('mini.ai').setup { - -- NOTE: Avoid conflicts with the built-in incremental selection mappings on Neovim>=0.12 (see `:help treesitter-incremental-selection`) - mappings = { - around_next = 'aa', - inside_next = 'ii', - }, - n_lines = 500, - } - - -- 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() - - -- 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/nvim-mini/mini.nvim -end - --- ============================================================ --- SECTION 5: SEARCH & NAVIGATION --- Telescope setup, keymaps, LSP picker mappings --- ============================================================ -do - -- [[ Fuzzy Finder (files, lsp, etc) ]] - -- - -- 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! - -- - -- There are lots of other alternative pickers (like snacks.picker, or fzf-lua) - -- so feel free to experiment and see what you like! - -- - -- 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! - - ---@type (string|vim.pack.Spec)[] - local telescope_plugins = { - gh 'nvim-lua/plenary.nvim', - gh 'nvim-telescope/telescope.nvim', - gh 'nvim-telescope/telescope-ui-select.nvim', - } - if vim.fn.executable 'make' == 1 then table.insert(telescope_plugins, gh 'nvim-telescope/telescope-fzf-native.nvim') end - - -- NOTE: You can install multiple plugins at once - vim.pack.add(telescope_plugins) - - -- 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() }, - }, - } - - -- 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', 'v' }, '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', 'sc', builtin.commands, { desc = '[S]earch [C]ommands' }) - vim.keymap.set('n', '', builtin.buffers, { desc = '[ ] Find existing buffers' }) - - -- Add Telescope-based LSP pickers when an LSP attaches to a buffer. - -- If you later switch picker plugins, this is where to update these mappings. - vim.api.nvim_create_autocmd('LspAttach', { - group = vim.api.nvim_create_augroup('telescope-lsp-attach', { clear = true }), - callback = function(event) - local buf = event.buf - - -- Find references for the word under your cursor. - vim.keymap.set('n', 'grr', builtin.lsp_references, { buffer = buf, desc = '[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. - vim.keymap.set('n', 'gri', builtin.lsp_implementations, { buffer = buf, desc = '[G]oto [I]mplementation' }) - - -- 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 . - vim.keymap.set('n', 'grd', builtin.lsp_definitions, { buffer = buf, desc = '[G]oto [D]efinition' }) - - -- Fuzzy find all the symbols in your current document. - -- Symbols are things like variables, functions, types, etc. - vim.keymap.set('n', 'gO', builtin.lsp_document_symbols, { buffer = buf, desc = 'Open Document Symbols' }) - - -- Fuzzy find all the symbols in your current workspace. - -- Similar to document symbols, except searches over your entire project. - vim.keymap.set('n', 'gW', builtin.lsp_dynamic_workspace_symbols, { buffer = buf, desc = 'Open Workspace Symbols' }) - - -- 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*. - vim.keymap.set('n', 'grt', builtin.lsp_type_definitions, { buffer = buf, desc = '[G]oto [T]ype Definition' }) - end, - }) - - -- Override default behavior and theme when searching - 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', follow = true } end, { desc = '[S]earch [N]eovim files' }) -end - --- ============================================================ --- SECTION 6: LSP --- LSP keymaps, server configuration, Mason tools installations --- ============================================================ -do - -- [[ LSP Configuration ]] - -- 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` - - -- Useful status updates for LSP. - vim.pack.add { gh 'j-hui/fidget.nvim' } - require('fidget').setup {} - - -- 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) - -- 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, mode) - mode = mode or 'n' - vim.keymap.set(mode, keys, func, { buffer = event.buf, desc = 'LSP: ' .. desc }) - end - - -- Rename the variable under your cursor. - -- Most Language Servers support renaming across files, etc. - map('grn', 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('gra', vim.lsp.buf.code_action, '[G]oto Code [A]ction', { 'n', 'x' }) - - -- WARN: This is not Goto Definition, this is Goto Declaration. - -- For example, in C this would take you to the header. - map('grD', 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 - -- - -- 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('textDocument/documentHighlight', event.buf) then - local highlight_augroup = vim.api.nvim_create_augroup('kickstart-lsp-highlight', { clear = false }) - vim.api.nvim_create_autocmd({ 'CursorHold', 'CursorHoldI' }, { - buffer = event.buf, - group = highlight_augroup, - callback = vim.lsp.buf.document_highlight, - }) - - vim.api.nvim_create_autocmd({ 'CursorMoved', 'CursorMovedI' }, { - buffer = event.buf, - group = highlight_augroup, - callback = vim.lsp.buf.clear_references, - }) - - vim.api.nvim_create_autocmd('LspDetach', { - group = vim.api.nvim_create_augroup('kickstart-lsp-detach', { clear = true }), - callback = function(event2) - vim.lsp.buf.clear_references() - vim.api.nvim_clear_autocmds { group = 'kickstart-lsp-highlight', buffer = event2.buf } - end, - }) - 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('textDocument/inlayHint', event.buf) then - map('th', function() vim.lsp.inlay_hint.enable(not vim.lsp.inlay_hint.is_enabled { bufnr = event.buf }) end, '[T]oggle Inlay [H]ints') - end - end, - }) - - -- Enable the following language servers - -- Feel free to add/remove any LSPs that you want here. They will automatically be installed. - -- See `:help lsp-config` for information about keys and how to configure - ---@type table - local servers = { - -- clangd = {}, - -- gopls = {}, - -- pyright = {}, - -- rust_analyzer = {}, - -- - -- 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 = {}, - - stylua = {}, -- Used to format Lua code - - -- Special Lua Config, as recommended by neovim help docs - lua_ls = { - on_init = function(client) - client.server_capabilities.documentFormattingProvider = false -- Disable formatting (formatting is done by stylua) - - if client.workspace_folders then - local path = client.workspace_folders[1].name - if path ~= vim.fn.stdpath 'config' and (vim.uv.fs_stat(path .. '/.luarc.json') or vim.uv.fs_stat(path .. '/.luarc.jsonc')) then return end - end - - client.config.settings.Lua = vim.tbl_deep_extend('force', client.config.settings.Lua, { - runtime = { - version = 'LuaJIT', - path = { 'lua/?.lua', 'lua/?/init.lua' }, - }, - workspace = { - checkThirdParty = false, - -- NOTE: this is a lot slower and will cause issues when working on your own configuration. - -- See https://github.com/neovim/nvim-lspconfig/issues/3189 - library = vim.tbl_extend('force', vim.api.nvim_get_runtime_file('', true), { - '${3rd}/luv/library', - '${3rd}/busted/library', - }), - }, - }) - end, - ---@type lspconfig.settings.lua_ls - settings = { - Lua = { - format = { enable = false }, -- Disable formatting (formatting is done by stylua) - }, - }, - }, - } - - vim.pack.add { - gh 'neovim/nvim-lspconfig', - gh 'mason-org/mason.nvim', - gh 'mason-org/mason-lspconfig.nvim', - gh 'WhoIsSethDaniel/mason-tool-installer.nvim', - } - - -- Automatically install LSPs and related tools to stdpath for Neovim - require('mason').setup {} - - -- 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. - local ensure_installed = vim.tbl_keys(servers or {}) - vim.list_extend(ensure_installed, { - -- You can add other tools here that you want Mason to install - }) - - require('mason-tool-installer').setup { ensure_installed = ensure_installed } - - for name, server in pairs(servers) do - vim.lsp.config(name, server) - vim.lsp.enable(name) - end -end - --- ============================================================ --- SECTION 7: FORMATTING --- conform.nvim setup and keymap --- ============================================================ -do - -- [[ Formatting ]] - vim.pack.add { gh 'stevearc/conform.nvim' } - require('conform').setup { - notify_on_error = false, - format_on_save = function(bufnr) - -- You can specify filetypes to autoformat on save here: - local enabled_filetypes = { - -- lua = true, - -- python = true, - } - if enabled_filetypes[vim.bo[bufnr].filetype] then - return { timeout_ms = 500 } - else - return nil - end - end, - default_format_opts = { - lsp_format = 'fallback', -- Use external formatters if configured below, otherwise use LSP formatting. Set to `false` to disable LSP formatting entirely. - }, - -- You can also specify external formatters in here. - formatters_by_ft = { - -- rust = { 'rustfmt' }, - -- 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 }, - }, - } - - vim.keymap.set({ 'n', 'v' }, 'f', function() require('conform').format { async = true } end, { desc = '[F]ormat buffer' }) -end - --- ============================================================ --- SECTION 8: AUTOCOMPLETE & SNIPPETS --- blink.cmp and luasnip setup --- ============================================================ -do - -- [[ Snippet Engine ]] - - -- NOTE: You can also specify plugin using a version range for its git tag. - -- See `:help vim.version.range()` for more info - vim.pack.add { { src = gh 'L3MON4D3/LuaSnip', version = vim.version.range '2.*' } } - require('luasnip').setup {} - - -- `friendly-snippets` contains a variety of premade snippets. - -- See the README about individual language/framework/plugin snippets: - -- https://github.com/rafamadriz/friendly-snippets - -- - -- vim.pack.add { gh 'rafamadriz/friendly-snippets' } - -- require('luasnip.loaders.from_vscode').lazy_load() - - -- [[ Autocomplete Engine ]] - vim.pack.add { { src = gh 'saghen/blink.cmp', version = vim.version.range '1.*' } } - require('blink.cmp').setup { - 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! - -- - -- All presets have the following mappings: - -- /: move to right/left of your snippet expansion - -- : Open menu or open docs if already open - -- / or /: Select next/previous item - -- : Hide menu - -- : Toggle signature help - -- - -- See `:help blink-cmp-config-keymap` for defining your own keymap - preset = 'default', - - -- 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' }, - }, - - 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 `:help 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 }, - } -end - --- ============================================================ --- SECTION 9: TREESITTER --- Parser installation, syntax highlighting, folds, indentation --- ============================================================ -do - -- [[ Configure Treesitter ]] - -- Used to highlight, edit, and navigate code - -- - -- See `:help nvim-treesitter-intro` - - -- NOTE: You can also specify a branch or a specific commit - vim.pack.add { { src = gh 'nvim-treesitter/nvim-treesitter', version = 'main' } } - - -- Ensure basic parsers are installed - local parsers = { 'bash', 'c', 'diff', 'html', 'lua', 'luadoc', 'markdown', 'markdown_inline', 'query', 'vim', 'vimdoc' } - require('nvim-treesitter').install(parsers) - - ---@param buf integer - ---@param language string - local function treesitter_try_attach(buf, language) - -- Check if a parser exists and load it - if not vim.treesitter.language.add(language) then return end - -- Enable syntax highlighting and other treesitter features - vim.treesitter.start(buf, language) - - -- Enable treesitter based folds - -- For more info on folds see `:help folds` - -- vim.wo.foldexpr = 'v:lua.vim.treesitter.foldexpr()' - -- vim.wo.foldmethod = 'expr' - - -- Check if treesitter indentation is available for this language, and if so enable it - -- in case there is no indent query, the indentexpr will fallback to the vim's built in one - local has_indent_query = vim.treesitter.query.get(language, 'indents') ~= nil - - -- Enable treesitter based indentation - if has_indent_query then vim.bo.indentexpr = "v:lua.require'nvim-treesitter'.indentexpr()" end - end - - local available_parsers = require('nvim-treesitter').get_available() - vim.api.nvim_create_autocmd('FileType', { - callback = function(args) - local buf, filetype = args.buf, args.match - - local language = vim.treesitter.language.get_lang(filetype) - if not language then return end - - local installed_parsers = require('nvim-treesitter').get_installed 'parsers' - - if vim.tbl_contains(installed_parsers, language) then - -- Enable the parser if it is already installed - treesitter_try_attach(buf, language) - elseif vim.tbl_contains(available_parsers, language) then - -- If a parser is available in `nvim-treesitter`, auto-install it and enable it after the installation is done - require('nvim-treesitter').install(language):await(function() treesitter_try_attach(buf, language) end) - else - -- Try to enable treesitter features in case the parser exists but is not available from `nvim-treesitter` - treesitter_try_attach(buf, language) - end - end, - }) -end - --- ============================================================ --- SECTION 10: OPTIONAL EXAMPLES / NEXT STEPS --- kickstart.plugins.* examples --- ============================================================ -do - -- 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. - - -- 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 recommended keymaps - - -- NOTE: You can add your own plugins, configuration, etc from `lua/custom/plugins/*.lua` - -- - -- Uncomment the following line and add your plugins to `lua/custom/plugins/*.lua` to get going. - -- require 'custom.plugins' -end +require 'custom.after.transparency' -- The line beneath this is called `modeline`. See `:help modeline` -- vim: ts=2 sts=2 sw=2 et diff --git a/lua/custom/after/transparency.lua b/lua/custom/after/transparency.lua new file mode 100644 index 00000000000..59845a3469b --- /dev/null +++ b/lua/custom/after/transparency.lua @@ -0,0 +1,45 @@ +-- transparent background +vim.api.nvim_set_hl(0, 'Normal', { bg = 'none' }) +vim.api.nvim_set_hl(0, 'NormalFloat', { bg = 'none' }) +vim.api.nvim_set_hl(0, 'FloatBorder', { bg = 'none' }) +vim.api.nvim_set_hl(0, 'Pmenu', { bg = 'none' }) +vim.api.nvim_set_hl(0, 'Terminal', { bg = 'none' }) +vim.api.nvim_set_hl(0, 'EndOfBuffer', { bg = 'none' }) +vim.api.nvim_set_hl(0, 'FoldColumn', { bg = 'none' }) +vim.api.nvim_set_hl(0, 'Folded', { bg = 'none' }) +vim.api.nvim_set_hl(0, 'SignColumn', { bg = 'none' }) +vim.api.nvim_set_hl(0, 'NormalNC', { bg = 'none' }) +vim.api.nvim_set_hl(0, 'WhichKeyFloat', { bg = 'none' }) +vim.api.nvim_set_hl(0, 'TelescopeBorder', { bg = 'none' }) +vim.api.nvim_set_hl(0, 'TelescopeNormal', { bg = 'none' }) +vim.api.nvim_set_hl(0, 'TelescopePromptBorder', { bg = 'none' }) +vim.api.nvim_set_hl(0, 'TelescopePromptTitle', { bg = 'none' }) + +-- transparent background for neotree +vim.api.nvim_set_hl(0, 'NeoTreeNormal', { bg = 'none' }) +vim.api.nvim_set_hl(0, 'NeoTreeNormalNC', { bg = 'none' }) +vim.api.nvim_set_hl(0, 'NeoTreeVertSplit', { bg = 'none' }) +vim.api.nvim_set_hl(0, 'NeoTreeWinSeparator', { bg = 'none' }) +vim.api.nvim_set_hl(0, 'NeoTreeEndOfBuffer', { bg = 'none' }) + +-- transparent background for nvim-tree +vim.api.nvim_set_hl(0, 'NvimTreeNormal', { bg = 'none' }) +vim.api.nvim_set_hl(0, 'NvimTreeVertSplit', { bg = 'none' }) +vim.api.nvim_set_hl(0, 'NvimTreeEndOfBuffer', { bg = 'none' }) + +-- transparent notify background +vim.api.nvim_set_hl(0, 'NotifyINFOBody', { bg = 'none' }) +vim.api.nvim_set_hl(0, 'NotifyERRORBody', { bg = 'none' }) +vim.api.nvim_set_hl(0, 'NotifyWARNBody', { bg = 'none' }) +vim.api.nvim_set_hl(0, 'NotifyTRACEBody', { bg = 'none' }) +vim.api.nvim_set_hl(0, 'NotifyDEBUGBody', { bg = 'none' }) +vim.api.nvim_set_hl(0, 'NotifyINFOTitle', { bg = 'none' }) +vim.api.nvim_set_hl(0, 'NotifyERRORTitle', { bg = 'none' }) +vim.api.nvim_set_hl(0, 'NotifyWARNTitle', { bg = 'none' }) +vim.api.nvim_set_hl(0, 'NotifyTRACETitle', { bg = 'none' }) +vim.api.nvim_set_hl(0, 'NotifyDEBUGTitle', { bg = 'none' }) +vim.api.nvim_set_hl(0, 'NotifyINFOBorder', { bg = 'none' }) +vim.api.nvim_set_hl(0, 'NotifyERRORBorder', { bg = 'none' }) +vim.api.nvim_set_hl(0, 'NotifyWARNBorder', { bg = 'none' }) +vim.api.nvim_set_hl(0, 'NotifyTRACEBorder', { bg = 'none' }) +vim.api.nvim_set_hl(0, 'NotifyDEBUGBorder', { bg = 'none' }) diff --git a/lua/custom/plugins/autotags.lua b/lua/custom/plugins/autotags.lua new file mode 100644 index 00000000000..74083516d43 --- /dev/null +++ b/lua/custom/plugins/autotags.lua @@ -0,0 +1,25 @@ +-- return { +-- 'windwp/nvim-ts-autotag', +-- dependencies = { 'nvim-treesitter/nvim-treesitter' }, +-- config = function() +-- require('nvim-ts-autotag').setup { +-- autotag = { +-- enable = true, +-- enable_rename = true, +-- enable_close = true, +-- enable_close_on_slash = true, +-- filetypes = { +-- 'html', +-- 'xml', +-- 'javascript', +-- 'javascriptreact', +-- 'typescript', +-- 'typescriptreact', +-- 'vue', +-- 'svelte', +-- }, +-- }, +-- } +-- end, +-- event = 'InsertEnter', +-- } diff --git a/lua/custom/plugins/color-picker.lua b/lua/custom/plugins/color-picker.lua new file mode 100644 index 00000000000..80aeca950c9 --- /dev/null +++ b/lua/custom/plugins/color-picker.lua @@ -0,0 +1,5 @@ +local function gh(repo) return 'https://github.com/' .. repo end +do + vim.pack.add { gh 'eero-lehtinen/oklch-color-picker.nvim' } + require('oklch-color-picker').setup {} +end diff --git a/lua/custom/plugins/harpoon.lua b/lua/custom/plugins/harpoon.lua new file mode 100644 index 00000000000..d41b5e9b189 --- /dev/null +++ b/lua/custom/plugins/harpoon.lua @@ -0,0 +1,78 @@ +-- local function gh(repo) return 'https://github.com/' .. repo end +-- do +-- vim.pack.add { { src = gh 'ThePrimeagen/harpoon', branch = "harpoon2" }, gh "nvim-lua/plenary.nvim" } +-- require('harpoon').setup { +-- keys = { +-- { +-- 'hh', +-- 'lua require("harpoon.ui").toggle_quick_menu()', +-- desc = 'Toggle Harpoon Quick Menu', +-- }, +-- { +-- 'ha', +-- 'lua require("harpoon.mark").add_file()', +-- desc = 'Mark Current File', +-- }, +-- { +-- 'hr', +-- 'lua require("harpoon.mark").clear_file()', +-- desc = 'Remove Current File', +-- }, +-- { +-- 'hn', +-- 'lua require("harpoon.ui").nav_next()', +-- desc = 'Next Harpoon', +-- }, +-- { +-- 'hp', +-- 'lua require("harpoon.ui").nav_prev()', +-- desc = 'Previous Harpoon', +-- }, +-- { +-- 'h&', +-- 'lua require("harpoon.ui").nav_file(1)', +-- desc = 'Go to 1st Mark', +-- }, +-- { +-- 'hé', +-- 'lua require("harpoon.ui").nav_file(2)', +-- desc = 'Go to 2nd Mark', +-- }, +-- { +-- 'h"', +-- 'lua require("harpoon.ui").nav_file(3)', +-- desc = 'Go to 3rd Mark', +-- }, +-- { +-- "h'", +-- 'lua require("harpoon.ui").nav_file(4)', +-- desc = 'Go to 4th Mark', +-- }, +-- { +-- 'h(', +-- 'lua require("harpoon.ui").nav_file(5)', +-- desc = 'Go to 5th Mark', +-- }, +-- { +-- 'h§', +-- 'lua require("harpoon.ui").nav_file(6)', +-- desc = 'Go to 6th Mark', +-- }, +-- { +-- 'hè', +-- 'lua require("harpoon.ui").nav_file(7)', +-- desc = 'Go to 7th Mark', +-- }, +-- { +-- 'h!', +-- 'lua require("harpoon.ui").nav_file(8)', +-- desc = 'Go to 8th Mark', +-- }, +-- { +-- 'hç', +-- 'lua require("harpoon.ui").nav_file(9)', +-- desc = 'Go to 9th Mark', +-- }, +-- } +-- } +-- end diff --git a/lua/custom/plugins/hidden-diagnostic.lua b/lua/custom/plugins/hidden-diagnostic.lua new file mode 100644 index 00000000000..940a46e920b --- /dev/null +++ b/lua/custom/plugins/hidden-diagnostic.lua @@ -0,0 +1,11 @@ +-- return { +-- 'rachartier/tiny-inline-diagnostic.nvim', +-- event = 'VeryLazy', +-- priority = 1000, +-- config = function() +-- require('tiny-inline-diagnostic').setup() +-- vim.diagnostic.config { +-- virtual_text = false, +-- } -- Only if needed in your configuration, if you already have native LSP diagnostics +-- end, +-- } diff --git a/lua/custom/plugins/markdown.lua b/lua/custom/plugins/markdown.lua new file mode 100644 index 00000000000..5bfec172b72 --- /dev/null +++ b/lua/custom/plugins/markdown.lua @@ -0,0 +1,8 @@ +local function gh(repo) return 'https://github.com/' .. repo end +do + vim.pack.add { + gh 'OXY2DEV/markview.nvim', + gh 'saghen/blink.lib', + gh 'saghen/blink.cmp', + } +end diff --git a/lua/custom/plugins/supermaven.lua b/lua/custom/plugins/supermaven.lua new file mode 100644 index 00000000000..f2a8d5bc90f --- /dev/null +++ b/lua/custom/plugins/supermaven.lua @@ -0,0 +1,19 @@ +local function gh(repo) return 'https://github.com/' .. repo end +do + vim.pack.add { gh 'supermaven-inc/supermaven-nvim' } + require('supermaven-nvim').setup { + keymaps = { + accept_suggestion = '', + clear_suggestion = '', + accept_word = '', + }, + ignore_filetypes = { cpp = true }, -- or { "cpp", } + color = { + cterm = 244, + }, + log_level = 'info', -- set to "off" to disable logging completely + disable_inline_completion = false, -- disables inline completion for use with cmp + disable_keymaps = false, -- disables built in keymaps for more manual control + condition = function() return false end, -- condition to check for stopping supermaven, `true` means to stop supermaven when the condition is true.} + } +end diff --git a/lua/custom/plugins/tmux-navigator.lua b/lua/custom/plugins/tmux-navigator.lua new file mode 100644 index 00000000000..e5d2856af3a --- /dev/null +++ b/lua/custom/plugins/tmux-navigator.lua @@ -0,0 +1,9 @@ +local function gh(repo) return 'https://github.com/' .. repo end +do + vim.pack.add { gh 'christoomey/vim-tmux-navigator' } + vim.keymap.set('n', '', 'TmuxNavigateLeft') + vim.keymap.set('n', '', 'TmuxNavigateDown') + vim.keymap.set('n', '', 'TmuxNavigateUp') + vim.keymap.set('n', '', 'TmuxNavigateRight') + vim.keymap.set('n', '', 'TmuxNavigatePrevious') +end diff --git a/lua/custom/plugins/trouble.lua b/lua/custom/plugins/trouble.lua new file mode 100644 index 00000000000..3dce8681a5f --- /dev/null +++ b/lua/custom/plugins/trouble.lua @@ -0,0 +1,48 @@ +local function gh(repo) return 'https://github.com/' .. repo end +do + vim.pack.add { gh 'folke/trouble.nvim' } + require('trouble').setup { + keys = { + { + 'dt', + 'Trouble diagnostics toggle', + desc = 'Toggle Diagnostics', + }, + { + 'db', + 'Trouble diagnostics toggle filter.buf=0', + desc = 'Toggle Buffer Diagnostics', + }, + { + 'qq', + 'Trouble quickfix toggle', + desc = 'Toggle Quickfix List', + }, + { + 'qn', + 'cnext', + desc = 'Diagnostic Next', + }, + { + 'qp', + 'cprevious', + desc = 'Diagnostic Previous', + }, + { + 'ql', + 'Trouble loclist toggle', + desc = 'Toggle Location List', + }, + { + 'qc', + ':lua vim.fn.setqflist({}, "r")', + desc = 'Clear Quickfix List', + }, + { + 'qR', + 'Trouble lsp toggle focus=false win.position=right', + desc = 'Toggle LSP References', + }, + }, + } +end diff --git a/lua/custom/snippets/elexir.lua b/lua/custom/snippets/elexir.lua new file mode 100644 index 00000000000..a9781802f05 --- /dev/null +++ b/lua/custom/snippets/elexir.lua @@ -0,0 +1,11 @@ +-- Elixir snippets + +local ls = require 'luasnip' +local s = ls.snippet +local i = ls.insert_node + +local fmt = require('luasnip.extras.fmt').fmt + +ls.add_snippets('elixir', { + s('el', fmt('<%= {} %>{}', { i(1), i(0) })), +}) diff --git a/lua/custom/snippets/kotlin.lua b/lua/custom/snippets/kotlin.lua new file mode 100644 index 00000000000..e47db414712 --- /dev/null +++ b/lua/custom/snippets/kotlin.lua @@ -0,0 +1,33 @@ +-- Kotlin snippets + +local ls = require 'luasnip' +local s = ls.snippet +local i = ls.insert_node +local t = ls.text_node +local f = ls.function_node +local c = ls.choice_node +local d = ls.dynamic_node + +local fmt = require('luasnip.extras.fmt').fmt + +ls.add_snippets('kotlin', { + s( + 'comp', + fmt( + [[ + @Composable + fun []([]) { + [] + } + ]], + { + i(1, 'name'), + i(2, 'params'), + i(3, 'body'), + }, + { + delimiters = '[]', + } + ) + ), +}) diff --git a/lua/kickstart/plugins/auto-completion.lua b/lua/kickstart/plugins/auto-completion.lua new file mode 100644 index 00000000000..0b78dc04d32 --- /dev/null +++ b/lua/kickstart/plugins/auto-completion.lua @@ -0,0 +1,76 @@ +-- Autocompletion +local function gh(repo) return 'https://github.com/' .. repo end +do + vim.pack.add { gh 'saghen/blink.lib' } + vim.pack.add { { src = gh 'saghen/blink.cmp', version = vim.version.range '2.*' } } + vim.pack.add { { src = gh 'saghen/blink.cmp', version = vim.version.range '1.*' } } + require('blink.cmp').setup { + 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! + -- + -- All presets have the following mappings: + -- /: move to right/left of your snippet expansion + -- : Open menu or open docs if already open + -- / or /: Select next/previous item + -- : Hide menu + -- : Toggle signature help + [''] = { 'select_and_accept', 'fallback' }, + [''] = { 'select_and_accept', 'fallback' }, + [''] = { 'select_and_accept', 'fallback' }, + [''] = { 'select_prev', 'fallback' }, + [''] = { 'select_next', 'fallback' }, + [''] = { 'select_prev', 'fallback' }, + [''] = { 'select_next', 'fallback' }, + [''] = { 'select_prev', 'fallback' }, + [''] = { 'select_next', 'fallback' }, + [''] = false, + + -- See :h blink-cmp-config-keymap for defining your own keymap + preset = 'super-tab', + + -- 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 = true, auto_show_delay_ms = 500 }, + }, + + sources = { + default = { 'lsp', 'path', 'snippets', 'buffer' }, + }, + + 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 }, + } +end diff --git a/lua/kickstart/plugins/autopairs.lua b/lua/kickstart/plugins/autopairs.lua index 1d2cdab098d..40b70138932 100644 --- a/lua/kickstart/plugins/autopairs.lua +++ b/lua/kickstart/plugins/autopairs.lua @@ -1,5 +1,7 @@ -- autopairs -- https://github.com/windwp/nvim-autopairs - -vim.pack.add { 'https://github.com/windwp/nvim-autopairs' } -require('nvim-autopairs').setup {} +local function gh(repo) return 'https://github.com/' .. repo end +do + vim.pack.add { gh 'windwp/nvim-autopairs' } + require('nvim-autopairs').setup {} +end diff --git a/lua/kickstart/plugins/debug.lua b/lua/kickstart/plugins/debug.lua index db5448c2cfc..8f91b8a9e0f 100644 --- a/lua/kickstart/plugins/debug.lua +++ b/lua/kickstart/plugins/debug.lua @@ -5,91 +5,93 @@ -- Primarily focused on configuring the debugger for Go, but can -- be extended to other languages as well. That's why it's called -- kickstart.nvim and not kitchen-sink.nvim ;) +local function gh(repo) return 'https://github.com/' .. repo end +do + vim.pack.add { + gh 'mfussenegger/nvim-dap', + gh 'rcarriga/nvim-dap-ui', + gh 'nvim-neotest/nvim-nio', + gh 'mason-org/mason.nvim', + gh 'jay-babu/mason-nvim-dap.nvim', + gh 'leoluz/nvim-dap-go', + } -vim.pack.add { - 'https://github.com/mfussenegger/nvim-dap', - 'https://github.com/rcarriga/nvim-dap-ui', - 'https://github.com/nvim-neotest/nvim-nio', - 'https://github.com/mason-org/mason.nvim', - 'https://github.com/jay-babu/mason-nvim-dap.nvim', - 'https://github.com/leoluz/nvim-dap-go', -} + -- Basic debugging keymaps, feel free to change to your liking! + vim.keymap.set('n', '', function() require('dap').continue() end, { desc = 'Debug: Start/Continue' }) + vim.keymap.set('n', '', function() require('dap').step_into() end, { desc = 'Debug: Step Into' }) + vim.keymap.set('n', '', function() require('dap').step_over() end, { desc = 'Debug: Step Over' }) + vim.keymap.set('n', '', function() require('dap').step_out() end, { desc = 'Debug: Step Out' }) + vim.keymap.set('n', 'b', function() require('dap').toggle_breakpoint() end, { desc = 'Debug: Toggle Breakpoint' }) + vim.keymap.set('n', '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. + vim.keymap.set('n', '', function() require('dapui').toggle() end, { desc = 'Debug: See last session result.' }) --- Basic debugging keymaps, feel free to change to your liking! -vim.keymap.set('n', '', function() require('dap').continue() end, { desc = 'Debug: Start/Continue' }) -vim.keymap.set('n', '', function() require('dap').step_into() end, { desc = 'Debug: Step Into' }) -vim.keymap.set('n', '', function() require('dap').step_over() end, { desc = 'Debug: Step Over' }) -vim.keymap.set('n', '', function() require('dap').step_out() end, { desc = 'Debug: Step Out' }) -vim.keymap.set('n', 'b', function() require('dap').toggle_breakpoint() end, { desc = 'Debug: Toggle Breakpoint' }) -vim.keymap.set('n', '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. -vim.keymap.set('n', '', function() require('dapui').toggle() end, { desc = 'Debug: See last session result.' }) + local dap = require 'dap' + local dapui = require 'dapui' -local dap = require 'dap' -local dapui = require 'dapui' + require('mason-nvim-dap').setup { + -- Makes a best effort to setup the various debuggers with + -- reasonable debug configurations + automatic_installation = true, -require('mason-nvim-dap').setup { - -- Makes a best effort to setup the various debuggers with - -- reasonable debug configurations - automatic_installation = true, + -- You can provide additional configuration to the handlers, + -- see mason-nvim-dap README for more information + handlers = {}, - -- You can provide additional configuration to the handlers, - -- see mason-nvim-dap README for more information - handlers = {}, - - -- You'll need to check that you have the required things installed - -- online, please don't ask me how to install them :) - ensure_installed = { - -- Update this to ensure that you have the debuggers for the langs you want - 'delve', - }, -} + -- You'll need to check that you have the required things installed + -- online, please don't ask me how to install them :) + ensure_installed = { + -- Update this to ensure that you have the debuggers for the langs you want + 'delve', + }, + } --- Dap UI setup --- For more information, see |:help nvim-dap-ui| ----@diagnostic disable-next-line: missing-fields -dapui.setup { - -- Set icons to characters that are more likely to work in every terminal. - -- Feel free to remove or use ones that you like more! :) - -- Don't feel like these are good choices. - icons = { expanded = '▾', collapsed = '▸', current_frame = '*' }, + -- Dap UI setup + -- For more information, see |:help nvim-dap-ui| ---@diagnostic disable-next-line: missing-fields - controls = { - icons = { - pause = '⏸', - play = '▶', - step_into = '⏎', - step_over = '⏭', - step_out = '⏮', - step_back = 'b', - run_last = '▶▶', - terminate = '⏹', - disconnect = '⏏', + dapui.setup { + -- Set icons to characters that are more likely to work in every terminal. + -- Feel free to remove or use ones that you like more! :) + -- Don't feel like these are good choices. + icons = { expanded = '▾', collapsed = '▸', current_frame = '*' }, + ---@diagnostic disable-next-line: missing-fields + controls = { + icons = { + pause = '⏸', + play = '▶', + step_into = '⏎', + step_over = '⏭', + step_out = '⏮', + step_back = 'b', + run_last = '▶▶', + terminate = '⏹', + disconnect = '⏏', + }, }, - }, -} + } --- Change breakpoint icons --- vim.api.nvim_set_hl(0, 'DapBreak', { fg = '#e51400' }) --- vim.api.nvim_set_hl(0, 'DapStop', { fg = '#ffcc00' }) --- local breakpoint_icons = vim.g.have_nerd_font --- and { Breakpoint = '', BreakpointCondition = '', BreakpointRejected = '', LogPoint = '', Stopped = '' } --- or { Breakpoint = '●', BreakpointCondition = '⊜', BreakpointRejected = '⊘', LogPoint = '◆', Stopped = '⭔' } --- for type, icon in pairs(breakpoint_icons) do --- local tp = 'Dap' .. type --- local hl = (type == 'Stopped') and 'DapStop' or 'DapBreak' --- vim.fn.sign_define(tp, { text = icon, texthl = hl, numhl = hl }) --- end + -- 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 + 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 --- Install golang specific config -require('dap-go').setup { - delve = { - -- On Windows delve must be run attached or it crashes. - -- See https://github.com/leoluz/nvim-dap-go/blob/main/README.md#configuring - detached = vim.fn.has 'win32' == 0, - }, -} + -- Install golang specific config + require('dap-go').setup { + delve = { + -- On Windows delve must be run attached or it crashes. + -- See https://github.com/leoluz/nvim-dap-go/blob/main/README.md#configuring + detached = vim.fn.has 'win32' == 0, + }, + } +end diff --git a/lua/kickstart/plugins/format.lua b/lua/kickstart/plugins/format.lua new file mode 100644 index 00000000000..6bc66bea22f --- /dev/null +++ b/lua/kickstart/plugins/format.lua @@ -0,0 +1,52 @@ +local function gh(repo) return 'https://github.com/' .. repo end +do + vim.pack.add { gh 'stevearc/conform.nvim' } + require('conform').setup { + 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 = {} + if disable_filetypes[vim.bo[bufnr].filetype] then + return nil + else + return { + timeout_ms = 500, + lsp_format = 'fallback', + } + end + end, + formatters_by_ft = { + lua = { 'stylua' }, + svelte = { 'prettierd', 'prettier', stop_after_first = true }, + astro = { 'prettierd', 'prettier', stop_after_first = true }, + javascript = { 'prettierd', 'prettier', stop_after_first = true }, + typescript = { 'prettierd', 'prettier', stop_after_first = true }, + javascriptreact = { 'prettierd', 'prettier', stop_after_first = true }, + typescriptreact = { 'prettierd', 'prettier', stop_after_first = true }, + json = { 'prettierd', 'prettier', stop_after_first = true }, + graphql = { 'prettierd', 'prettier', stop_after_first = true }, + java = { 'google-java-format' }, + kotlin = { 'ktlint' }, + ruby = { 'standardrb' }, + markdown = { 'prettierd', 'prettier', stop_after_first = true }, + erb = { 'htmlbeautifier' }, + html = { 'htmlbeautifier' }, + bash = { 'beautysh' }, + proto = { 'buf' }, + rust = { 'rustfmt' }, + yaml = { 'yamlfix' }, + toml = { 'taplo' }, + css = { 'prettierd', 'prettier', stop_after_first = true }, + scss = { 'prettierd', 'prettier', stop_after_first = true }, + sh = { 'shellcheck' }, + go = { 'gofmt', 'goimports', 'goimports_reviser' }, + xml = { 'xmllint' }, + c = { 'clang-format' }, + python = { 'black' }, + }, + } + + vim.keymap.set({ 'n', 'v' }, 'f', function() require('conform').format { async = true } end, { desc = '[F]ormat buffer' }) +end diff --git a/lua/kickstart/plugins/gitsigns.lua b/lua/kickstart/plugins/gitsigns.lua index b7e40a87cfc..eb3f34860e9 100644 --- a/lua/kickstart/plugins/gitsigns.lua +++ b/lua/kickstart/plugins/gitsigns.lua @@ -2,56 +2,59 @@ -- NOTE: gitsigns is already included in init.lua but contains only the base -- config. This will add also the recommended keymaps. -vim.pack.add { 'https://github.com/lewis6991/gitsigns.nvim' } +local function gh(repo) return 'https://github.com/' .. repo end +do + vim.pack.add { gh 'lewis6991/gitsigns.nvim' } -require('gitsigns').setup { - on_attach = function(bufnr) - local gitsigns = require 'gitsigns' + require('gitsigns').setup { + on_attach = function(bufnr) + local gitsigns = require 'gitsigns' - local function map(mode, l, r, opts) - opts = opts or {} - opts.buffer = bufnr - vim.keymap.set(mode, l, r, opts) - end - - -- Navigation - map('n', ']c', function() - if vim.wo.diff then - vim.cmd.normal { ']c', bang = true } - else - gitsigns.nav_hunk 'next' + local function map(mode, l, r, opts) + opts = opts or {} + opts.buffer = bufnr + vim.keymap.set(mode, l, r, opts) end - end, { desc = 'Jump to next git [c]hange' }) - map('n', '[c', function() - if vim.wo.diff then - vim.cmd.normal { '[c', bang = true } - else - gitsigns.nav_hunk 'prev' - end - end, { desc = 'Jump to previous git [c]hange' }) + -- Navigation + map('n', ']c', function() + if vim.wo.diff then + vim.cmd.normal { ']c', bang = true } + else + gitsigns.nav_hunk 'next' + end + end, { desc = 'Jump to next git [c]hange' }) + + map('n', '[c', function() + if vim.wo.diff then + vim.cmd.normal { '[c', bang = true } + else + gitsigns.nav_hunk 'prev' + end + end, { desc = 'Jump to previous git [c]hange' }) - -- Actions - -- visual mode - map('v', 'hs', function() gitsigns.stage_hunk { vim.fn.line '.', vim.fn.line 'v' } end, { desc = 'git [s]tage hunk' }) - map('v', 'hr', function() gitsigns.reset_hunk { vim.fn.line '.', vim.fn.line 'v' } end, { desc = 'git [r]eset hunk' }) - -- normal mode - map('n', 'hs', gitsigns.stage_hunk, { desc = 'git [s]tage hunk' }) - map('n', 'hr', gitsigns.reset_hunk, { desc = 'git [r]eset hunk' }) - map('n', 'hS', gitsigns.stage_buffer, { desc = 'git [S]tage buffer' }) - map('n', 'hR', gitsigns.reset_buffer, { desc = 'git [R]eset buffer' }) - map('n', 'hp', gitsigns.preview_hunk, { desc = 'git [p]review hunk' }) - map('n', 'hi', gitsigns.preview_hunk_inline, { desc = 'git preview hunk [i]nline' }) - map('n', 'hb', function() gitsigns.blame_line { full = true } end, { desc = 'git [b]lame line' }) - map('n', 'hd', gitsigns.diffthis, { desc = 'git [d]iff against index' }) - map('n', 'hD', function() gitsigns.diffthis '@' end, { desc = 'git [D]iff against last commit' }) - map('n', 'hQ', function() gitsigns.setqflist 'all' end, { desc = 'git hunk [Q]uickfix list (all files in repo)' }) - map('n', 'hq', gitsigns.setqflist, { desc = 'git hunk [q]uickfix list (all changes in this file)' }) - -- Toggles - map('n', 'tb', gitsigns.toggle_current_line_blame, { desc = '[T]oggle git show [b]lame line' }) - map('n', 'tw', gitsigns.toggle_word_diff, { desc = '[T]oggle git intra-line [w]ord diff' }) + -- Actions + -- visual mode + map('v', 'gs', function() gitsigns.stage_hunk { vim.fn.line '.', vim.fn.line 'v' } end, { desc = 'git [s]tage hunk' }) + map('v', 'gr', function() gitsigns.reset_hunk { vim.fn.line '.', vim.fn.line 'v' } end, { desc = 'git [r]eset hunk' }) + -- normal mode + map('n', 'gs', gitsigns.stage_hunk, { desc = 'git [s]tage hunk' }) + map('n', 'gr', gitsigns.reset_hunk, { desc = 'git [r]eset hunk' }) + map('n', 'gS', gitsigns.stage_buffer, { desc = 'git [S]tage buffer' }) + map('n', 'gR', gitsigns.reset_buffer, { desc = 'git [R]eset buffer' }) + map('n', 'gp', gitsigns.preview_hunk, { desc = 'git [p]review hunk' }) + map('n', 'gi', gitsigns.preview_hunk_inline, { desc = 'git preview hunk [i]nline' }) + map('n', 'gb', function() gitsigns.blame_line { full = true } end, { desc = 'git [b]lame line' }) + map('n', 'gd', gitsigns.diffthis, { desc = 'git [d]iff against index' }) + map('n', 'gD', function() gitsigns.diffthis '@' end, { desc = 'git [D]iff against last commit' }) + map('n', 'gQ', function() gitsigns.setqflist 'all' end, { desc = 'git hunk [Q]uickfix list (all files in repo)' }) + map('n', 'gq', gitsigns.setqflist, { desc = 'git hunk [q]uickfix list (all changes in this file)' }) + -- Toggles + map('n', 'tb', gitsigns.toggle_current_line_blame, { desc = '[T]oggle git show [b]lame line' }) + map('n', 'tw', gitsigns.toggle_word_diff, { desc = '[T]oggle git intra-line [w]ord diff' }) - -- Text object - map({ 'o', 'x' }, 'ih', gitsigns.select_hunk) - end, -} + -- Text object + map({ 'o', 'x' }, 'ih', gitsigns.select_hunk) + end, + } +end diff --git a/lua/kickstart/plugins/guess-indent.lua b/lua/kickstart/plugins/guess-indent.lua new file mode 100644 index 00000000000..be19f25f376 --- /dev/null +++ b/lua/kickstart/plugins/guess-indent.lua @@ -0,0 +1,6 @@ +local function gh(repo) return 'https://github.com/' .. repo end +do + vim.pack.add { + gh 'NMAC427/guess-indent.nvim', -- Detect tabstop and shiftwidth automatically + } +end diff --git a/lua/kickstart/plugins/indent_line.lua b/lua/kickstart/plugins/indent_line.lua index 7187365656e..3ee8a8c5d68 100644 --- a/lua/kickstart/plugins/indent_line.lua +++ b/lua/kickstart/plugins/indent_line.lua @@ -2,5 +2,6 @@ -- Enable `lukas-reineke/indent-blankline.nvim` -- See `:help ibl` -vim.pack.add { 'https://github.com/lukas-reineke/indent-blankline.nvim' } +local function gh(repo) return 'https://github.com/' .. repo end +vim.pack.add { gh 'lukas-reineke/indent-blankline.nvim' } require('ibl').setup {} diff --git a/lua/kickstart/plugins/init.lua b/lua/kickstart/plugins/init.lua new file mode 100644 index 00000000000..23be5670406 --- /dev/null +++ b/lua/kickstart/plugins/init.lua @@ -0,0 +1,13 @@ +-- You can add your own plugins here or in other files in this directory! +-- I promise not to create any merge conflicts in this directory :) +-- +-- See the kickstart.nvim README for more information + +-- Iterate over all Lua files in the plugins directory and load them +local plugins_dir = vim.fs.joinpath(vim.fn.stdpath 'config', 'lua', 'kickstart', 'plugins') +for file_name, type in vim.fs.dir(plugins_dir, { follow = true }) do + if (type == 'file' or type == 'link') and file_name:match '%.lua$' and file_name ~= 'init.lua' then + local module = file_name:gsub('%.lua$', '') + require('kickstart.plugins.' .. module) + end +end diff --git a/lua/kickstart/plugins/lint.lua b/lua/kickstart/plugins/lint.lua index d63054452fd..80701633785 100644 --- a/lua/kickstart/plugins/lint.lua +++ b/lua/kickstart/plugins/lint.lua @@ -1,53 +1,34 @@ -- Linting +local function gh(repo) return 'https://github.com/' .. repo end +do + vim.pack.add { gh 'mfussenegger/nvim-lint' } -vim.pack.add { 'https://github.com/mfussenegger/nvim-lint' } + local lint = require 'lint' + lint.linters_by_ft = { + markdown = { 'markdownlint' }, -- Make sure to install `markdownlint` via mason / npm + dockerfile = { 'hadolint' }, + json = { 'jsonlint' }, + rst = { 'vale' }, + text = { 'vale' }, + javascript = { 'eslint' }, + javascripttreact = { 'eslint' }, + typescript = { 'eslint' }, + svelte = { 'eslint_d' }, + kotlin = { 'ktlint' }, + terraform = { 'tflint' }, + ruby = { 'ruby' }, + } -local lint = require 'lint' -lint.linters_by_ft = { - markdown = { 'markdownlint' }, -- Make sure to install `markdownlint` via mason / npm -} - --- To allow other plugins to add linters to require('lint').linters_by_ft, --- instead set linters_by_ft like this: --- lint.linters_by_ft = lint.linters_by_ft or {} --- lint.linters_by_ft['markdown'] = { 'markdownlint' } --- --- However, note that this will enable a set of default linters, --- which will cause errors unless these tools are available: --- { --- clojure = { "clj-kondo" }, --- dockerfile = { "hadolint" }, --- inko = { "inko" }, --- janet = { "janet" }, --- json = { "jsonlint" }, --- markdown = { "vale" }, --- rst = { "vale" }, --- ruby = { "ruby" }, --- terraform = { "tflint" }, --- text = { "vale" } --- } --- --- You can disable the default linters by setting their filetypes to nil: --- lint.linters_by_ft['clojure'] = nil --- lint.linters_by_ft['dockerfile'] = nil --- lint.linters_by_ft['inko'] = nil --- lint.linters_by_ft['janet'] = nil --- lint.linters_by_ft['json'] = nil --- lint.linters_by_ft['markdown'] = nil --- lint.linters_by_ft['rst'] = nil --- lint.linters_by_ft['ruby'] = nil --- lint.linters_by_ft['terraform'] = nil --- lint.linters_by_ft['text'] = nil - --- Create autocommand which carries out the actual linting --- on the specified events. -local lint_augroup = vim.api.nvim_create_augroup('lint', { clear = true }) -vim.api.nvim_create_autocmd({ 'BufEnter', 'BufWritePost', 'InsertLeave' }, { - group = lint_augroup, - callback = function() - -- 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.bo.modifiable then lint.try_lint() end - end, -}) + -- Create autocommand which carries out the actual linting + -- on the specified events. + local lint_augroup = vim.api.nvim_create_augroup('lint', { clear = true }) + vim.api.nvim_create_autocmd({ 'BufEnter', 'BufWritePost', 'InsertLeave' }, { + group = lint_augroup, + callback = function() + -- 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.bo.modifiable then lint.try_lint() end + end, + }) +end diff --git a/lua/kickstart/plugins/lsp.lua b/lua/kickstart/plugins/lsp.lua new file mode 100644 index 00000000000..b45e0ee1b79 --- /dev/null +++ b/lua/kickstart/plugins/lsp.lua @@ -0,0 +1,221 @@ +local function gh(repo) return 'https://github.com/' .. repo end +do + vim.pack.add { gh 'j-hui/fidget.nvim' } + require('fidget').setup {} + + vim.api.nvim_create_autocmd('LspAttach', { + group = vim.api.nvim_create_augroup('kickstart-lsp-attach', { clear = true }), + callback = function(event) + local map = function(keys, func, desc, mode) + mode = mode or 'n' + vim.keymap.set(mode, keys, func, { buffer = event.buf, desc = 'LSP: ' .. desc }) + end + + -- Rename the variable under your cursor. + -- Most Language Servers support renaming across files, etc. + map('grn', 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('gra', vim.lsp.buf.code_action, '[G]oto Code [A]ction', { 'n', 'x' }) + + -- WARN: This is not Goto Definition, this is Goto Declaration. + -- For example, in C this would take you to the header. + map('grD', vim.lsp.buf.declaration, '[G]oto [D]eclaration') + + map('grr', require('telescope.builtin').lsp_references, '[G]oto [R]eferences') + map('gri', require('telescope.builtin').lsp_implementations, '[G]oto [I]mplementation') + map('grd', require('telescope.builtin').lsp_definitions, '[G]oto [D]efinition') + map('grt', require('telescope.builtin').lsp_type_definitions, '[G]oto [T]ype Definition') + map('grs', require('telescope.builtin').lsp_document_symbols, 'Open Document Symbols') + map('grw', require('telescope.builtin').lsp_dynamic_workspace_symbols, 'Open Workspace Symbols') + + -- 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('textDocument/documentHighlight', event.buf) then + local highlight_augroup = vim.api.nvim_create_augroup('kickstart-lsp-highlight', { clear = false }) + vim.api.nvim_create_autocmd({ 'CursorHold', 'CursorHoldI' }, { + buffer = event.buf, + group = highlight_augroup, + callback = vim.lsp.buf.document_highlight, + }) + + vim.api.nvim_create_autocmd({ 'CursorMoved', 'CursorMovedI' }, { + buffer = event.buf, + group = highlight_augroup, + callback = vim.lsp.buf.clear_references, + }) + + vim.api.nvim_create_autocmd('LspDetach', { + group = vim.api.nvim_create_augroup('kickstart-lsp-detach', { clear = true }), + callback = function(event2) + vim.lsp.buf.clear_references() + vim.api.nvim_clear_autocmds { group = 'kickstart-lsp-highlight', buffer = event2.buf } + end, + }) + 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('textDocument/inlayHint', event.buf) then + map('th', function() vim.lsp.inlay_hint.enable(not vim.lsp.inlay_hint.is_enabled { bufnr = event.buf }) end, '[T]oggle Inlay [H]ints') + end + end, + }) + + ---@type table + local servers = { + clangd = {}, + gopls = { + cmd = { 'gopls' }, + filetypes = { 'go', 'gomod', 'gowork', 'gotmpl' }, + settings = { + gopls = { + completeUnimported = true, + usePlaceholders = true, + analyses = { + unusedparams = true, + }, + }, + }, + }, + pyright = {}, + rust_analyzer = {}, + ts_ls = {}, + vue_ls = {}, + eslint = {}, + yamlls = {}, + qmlls = {}, + html = { + filetypes = { 'html', 'htmldjango', 'htmldjango-template', 'htmljinja', 'htmlmin' }, + }, + kotlin_language_server = { + settings = { + kotlin = { + enabled = true, + debug = true, + languageVersion = '2.0', + jvmTarget = '21', + includeNonDeclarations = true, + noStdlib = false, + noReflect = false, + incremental = true, + buildServerMode = false, + compilerOptions = { + jvmTarget = '21', + apiVersion = '1.8', + languageVersion = '2.0', + }, + }, + }, + }, + + stylua = {}, -- Used to format Lua code + + -- Special Lua Config, as recommended by neovim help docs + lua_ls = { + on_init = function(client) + client.server_capabilities.documentFormattingProvider = false -- Disable formatting (formatting is done by stylua) + + if client.workspace_folders then + local path = client.workspace_folders[1].name + if path ~= vim.fn.stdpath 'config' and (vim.uv.fs_stat(path .. '/.luarc.json') or vim.uv.fs_stat(path .. '/.luarc.jsonc')) then return end + end + + client.config.settings.Lua = vim.tbl_deep_extend('force', client.config.settings.Lua, { + runtime = { + version = 'LuaJIT', + path = { 'lua/?.lua', 'lua/?/init.lua' }, + }, + workspace = { + checkThirdParty = false, + -- NOTE: this is a lot slower and will cause issues when working on your own configuration. + -- See https://github.com/neovim/nvim-lspconfig/issues/3189 + library = vim.tbl_extend('force', vim.api.nvim_get_runtime_file('', true), { + '${3rd}/luv/library', + '${3rd}/busted/library', + }), + }, + }) + end, + ---@type lspconfig.settings.lua_ls + settings = { + Lua = { + format = { enable = false }, -- Disable formatting (formatting is done by stylua) + }, + }, + }, + } + + vim.pack.add { + gh 'neovim/nvim-lspconfig', + gh 'mason-org/mason.nvim', + gh 'mason-org/mason-lspconfig.nvim', + gh 'WhoIsSethDaniel/mason-tool-installer.nvim', + } + + -- Automatically install LSPs and related tools to stdpath for Neovim + require('mason').setup {} + + -- 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. + local ensure_installed = vim.tbl_keys(servers or {}) + vim.list_extend(ensure_installed, { + -- You can add other tools here that you want Mason to install + }) + + require('mason-tool-installer').setup { ensure_installed = ensure_installed } + + for name, server in pairs(servers) do + vim.lsp.config(name, server) + vim.lsp.enable(name) + end +end + +-- Diagnostic Config +-- See :help vim.diagnostic.Opts +vim.diagnostic.config { + severity_sort = true, + float = { border = 'rounded', source = 'if_many' }, + underline = { severity = vim.diagnostic.severity.ERROR }, + signs = vim.g.have_nerd_font and { + text = { + [vim.diagnostic.severity.ERROR] = '󰅚 ', + [vim.diagnostic.severity.WARN] = '󰀪 ', + [vim.diagnostic.severity.INFO] = '󰋽 ', + [vim.diagnostic.severity.HINT] = '󰌶 ', + }, + } or {}, + virtual_text = { + source = 'if_many', + spacing = 2, + format = function(diagnostic) + local diagnostic_message = { + [vim.diagnostic.severity.ERROR] = diagnostic.message, + [vim.diagnostic.severity.WARN] = diagnostic.message, + [vim.diagnostic.severity.INFO] = diagnostic.message, + [vim.diagnostic.severity.HINT] = diagnostic.message, + } + return diagnostic_message[diagnostic.severity] + end, + }, +} + +-- Globally configure all LSP floating preview popups (like hover, signature help, etc) +local open_floating_preview = vim.lsp.util.open_floating_preview +function vim.lsp.util.open_floating_preview(contents, syntax, opts, ...) + opts = opts or {} + opts.border = opts.border or 'rounded' -- Set border to rounded + return open_floating_preview(contents, syntax, opts, ...) +end diff --git a/lua/kickstart/plugins/lualine.lua b/lua/kickstart/plugins/lualine.lua new file mode 100644 index 00000000000..ee8cb56077f --- /dev/null +++ b/lua/kickstart/plugins/lualine.lua @@ -0,0 +1,45 @@ +-- return { +-- 'nvim-lualine/lualine.nvim', +-- dependencies = { 'nvim-tree/nvim-web-devicons' }, +-- config = function() +-- require('lualine').setup { +-- options = { +-- theme = vim.g.colors_name or 'auto', +-- component_separators = '', +-- section_separators = { left = '', right = '' }, +-- disabled_filetypes = { +-- statusline = {}, +-- winbar = {}, +-- }, +-- ignore_focus = {}, +-- globalstatus = false, +-- refresh = { +-- statusline = 1000, +-- tabline = 1000, +-- winbar = 1000, +-- }, +-- }, +-- sections = { +-- lualine_a = { { 'mode', separator = { left = '' }, right_padding = 2 } }, +-- lualine_b = { 'branch', 'diagnostics' }, +-- lualine_c = { { 'filename', path = 1 } }, + +-- lualine_x = {}, +-- lualine_y = { 'filetype', 'progress' }, +-- lualine_z = { +-- { 'location', separator = { right = '' }, left_padding = 2 }, +-- }, +-- }, +-- inactive_sections = { +-- lualine_a = { 'filename' }, +-- lualine_b = {}, +-- lualine_c = {}, +-- lualine_x = {}, +-- lualine_y = {}, +-- lualine_z = { 'location' }, +-- }, +-- tabline = {}, +-- extensions = {}, +-- } +-- end, +-- } diff --git a/lua/kickstart/plugins/mini.lua b/lua/kickstart/plugins/mini.lua new file mode 100644 index 00000000000..a7dab1ae861 --- /dev/null +++ b/lua/kickstart/plugins/mini.lua @@ -0,0 +1,102 @@ +-- Collection of various small independent plugins/modules +local function gh(repo) return 'https://github.com/' .. repo end +do + vim.pack.add { gh 'echasnovski/mini.nvim' } + + -- Better Around/Inside textobjects + -- + -- Examples: + -- - va) - [V]isually select [A]round [)]paren + -- - yiiq - [Y]ank [I]nside [I]+1 [Q]uote + -- - ci' - [C]hange [I]nside [']quote + require('mini.ai').setup { + -- NOTE: Avoid conflicts with the built-in incremental selection mappings on Neovim>=0.12 (see `:help treesitter-incremental-selection`) + mappings = { + around_next = 'aa', + inside_next = 'ii', + }, + n_lines = 500, + } + + if vim.g.have_nerd_font then + require('mini.icons').setup() + -- Used for backwards compatibility with plugins that require `nvim-web-devicons` (e.g. telescope.nvim) + MiniIcons.mock_nvim_web_devicons() + end + + -- 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() + + -- 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/nvim-mini/mini.nvim + + require('mini.move').setup() + + require('mini.pairs').setup() + + require('mini.bracketed').setup() + + require('mini.notify').setup { + window = { + winblend = 0, + }, + } + + local MiniFiles = require 'mini.files' + MiniFiles.setup { + mappings = { + go_out = '', + go_in = '', + go_in_plus = '', + synchronize = '', + }, + windows = { + preview = true, + width_preview = 100, + }, + } + + local minifiles_toggle = function(dir) + if not MiniFiles.close() then MiniFiles.open(dir) end + end + + local open_file_in_minifiles = function() minifiles_toggle(vim.fn.expand '%:p') end + + local set_cwd = function() + local path = (MiniFiles.get_fs_entry() or {}).path + if path == nil then return vim.notify('Cursor is not on valid entry', vim.log.levels.ERROR) end + vim.fn.chdir(vim.fs.dirname(path)) + end + + -- Yank in register full path of entry under cursor + local yank_path = function() + if MiniFiles.get_explorer_state().target_window ~= nil then + local path = (MiniFiles.get_fs_entry() or {}).path + if path == nil then vim.notify('Cursor is not on valid entry', vim.log.levels.ERROR) end + vim.fn.setreg(vim.v.register, path) + end + end + + vim.keymap.set('n', 're', minifiles_toggle, { desc = 'Open Explorer in root' }) + vim.keymap.set('n', 'e', open_file_in_minifiles, { desc = 'Open Explorer in current file' }) + vim.keymap.set('n', 'cwd', set_cwd, { desc = 'Set cwd' }) + vim.keymap.set('n', 'yp', yank_path, { desc = 'Yank path' }) + vim.keymap.set('n', '', MiniFiles.go_in, { desc = 'Open file' }) +end diff --git a/lua/kickstart/plugins/neo-tree.lua b/lua/kickstart/plugins/neo-tree.lua deleted file mode 100644 index 549629ae020..00000000000 --- a/lua/kickstart/plugins/neo-tree.lua +++ /dev/null @@ -1,20 +0,0 @@ --- Neo-tree is a Neovim plugin to browse the file system --- https://github.com/nvim-neo-tree/neo-tree.nvim - -vim.pack.add { - { src = 'https://github.com/nvim-neo-tree/neo-tree.nvim', version = vim.version.range '*' }, - 'https://github.com/nvim-lua/plenary.nvim', - 'https://github.com/MunifTanjim/nui.nvim', -} - -vim.keymap.set('n', '\\', 'Neotree reveal', { desc = 'NeoTree reveal', silent = true }) - -require('neo-tree').setup { - filesystem = { - window = { - mappings = { - ['\\'] = 'close_window', - }, - }, - }, -} diff --git a/lua/kickstart/plugins/snippets.lua b/lua/kickstart/plugins/snippets.lua new file mode 100644 index 00000000000..c634871b515 --- /dev/null +++ b/lua/kickstart/plugins/snippets.lua @@ -0,0 +1,27 @@ +local function gh(repo) return 'https://github.com/' .. repo end +do + vim.pack.add { { src = gh 'L3MON4D3/LuaSnip', version = vim.version.range '2.*' } } + vim.pack.add { gh 'rafamadriz/friendly-snippets' } + require('luasnip.loaders.from_vscode').lazy_load() + local ls = require 'luasnip' + ls.setup { + history = false, + updateevents = 'TextChanged,TextChangedI', + } + + for _, ft_path in ipairs(vim.api.nvim_get_runtime_file('lua/custom/snippets/*lua', true)) do + loadfile(ft_path)() + end + + vim.keymap.set({ 'i', 's' }, '', function() + if ls.expand_or_jumpable() then ls.expand_or_jump() end + end, { silent = true }) + + vim.keymap.set({ 'i', 's' }, '', function() + if ls.jumpable(-1) then ls.jump(-1) end + end, { silent = true }) + + vim.keymap.set({ 'i', 's' }, '', function() + if ls.jumpable(1) then ls.jump(1) end + end, { silent = true }) +end diff --git a/lua/kickstart/plugins/telescope.lua b/lua/kickstart/plugins/telescope.lua new file mode 100644 index 00000000000..a93dc69135b --- /dev/null +++ b/lua/kickstart/plugins/telescope.lua @@ -0,0 +1,134 @@ +local function gh(repo) return 'https://github.com/' .. repo end +do + ---@type (string|vim.pack.Spec)[] + local telescope_plugins = { + gh 'nvim-lua/plenary.nvim', + gh 'nvim-telescope/telescope.nvim', + gh 'nvim-telescope/telescope-ui-select.nvim', + } + if vim.fn.executable 'make' == 1 then table.insert(telescope_plugins, gh 'nvim-telescope/telescope-fzf-native.nvim') end + + -- NOTE: You can install multiple plugins at once + vim.pack.add(telescope_plugins) + + local actions = require 'telescope.actions' + -- [[ 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 = { + layout_strategy = 'horizontal', + layout_config = { + width = 0.9, + height = 0.9, + }, + preview_width = 0.6, + + path_display = { 'truncate' }, + mappings = { + n = { + [''] = actions.add_selected_to_qflist + actions.open_qflist, + }, + i = { + [''] = 'to_fuzzy_refine', + [''] = actions.move_selection_next, + [''] = actions.move_selection_previous, + [''] = actions.add_selection, + [''] = actions.add_selection, + [''] = actions.select_default, + [''] = actions.add_selected_to_qflist + actions.open_qflist, + [''] = actions.close, + }, + }, + }, + pickers = { + find_files = { + find_command = { 'rg', '--files', '--hidden', '--glob', '!**/.git/*' }, + }, + }, + extensions = { + ['ui-select'] = { + require('telescope.themes').get_dropdown(), + }, + }, + } + + -- 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', 'fh', builtin.help_tags, { desc = '[F]ind [H]elp' }) + vim.keymap.set('n', 'fk', builtin.keymaps, { desc = '[F]ind [K]eymaps' }) + vim.keymap.set('n', 'ff', builtin.find_files, { desc = '[F]ind [F]iles' }) + vim.keymap.set('n', 'fs', builtin.builtin, { desc = '[F]ind [S]elect Telescope' }) + vim.keymap.set({ 'n', 'v' }, 'fw', builtin.grep_string, { desc = '[F]ind current [W]ord' }) + vim.keymap.set('n', 'fg', builtin.live_grep, { desc = '[F]ind by [G]rep' }) + vim.keymap.set('n', 'fd', builtin.diagnostics, { desc = '[F]ind [D]iagnostics' }) + vim.keymap.set('n', 'f.', builtin.resume, { desc = '[F]ind [R]esume' }) + vim.keymap.set('n', 'fr', builtin.oldfiles, { desc = '[F]ind [R]ecent Files' }) + vim.keymap.set('n', 'fc', builtin.commands, { desc = '[F]ind [C]ommands' }) + vim.keymap.set('n', 'f', builtin.buffers, { desc = '[F]ind existing buffers' }) + + -- Add Telescope-based LSP pickers when an LSP attaches to a buffer. + -- If you later switch picker plugins, this is where to update these mappings. + vim.api.nvim_create_autocmd('LspAttach', { + group = vim.api.nvim_create_augroup('telescope-lsp-attach', { clear = true }), + callback = function(event) + local buf = event.buf + + -- Find references for the word under your cursor. + vim.keymap.set('n', 'grr', builtin.lsp_references, { buffer = buf, desc = '[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. + vim.keymap.set('n', 'gri', builtin.lsp_implementations, { buffer = buf, desc = '[G]oto [I]mplementation' }) + + -- 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 . + vim.keymap.set('n', 'grd', builtin.lsp_definitions, { buffer = buf, desc = '[G]oto [D]efinition' }) + + -- Fuzzy find all the symbols in your current document. + -- Symbols are things like variables, functions, types, etc. + vim.keymap.set('n', 'gO', builtin.lsp_document_symbols, { buffer = buf, desc = 'Open Document Symbols' }) + + -- Fuzzy find all the symbols in your current workspace. + -- Similar to document symbols, except searches over your entire project. + vim.keymap.set('n', 'gW', builtin.lsp_dynamic_workspace_symbols, { buffer = buf, desc = 'Open Workspace Symbols' }) + + -- 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*. + vim.keymap.set('n', 'grt', builtin.lsp_type_definitions, { buffer = buf, desc = '[G]oto [T]ype Definition' }) + end, + }) + + -- 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 = true, + }) + 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', + 'f/', + function() + builtin.live_grep { + grep_open_files = true, + prompt_title = 'Live Grep in Open Files', + } + end, + { desc = '[F]ind [/] in Open Files' } + ) + + -- Shortcut for searching your Neovim configuration files + vim.keymap.set('n', 'fn', function() builtin.find_files { cwd = vim.fn.stdpath 'config' } end, { desc = '[F]ind [N]eovim files' }) +end diff --git a/lua/kickstart/plugins/theme.lua b/lua/kickstart/plugins/theme.lua new file mode 120000 index 00000000000..8e7216a98e7 --- /dev/null +++ b/lua/kickstart/plugins/theme.lua @@ -0,0 +1 @@ +/home/gustavo/.config/omarchy/current/theme/neovim.lua \ No newline at end of file diff --git a/lua/kickstart/plugins/treesitter.lua b/lua/kickstart/plugins/treesitter.lua new file mode 100644 index 00000000000..8af7dcaa297 --- /dev/null +++ b/lua/kickstart/plugins/treesitter.lua @@ -0,0 +1,105 @@ +local function gh(repo) return 'https://github.com/' .. repo end +do + vim.pack.add { { src = gh 'nvim-treesitter/nvim-treesitter', version = 'main' } } + + local parsers = { + 'bash', + 'c', + 'diff', + 'html', + 'lua', + 'luadoc', + 'markdown', + 'markdown_inline', + 'query', + 'vim', + 'vimdoc', + 'go', + 'typescript', + 'javascript', + 'kotlin', + 'yaml', + 'html', + 'json', + 'markdown', + 'markdown_inline', + 'python', + 'rust', + 'toml', + 'yaml', + } + + require('nvim-treesitter').install(parsers) + + ---@param buf integer + ---@param language string + local function treesitter_try_attach(buf, language) + -- Check if a parser exists and load it + if not vim.treesitter.language.add(language) then return end + -- Enable syntax highlighting and other treesitter features + vim.treesitter.start(buf, language) + + -- Enable treesitter based folds + -- For more info on folds see `:help folds` + -- vim.wo.foldexpr = 'v:lua.vim.treesitter.foldexpr()' + -- vim.wo.foldmethod = 'expr' + + -- Check if treesitter indentation is available for this language, and if so enable it + -- in case there is no indent query, the indentexpr will fallback to the vim's built in one + local has_indent_query = vim.treesitter.query.get(language, 'indents') ~= nil + + -- Enable treesitter based indentation + if has_indent_query then vim.bo.indentexpr = "v:lua.require'nvim-treesitter'.indentexpr()" end + end + + local available_parsers = require('nvim-treesitter').get_available() + vim.api.nvim_create_autocmd('FileType', { + callback = function(args) + local buf, filetype = args.buf, args.match + + local language = vim.treesitter.language.get_lang(filetype) + if not language then return end + + local installed_parsers = require('nvim-treesitter').get_installed 'parsers' + + if vim.tbl_contains(installed_parsers, language) then + -- Enable the parser if it is already installed + treesitter_try_attach(buf, language) + elseif vim.tbl_contains(available_parsers, language) then + -- If a parser is available in `nvim-treesitter`, auto-install it and enable it after the installation is done + require('nvim-treesitter').install(language):await(function() treesitter_try_attach(buf, language) end) + else + -- Try to enable treesitter features in case the parser exists but is not available from `nvim-treesitter` + treesitter_try_attach(buf, language) + end + end, + }) + + -- [[ Configure Treesitter ]] See `:help nvim-treesitter` + require('nvim-treesitter').setup { + ensure_installed = {}, + -- Autoinstall languages that are not installed + auto_install = true, + highlight = { + enable = true, + disable = {}, -- list of language that will be disabled + -- 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' }, + }, + indent = { enable = true, disable = { 'ruby' } }, + textobjects = { + select = { + enable = true, + lookahead = true, + keymaps = { + ['af'] = '@function.outer', + ['if'] = '@function.inner', + ['ac'] = '@class.outer', + ['ic'] = '@class.inner', + }, + }, + }, + } +end diff --git a/lua/kickstart/plugins/which-key.lua b/lua/kickstart/plugins/which-key.lua new file mode 100644 index 00000000000..56867471d2e --- /dev/null +++ b/lua/kickstart/plugins/which-key.lua @@ -0,0 +1,60 @@ +-- Useful plugin to show you pending keybinds. +local function gh(repo) return 'https://github.com/' .. repo end +do + vim.pack.add { gh 'folke/which-key.nvim' } + require('which-key').setup { + -- delay between pressing a key and opening which-key (milliseconds) + -- this setting is independent of vim.o.timeoutlen + delay = 0, + icons = { + -- 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 which-key.nvim defined Nerd Font icons, otherwise define a string table + keys = vim.g.have_nerd_font and {} or { + Up = ' ', + Down = ' ', + Left = ' ', + Right = ' ', + C = ' ', + M = ' ', + D = ' ', + S = ' ', + CR = ' ', + Esc = ' ', + ScrollWheelDown = ' ', + ScrollWheelUp = ' ', + NL = ' ', + BS = ' ', + Space = ' ', + Tab = ' ', + F1 = '', + F2 = '', + F3 = '', + F4 = '', + F5 = '', + F6 = '', + F7 = '', + F8 = '', + F9 = '', + F10 = '', + F11 = '', + F12 = '', + }, + }, + + -- Document existing key chains + spec = { + { 'f', group = '[F]ind' }, + { 't', group = '[T]oggle' }, + { 'D', group = '[D]ebug' }, + { 'd', group = '[D]iagnostic' }, + { 'b', group = '[B]uffer' }, + { 'w', group = '[W]indow' }, + { 'y', group = '[Y]ank' }, + { 'S', group = '[S]ession' }, + { 'g', group = 'Git', mode = { 'n', 'v' } }, + { 'q', group = 'Quickfix' }, + }, + } +end diff --git a/nvim-pack-lock.json b/nvim-pack-lock.json new file mode 100644 index 00000000000..4663355a7bc --- /dev/null +++ b/nvim-pack-lock.json @@ -0,0 +1,151 @@ +{ + "plugins": { + "LuaSnip": { + "rev": "642b0c595e11608b4c18219e93b88d7637af27bc", + "src": "https://github.com/L3MON4D3/LuaSnip", + "version": "2.0.0 - 3.0.0" + }, + "blink.cmp": { + "rev": "50c696b5c3ca359305f8e241e9458b0d2d787540", + "src": "https://github.com/saghen/blink.cmp" + }, + "blink.lib": { + "rev": "5876dd95deeb70aadbe9f1c0b7117a135061cdac", + "src": "https://github.com/saghen/blink.lib" + }, + "conform.nvim": { + "rev": "619363c30309d29ffa631e67c8183f2a72caa373", + "src": "https://github.com/stevearc/conform.nvim" + }, + "fidget.nvim": { + "rev": "82404b196e73a00b1727a91903beef5ddc319d22", + "src": "https://github.com/j-hui/fidget.nvim" + }, + "friendly-snippets": { + "rev": "6cd7280adead7f586db6fccbd15d2cac7e2188b9", + "src": "https://github.com/rafamadriz/friendly-snippets" + }, + "gitsigns.nvim": { + "rev": "2038c666bd9d8a0b7349a0b6ee00dc83104b9ecf", + "src": "https://github.com/lewis6991/gitsigns.nvim" + }, + "guess-indent.nvim": { + "rev": "84a4987ff36798c2fc1169cbaff67960aed9776f", + "src": "https://github.com/NMAC427/guess-indent.nvim" + }, + "harpoon": { + "rev": "1bc17e3e42ea3c46b33c0bbad6a880792692a1b3", + "src": "https://github.com/ThePrimeagen/harpoon" + }, + "indent-blankline.nvim": { + "rev": "d28a3f70721c79e3c5f6693057ae929f3d9c0a03", + "src": "https://github.com/lukas-reineke/indent-blankline.nvim" + }, + "markview.nvim": { + "rev": "301e431c7b618235f5447d54465c70934bd33668", + "src": "https://github.com/OXY2DEV/markview.nvim" + }, + "mason-lspconfig.nvim": { + "rev": "21c5b3ebeaa0412e28096bb0701434c51c1fbf76", + "src": "https://github.com/mason-org/mason-lspconfig.nvim" + }, + "mason-nvim-dap.nvim": { + "rev": "9a10e096703966335bd5c46c8c875d5b0690dade", + "src": "https://github.com/jay-babu/mason-nvim-dap.nvim" + }, + "mason-tool-installer.nvim": { + "rev": "443f1ef8b5e6bf47045cb2217b6f748a223cf7dc", + "src": "https://github.com/WhoIsSethDaniel/mason-tool-installer.nvim" + }, + "mason.nvim": { + "rev": "2a6940af80375532e5e9e7c1f2fc6319a1b7a69d", + "src": "https://github.com/mason-org/mason.nvim" + }, + "miasma.nvim": { + "rev": "466456f08d1a114c983c0d24e8fc01339e3b0a27", + "src": "https://github.com/OldJobobo/miasma.nvim" + }, + "mini.nvim": { + "rev": "ecb05c524a99490c95a8862eb5cb09b1e629ed42", + "src": "https://github.com/echasnovski/mini.nvim" + }, + "neo-tree.nvim": { + "rev": "83e7a2982fd12b9c3d35bc39dd5877cd91a02a61", + "src": "https://github.com/nvim-neo-tree/neo-tree.nvim", + "version": ">=0.0.0" + }, + "nui.nvim": { + "rev": "de740991c12411b663994b2860f1a4fd0937c130", + "src": "https://github.com/MunifTanjim/nui.nvim" + }, + "nvim-autopairs": { + "rev": "7b9923abad60b903ece7c52940e1321d39eccc79", + "src": "https://github.com/windwp/nvim-autopairs" + }, + "nvim-dap": { + "rev": "9e848e09a697ee95302a3ef2dd43fd6eb709e570", + "src": "https://github.com/mfussenegger/nvim-dap" + }, + "nvim-dap-go": { + "rev": "b4421153ead5d726603b02743ea40cf26a51ed5f", + "src": "https://github.com/leoluz/nvim-dap-go" + }, + "nvim-dap-ui": { + "rev": "1a66cabaa4a4da0be107d5eda6d57242f0fe7e49", + "src": "https://github.com/rcarriga/nvim-dap-ui" + }, + "nvim-lint": { + "rev": "01c9842c089069ab497430159312b2c8868a4590", + "src": "https://github.com/mfussenegger/nvim-lint" + }, + "nvim-lspconfig": { + "rev": "bfcc0171a43f22afa61d927ffe9fcb6cb85dc99e", + "src": "https://github.com/neovim/nvim-lspconfig" + }, + "nvim-nio": { + "rev": "21f5324bfac14e22ba26553caf69ec76ae8a7662", + "src": "https://github.com/nvim-neotest/nvim-nio" + }, + "nvim-treesitter": { + "rev": "4916d6592ede8c07973490d9322f187e07dfefac", + "src": "https://github.com/nvim-treesitter/nvim-treesitter", + "version": "'main'" + }, + "oklch-color-picker.nvim": { + "rev": "9b5db80d5f6af8fbc31bad29f69ad76f63154944", + "src": "https://github.com/eero-lehtinen/oklch-color-picker.nvim" + }, + "plenary.nvim": { + "rev": "74b06c6c75e4eeb3108ec01852001636d85a932b", + "src": "https://github.com/nvim-lua/plenary.nvim" + }, + "supermaven-nvim": { + "rev": "07d20fce48a5629686aefb0a7cd4b25e33947d50", + "src": "https://github.com/supermaven-inc/supermaven-nvim" + }, + "telescope-fzf-native.nvim": { + "rev": "b25b749b9db64d375d782094e2b9dce53ad53a40", + "src": "https://github.com/nvim-telescope/telescope-fzf-native.nvim" + }, + "telescope-ui-select.nvim": { + "rev": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2", + "src": "https://github.com/nvim-telescope/telescope-ui-select.nvim" + }, + "telescope.nvim": { + "rev": "9377230aa5305d9e9aca4ed8dadf1070fb4aa9fc", + "src": "https://github.com/nvim-telescope/telescope.nvim" + }, + "trouble.nvim": { + "rev": "bd67efe408d4816e25e8491cc5ad4088e708a69a", + "src": "https://github.com/folke/trouble.nvim" + }, + "vim-tmux-navigator": { + "rev": "e41c431a0c7b7388ae7ba341f01a0d217eb3a432", + "src": "https://github.com/christoomey/vim-tmux-navigator" + }, + "which-key.nvim": { + "rev": "3aab2147e74890957785941f0c1ad87d0a44c15a", + "src": "https://github.com/folke/which-key.nvim" + } + } +}