diff --git a/init.lua b/init.lua index 96360dbe..45226247 100644 --- a/init.lua +++ b/init.lua @@ -85,156 +85,15 @@ P.S. You can delete this when you're done too. It's your config now! :) --]] -- Set as the leader key --- See `:help mapleader` --- NOTE: Must happen before plugins are loaded (otherwise wrong leader will be used) +-- NOTE: Must happen before plugins are loaded (otherwise the wrong leader will be used) vim.g.mapleader = ' ' vim.g.maplocalleader = ' ' --- Set to true if you have a Nerd Font installed and selected in the terminal -vim.g.have_nerd_font = false - --- [[ Setting options ]] --- See `:help vim.opt` --- NOTE: You can change these options as you wish! --- For more options, you can see `:help option-list` - --- Make line numbers default -vim.opt.number = true --- You can also add relative line numbers, to help with jumping. --- Experiment for yourself to see if you like it! -vim.opt.relativenumber = true - --- Enable mouse mode, can be useful for resizing splits for example! -vim.opt.mouse = 'a' - --- Don't show the mode, since it's already in the status line -vim.opt.showmode = false - --- Sync clipboard between OS and Neovim. -vim.opt.clipboard = 'unnamedplus' -vim.opt.wrap = false -- Displays Lines as one long line -vim.opt.linebreak = true -- Companion to wrap, dont break lines -vim.opt.autoindent = true -vim.opt.shiftwidth = 4 -- The number of spaces inserted for each indentation -vim.opt.tabstop = 4 --Inserts n spaces for a Tab -vim.opt.softtabstop = 4 -- -vim.opt.expandtab = true -- Converts tabs into spaces -vim.o.scrolloff = 4 -- Minimal number of screen lines to keep above and below the cursor (default: 0) -vim.o.sidescrolloff = 8 -- Minimal number of screen columns either side of cursor if wrap is `false` (default: 0) -vim.o.hlsearch = false -- Set highlight on search (default: true) -vim.opt.termguicolors = true -- Set termguicolors to enable highlight groups (default: false) -vim.o.whichwrap = 'bs<>[]hl' -- Which "horizontal" keys are allowed to travel to prev/next line (default: 'b,s') -vim.o.numberwidth = 4 -- Set number column width to 2 {default 4} (default: 4) -vim.o.swapfile = false -- Creates a swapfile (default: true) -vim.o.smartindent = true -- Make indenting smarter again (default: false) -vim.o.showtabline = 2 -- Always show tabs (default: 1) -vim.o.backspace = 'indent,eol,start' -- Allow backspace on (default: 'indent,eol,start') -vim.o.pumheight = 10 -- Pop up menu height (default: 0) -vim.o.conceallevel = 0 -- So that `` is visible in markdown files (default: 1) -vim.o.fileencoding = 'utf-8' -- The encoding written to a file (default: 'utf-8') -vim.o.cmdheight = 1 -- More space in the Neovim command line for displaying messages (default: 1) -vim.o.writebackup = false -- If a file is being edited by another program (or was written to file while editing with another program), it is not allowed to be edited (default: true) -vim.o.completeopt = 'menuone,noselect' -- Set completeopt to have a better completion experience (default: 'menu,preview') -vim.opt.shortmess:append 'c' -- Don't give |ins-completion-menu| messages (default: does not include 'c') -vim.opt.iskeyword:append '-' -- Hyphenated words recognized by searches (default: does not include '-') -vim.opt.formatoptions:remove { 'c', 'r', 'o' } -- Don't insert the current comment leader automatically for auto-wrapping comments using 'textwidth', hitting in insert mode, or hitting 'o' or 'O' in normal mode. (default: 'croql') -vim.opt.runtimepath:remove '/usr/share/vim/vimfiles' -- Separate Vim plugins from Neovim in case Vim still in use (default: includes this path if Vim is installed) - --- 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.opt.clipboard = 'unnamedplus' -end) - --- Enable break indent -vim.opt.breakindent = true - --- Save undo history -vim.opt.undofile = true - --- Case-insensitive searching UNLESS \C or one or more capital letters in the search term -vim.opt.ignorecase = true -vim.opt.smartcase = true - --- Keep signcolumn on by default -vim.opt.signcolumn = 'yes' - --- Decrease update time -vim.opt.updatetime = 250 - --- Decrease mapped sequence wait time --- Displays which-key popup sooner -vim.opt.timeoutlen = 300 - --- Configure how new splits should be opened -vim.opt.splitright = true -vim.opt.splitbelow = true - --- Sets how neovim will display certain whitespace characters in the editor. --- See `:help 'list'` --- and `:help 'listchars'` -vim.opt.list = true -vim.opt.listchars = { tab = '» ', trail = '·', nbsp = '␣' } - --- Preview substitutions live, as you type! -vim.opt.inccommand = 'split' - --- Show which line your cursor is on -vim.opt.cursorline = false - --- Minimal number of screen lines to keep above and below the cursor. -vim.opt.scrolloff = 10 - --- [[ 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 keymaps -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' }) - --- [[ Basic Autocommands ]] --- See `:help lua-guide-autocommands` - --- Highlight when yanking (copying) text --- Try it with `yap` in normal mode --- See `:help vim.highlight.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.highlight.on_yank() - end, -}) +-- Import and load your options file +require('core.options') +require('core.keymaps') -- [[ Install `lazy.nvim` plugin manager ]] --- See `:help lazy.nvim.txt` or https://github.com/folke/lazy.nvim for more info local lazypath = vim.fn.stdpath 'data' .. '/lazy/lazy.nvim' if not (vim.uv or vim.loop).fs_stat(lazypath) then local lazyrepo = 'https://github.com/folke/lazy.nvim.git' @@ -242,24 +101,13 @@ if not (vim.uv or vim.loop).fs_stat(lazypath) then if vim.v.shell_error ~= 0 then error('Error cloning lazy.nvim:\n' .. out) end - end ---@diagnostic disable-next-line: undefined-field + end vim.opt.rtp:prepend(lazypath) -- [[ Configure and install plugins ]] - -- - -- To check the current status of your plugins, run - -- :Lazy - -- - -- You can press `?` in this menu for help. Use `:q` to close the window - -- - -- To update plugins you can run - -- :Lazy update - -- - -- NOTE: This will load all lua files in `lua/plugins/` - require('lazy').setup({ { import = 'plugins' } }, { + require('lazy').setup({ { import = 'plugins' } }, { ui = { - -- If you are using a Nerd Font: set icons to an empty table which will use the - -- default lazy.nvim defined Nerd Font icons, otherwise define a unicode icons table + -- If you are using a Nerd Font, set icons to an empty table, otherwise define a unicode icons table icons = vim.g.have_nerd_font and {} or { cmd = '⌘', config = '🛠', @@ -271,7 +119,7 @@ if not (vim.uv or vim.loop).fs_stat(lazypath) then runtime = '💻', require = '🌙', source = '📄', - start = '�', + start = '🚀', task = '📌', lazy = '💤 ', }, diff --git a/lua/core/keymaps.lua b/lua/core/keymaps.lua new file mode 100644 index 00000000..d7c4d470 --- /dev/null +++ b/lua/core/keymaps.lua @@ -0,0 +1,84 @@ +--[lua/core/keymaps.lua] + +-- See `:help vim.keymap.set()` for more information + +-- [[ General Keymaps ]] + +-- Function to compile and run the current file based on its filetype +local function compile_and_run() +-- Save the current file before running +vim.cmd('w') + +local filetype = vim.bo.filetype +local command + +-- You can add more languages and their commands here +if filetype == 'cpp' then + command = 'clang++ % -o %< && ./%<' + elseif filetype == 'c' then + command = 'clang % -o %< && ./%<' + elseif filetype == 'python' then + command = 'python3 %' + elseif filetype == 'typescript' then + -- Use ts-node if available, otherwise fallback to node + command = vim.fn.executable('ts-node') == 1 and 'ts-node %' or 'node %' + elseif filetype == 'javascript' then + command = 'node %' + elseif filetype == 'lua' then + command = 'lua %' + else + vim.notify('No compile/run command configured for filetype: ' .. filetype, vim.log.levels.WARN) + return + end + + -- Execute the command in a new terminal buffer + vim.cmd('vsplit | terminal ' .. command) + end + + vim.keymap.set('n', '', compile_and_run, { desc = 'Compile and Run File' }) + + -- Clear highlights on search when pressing in normal mode + -- See `:help hlsearch` + vim.keymap.set('n', '', 'nohlsearch') + + -- Diagnostic keymaps + 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' }) + + -- [[ Autocommands ]] + -- See `:help lua-guide-autocommands` + + -- Highlight when yanking (copying) text + -- Try it with `yap` in normal mode + -- See `:help vim.highlight.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.highlight.on_yank() + end, + }) + + -- (The extra brace at the end has been removed) diff --git a/lua/core/options.lua b/lua/core/options.lua new file mode 100644 index 00000000..abff30d9 --- /dev/null +++ b/lua/core/options.lua @@ -0,0 +1,95 @@ +-- Set to true if you have a Nerd Font installed and selected in the terminal +vim.g.have_nerd_font = false + +-- [[ Setting options ]] +-- See `:help vim.opt` +-- NOTE: You can change these options as you wish! +-- For more options, you can see `:help option-list` + +-- Make line numbers default +vim.opt.number = true +-- You can also add relative line numbers, to help with jumping. +-- Experiment for yourself to see if you like it! +vim.opt.relativenumber = true + +-- Enable mouse mode, can be useful for resizing splits for example! +vim.opt.mouse = 'a' + +-- Don't show the mode, since it's already in the status line +vim.opt.showmode = false + +-- Sync clipboard between OS and Neovim. +vim.opt.clipboard = 'unnamedplus' +vim.opt.wrap = false -- Displays Lines as one long line +vim.opt.linebreak = true -- Companion to wrap, dont break lines +vim.opt.autoindent = true +vim.opt.shiftwidth = 4 -- The number of spaces inserted for each indentation +vim.opt.tabstop = 4 --Inserts n spaces for a Tab +vim.opt.softtabstop = 4 -- +vim.opt.expandtab = true -- Converts tabs into spaces +vim.o.scrolloff = 4 -- Minimal number of screen lines to keep above and below the cursor (default: 0) +vim.o.sidescrolloff = 8 -- Minimal number of screen columns either side of cursor if wrap is `false` (default: 0) +vim.o.hlsearch = false -- Set highlight on search (default: true) +vim.opt.termguicolors = true -- Set termguicolors to enable highlight groups (default: false) +vim.o.whichwrap = 'bs<>[]hl' -- Which "horizontal" keys are allowed to travel to prev/next line (default: 'b,s') +vim.o.numberwidth = 4 -- Set number column width to 2 {default 4} (default: 4) +vim.o.swapfile = false -- Creates a swapfile (default: true) +vim.o.smartindent = true -- Make indenting smarter again (default: false) +vim.o.showtabline = 2 -- Always show tabs (default: 1) +vim.o.backspace = 'indent,eol,start' -- Allow backspace on (default: 'indent,eol,start') +vim.o.pumheight = 10 -- Pop up menu height (default: 0) +vim.o.conceallevel = 0 -- So that `` is visible in markdown files (default: 1) +vim.o.fileencoding = 'utf-8' -- The encoding written to a file (default: 'utf-8') +vim.o.cmdheight = 1 -- More space in the Neovim command line for displaying messages (default: 1) +vim.o.writebackup = false -- If a file is being edited by another program (or was written to file while editing with another program), it is not allowed to be edited (default: true) +vim.o.completeopt = 'menuone,noselect' -- Set completeopt to have a better completion experience (default: 'menu,preview') +vim.opt.shortmess:append 'c' -- Don't give |ins-completion-menu| messages (default: does not include 'c') +vim.opt.iskeyword:append '-' -- Hyphenated words recognized by searches (default: does not include '-') +vim.opt.formatoptions:remove { 'c', 'r', 'o' } -- Don't insert the current comment leader automatically for auto-wrapping comments using 'textwidth', hitting in insert mode, or hitting 'o' or 'O' in normal mode. (default: 'croql') +vim.opt.runtimepath:remove '/usr/share/vim/vimfiles' -- Separate Vim plugins from Neovim in case Vim still in use (default: includes this path if Vim is installed) + +-- 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.opt.clipboard = 'unnamedplus' +end) + +-- Enable break indent +vim.opt.breakindent = true + +-- Save undo history +vim.opt.undofile = true + +-- Case-insensitive searching UNLESS \C or one or more capital letters in the search term +vim.opt.ignorecase = true +vim.opt.smartcase = true + +-- Keep signcolumn on by default +vim.opt.signcolumn = 'yes' + +-- Decrease update time +vim.opt.updatetime = 250 + +-- Decrease mapped sequence wait time +-- Displays which-key popup sooner +vim.opt.timeoutlen = 300 + +-- Configure how new splits should be opened +vim.opt.splitright = true +vim.opt.splitbelow = true + +-- Sets how neovim will display certain whitespace characters in the editor. +-- See `:help 'list'` +-- and `:help 'listchars'` +vim.opt.list = true +vim.opt.listchars = { tab = '» ', trail = '·', nbsp = '␣' } + +-- Preview substitutions live, as you type! +vim.opt.inccommand = 'split' + +-- Show which line your cursor is on +vim.opt.cursorline = false + +-- Minimal number of screen lines to keep above and below the cursor. +vim.opt.scrolloff = 10 diff --git a/lua/plugins/editing.lua b/lua/plugins/editing.lua deleted file mode 100644 index c9808564..00000000 --- a/lua/plugins/editing.lua +++ /dev/null @@ -1,89 +0,0 @@ ---[plugins/editing.lua] - -return { - -- Detect tabstop and shiftwidth automatically - 'tpope/vim-sleuth', - - { -- Auto pairs for brackets, quotes, etc. - 'windwp/nvim-autopairs', - event = 'InsertEnter', - dependencies = { 'hrsh7th/nvim-cmp' }, - config = function() - require('nvim-autopairs').setup {} - -- If you want to automatically add `(` after selecting a function or method - local cmp_autopairs = require 'nvim-autopairs.completion.cmp' - local cmp = require 'cmp' - cmp.event:on('confirm_done', cmp_autopairs.on_confirm_done()) - end, - }, - - { -- Adds indentation guides to all lines - 'lukas-reineke/indent-blankline.nvim', - main = 'ibl', - opts = {}, - }, - - { -- Collection of small, useful plugins - 'echasnovski/mini.nvim', - config = function() - -- Better text-objects, built-in - require('mini.ai').setup { n_lines = 500 } - -- Add/delete/replace surroundings (brackets, quotes, etc.) - require('mini.surround').setup() - end, - }, - - { -- Useful plugin to show you pending keybinds. - 'folke/which-key.nvim', - event = 'VimEnter', -- Sets the loading event to 'VimEnter' - opts = { - 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 = { - { 'c', group = '[C]ode', mode = { 'n', 'x' } }, - { 'd', group = '[D]ocument' }, - { 'r', group = '[R]ename' }, - { 's', group = '[S]earch' }, - { 'w', group = '[W]orkspace' }, - { 't', group = '[T]oggle' }, - { 'h', group = 'Git [H]unk', mode = { 'n', 'v' } }, - }, - }, - }, -} diff --git a/lua/plugins/editor.lua b/lua/plugins/editor.lua new file mode 100644 index 00000000..fc9e48c9 --- /dev/null +++ b/lua/plugins/editor.lua @@ -0,0 +1,105 @@ +-- [plugins/editing.lua] + +return { + { -- Autoformat + 'stevearc/conform.nvim', + event = { 'BufWritePre' }, + cmd = { 'ConformInfo' }, + keys = { + { + 'f', + function() + require('conform').format { async = true, lsp_format = 'fallback' } + end, + mode = '', + desc = '[F]ormat buffer', + }, + }, + opts = { + notify_on_error = false, + format_on_save = function(bufnr) + local disable_filetypes = { c = true, cpp = true } + if disable_filetypes[vim.bo[bufnr].filetype] then + return + end + return { timeout_ms = 500, lsp_format = 'fallback' } + end, + formatters_by_ft = { + lua = { 'stylua' }, + }, + }, + }, + + { -- Linting + 'mfussenegger/nvim-lint', + event = { 'BufReadPre', 'BufNewFile' }, + config = function() + local lint = require 'lint' + lint.linters_by_ft = {} + vim.api.nvim_create_autocmd({ 'BufEnter', 'BufWritePost', 'InsertLeave' }, { + group = vim.api.nvim_create_augroup('lint', { clear = true }), + callback = function() + lint.try_lint() + end, + }) + end, + }, + + { -- Auto pairs for brackets, quotes, etc. + 'windwp/nvim-autopairs', + event = 'InsertEnter', + dependencies = { 'hrsh7th/nvim-cmp' }, + config = function() + require('nvim-autopairs').setup {} + local cmp_autopairs = require 'nvim-autopairs.completion.cmp' + local cmp = require 'cmp' + cmp.event:on('confirm_done', cmp_autopairs.on_confirm_done()) + end, + }, + + { -- Adds indentation guides to all lines + 'lukas-reineke/indent-blankline.nvim', + main = 'ibl', + opts = {}, + }, + + -- Detect tabstop and shiftwidth automatically + 'tpope/vim-sleuth', + + { -- Collection of small, useful plugins + 'echasnovski/mini.nvim', + config = function() + require('mini.ai').setup { n_lines = 500 } + require('mini.surround').setup() + end, + }, + + { -- Keybinding helper + 'folke/which-key.nvim', + event = 'VimEnter', + opts = { + icons = { + mappings = vim.g.have_nerd_font, + 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 = '', + }, + }, + spec = { + { 'c', group = '[C]ode', mode = { 'n', 'x' } }, + { 'd', group = '[D]ocument' }, + { 'r', group = '[R]ename' }, + { 's', group = '[S]earch' }, + { 'w', group = '[W]orkspace' }, + { 't', group = '[T]oggle' }, + { 'h', group = 'Git [H]unk', mode = { 'n', 'v' } }, + }, + }, + }, +} diff --git a/lua/plugins/git.lua b/lua/plugins/git.lua index 7f8b390f..dbdc1ed8 100644 --- a/lua/plugins/git.lua +++ b/lua/plugins/git.lua @@ -4,6 +4,7 @@ return { { -- Adds git related signs to the gutter, as well as utilities for managing changes 'lewis6991/gitsigns.nvim', opts = { + -- Basic options for the signs in the gutter signs = { add = { text = '+' }, change = { text = '~' }, @@ -11,9 +12,33 @@ return { topdelete = { text = '‾' }, changedelete = { text = '~' }, }, + -- All keymaps are now defined in the on_attach function + on_attach = function(bufnr) + local gs = package.loaded.gitsigns + local function map(mode, l, r, desc) + vim.keymap.set(mode, l, r, { buffer = bufnr, desc = desc }) + end + + -- Navigation + map('n', ']c', gs.next_hunk, 'Next Hunk') + map('n', '[c', gs.prev_hunk, 'Prev Hunk') + + -- Actions + map({ 'n', 'v' }, 'hs', gs.stage_hunk, 'Stage Hunk') + map({ 'n', 'v' }, 'hr', gs.reset_hunk, 'Reset Hunk') + map('n', 'hS', gs.stage_buffer, 'Stage Buffer') + map('n', 'hu', gs.undo_stage_hunk, 'Undo Stage Hunk') + map('n', 'hR', gs.reset_buffer, 'Reset Buffer') + map('n', 'hp', gs.preview_hunk, 'Preview Hunk') + map('n', 'hb', function() gs.blame_line { full = true } end, 'Blame Line') + map('n', 'tb', gs.toggle_current_line_blame, 'Toggle Blame Line') + map('n', 'hd', gs.diffthis, 'Diff This') + map('n', 'hD', function() gs.diffthis '~' end, 'Diff This ~') + map('n', 'td', gs.toggle_deleted, 'Toggle Deleted') + + -- Text object + map({ 'o', 'x' }, 'ih', ':Gitsigns select_hunk', 'Select Hunk') + end, }, }, - - -- This loads the keymaps from the separate gitsigns.lua file - require('plugins.gitsigns'), } diff --git a/lua/plugins/gitsigns.lua b/lua/plugins/gitsigns.lua deleted file mode 100644 index 33d9f0de..00000000 --- a/lua/plugins/gitsigns.lua +++ /dev/null @@ -1,33 +0,0 @@ ---[plugins/gitsigns.lua] -return { - -- This table is merged with the main gitsigns definition in plugins/git.lua - 'lewis6991/gitsigns.nvim', - opts = { - on_attach = function(bufnr) - local gs = package.loaded.gitsigns - local function map(mode, l, r, desc) - vim.keymap.set(mode, l, r, { buffer = bufnr, desc = desc }) - end - - -- Navigation - map('n', ']c', gs.next_hunk, 'Next Hunk') - map('n', '[c', gs.prev_hunk, 'Prev Hunk') - - -- Actions - map({ 'n', 'v' }, 'hs', gs.stage_hunk, 'Stage Hunk') - map({ 'n', 'v' }, 'hr', gs.reset_hunk, 'Reset Hunk') - map('n', 'hS', gs.stage_buffer, 'Stage Buffer') - map('n', 'hu', gs.undo_stage_hunk, 'Undo Stage Hunk') - map('n', 'hR', gs.reset_buffer, 'Reset Buffer') - map('n', 'hp', gs.preview_hunk, 'Preview Hunk') - map('n', 'hb', function() gs.blame_line { full = true } end, 'Blame Line') - map('n', 'tb', gs.toggle_current_line_blame, 'Toggle Blame Line') - map('n', 'hd', gs.diffthis, 'Diff This') - map('n', 'hD', function() gs.diffthis '~' end, 'Diff This ~') - map('n', 'td', gs.toggle_deleted, 'Toggle Deleted') - - -- Text object - map({ 'o', 'x' }, 'ih', ':Gitsigns select_hunk', 'Select Hunk') - end, - }, -} diff --git a/lua/plugins/health.lua b/lua/plugins/health.lua index 02079640..8221a9ba 100644 --- a/lua/plugins/health.lua +++ b/lua/plugins/health.lua @@ -27,3 +27,4 @@ return { end, }, } + diff --git a/lua/plugins/lsp.lua b/lua/plugins/lsp.lua index 47a2e8ad..5df1cd5e 100644 --- a/lua/plugins/lsp.lua +++ b/lua/plugins/lsp.lua @@ -15,239 +15,152 @@ return { }, }, { 'Bilal2453/luvit-meta', lazy = true }, + { - -- Main LSP Configuration 'neovim/nvim-lspconfig', dependencies = { - -- Automatically install LSPs and related tools to stdpath for Neovim - { 'williamboman/mason.nvim', config = true }, -- NOTE: Must be loaded before dependants + 'nvim-telescope/telescope.nvim', + { 'williamboman/mason.nvim', config = true }, 'williamboman/mason-lspconfig.nvim', 'WhoIsSethDaniel/mason-tool-installer.nvim', - - -- Useful status updates for LSP. - -- NOTE: `opts = {}` is the same as calling `require('fidget').setup({})` { 'j-hui/fidget.nvim', opts = {} }, - - -- Allows extra capabilities provided by nvim-cmp 'hrsh7th/cmp-nvim-lsp', }, + -- The config function is now INSIDE the table, where it belongs config = function() - -- Brief aside: **What is LSP?** - -- - -- LSP is an initialism you've probably heard, but might not understand what it is. - -- - -- LSP stands for Language Server Protocol. It's a protocol that helps editors - -- and language tooling communicate in a standardized fashion. - -- - -- In general, you have a "server" which is some tool built to understand a particular - -- language (such as `gopls`, `lua_ls`, `rust_analyzer`, etc.). These Language Servers - -- (sometimes called LSP servers, but that's kind of like ATM Machine) are standalone - -- processes that communicate with some "client" - in this case, Neovim! - -- - -- LSP provides Neovim with features like: - -- - Go to definition - -- - Find references - -- - Autocompletion - -- - Symbol Search - -- - and more! - -- - -- Thus, Language Servers are external tools that must be installed separately from - -- Neovim. This is where `mason` and related plugins come into play. - -- - -- If you're wondering about lsp vs treesitter, you can check out the wonderfully - -- and elegantly composed help section, `:help lsp-vs-treesitter` - - -- This function gets run when an LSP attaches to a particular buffer. - -- That is to say, every time a new file is opened that is associated with - -- an lsp (for example, opening `main.rs` is associated with `rust_analyzer`) this - -- function will be executed to configure the current buffer - vim.api.nvim_create_autocmd('LspAttach', { - group = vim.api.nvim_create_augroup('kickstart-lsp-attach', { clear = true }), - callback = function(event) - -- 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 - - -- Jump to the definition of the word under your cursor. - -- This is where a variable was first declared, or where a function is defined, etc. - -- To jump back, press . - map('gd', require('telescope.builtin').lsp_definitions, '[G]oto [D]efinition') - - -- Find references for the word under your cursor. - map('gr', require('telescope.builtin').lsp_references, '[G]oto [R]eferences') - - -- Jump to the implementation of the word under your cursor. - -- Useful when your language has ways of declaring types without an actual implementation. - map('gI', require('telescope.builtin').lsp_implementations, '[G]oto [I]mplementation') - - -- Jump to the type of the word under your cursor. - -- Useful when you're not sure what type a variable is and you want to see - -- the definition of its *type*, not where it was *defined*. - map('D', require('telescope.builtin').lsp_type_definitions, 'Type [D]efinition') - - -- Fuzzy find all the symbols in your current document. - -- Symbols are things like variables, functions, types, etc. - map('ds', require('telescope.builtin').lsp_document_symbols, '[D]ocument [S]ymbols') - - -- Fuzzy find all the symbols in your current workspace. - -- Similar to document symbols, except searches over your entire project. - map('ws', require('telescope.builtin').lsp_dynamic_workspace_symbols, '[W]orkspace [S]ymbols') - - -- Rename the variable under your cursor. - -- Most Language Servers support renaming across files, etc. - map('rn', vim.lsp.buf.rename, '[R]e[n]ame') - - -- Execute a code action, usually your cursor needs to be on top of an error - -- or a suggestion from your LSP for this to activate. - map('ca', vim.lsp.buf.code_action, '[C]ode [A]ction', { 'n', 'x' }) - - -- WARN: This is not Goto Definition, this is Goto Declaration. - -- For example, in C this would take you to the header. - map('gD', vim.lsp.buf.declaration, '[G]oto [D]eclaration') - - -- The following two autocommands are used to highlight references of the - -- word under your cursor when your cursor rests there for a little while. - -- See `:help CursorHold` for information about when this is executed - -- - -- 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(vim.lsp.protocol.Methods.textDocument_documentHighlight) 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 + -- This function checks if the LSP server executable is in a trusted path. + local function start_trusted_lsp(config) + -- List of trusted paths for LSP executables. + local trusted_paths = { + '/usr/bin/', + '/usr/local/bin/', + '/nix/var/nix/profiles/default/bin/', + '/home/lyniks0611/.nix-profile/bin/', -- Your specific Nix path + vim.fn.stdpath('data') .. '/mason/bin/', -- Trust executables installed by Mason + } - -- 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(vim.lsp.protocol.Methods.textDocument_inlayHint) 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') + local cmd = config.cmd[1] + local is_trusted = false + for _, path in ipairs(trusted_paths) do + if vim.startswith(cmd, path) then + is_trusted = true + break + end end - end, - }) - - -- Change diagnostic symbols in the sign column (gutter) - -- if vim.g.have_nerd_font then - -- local signs = { ERROR = '', WARN = '', INFO = '', HINT = '' } - -- local diagnostic_signs = {} - -- for type, icon in pairs(signs) do - -- diagnostic_signs[vim.diagnostic.severity[type]] = icon - -- end - -- vim.diagnostic.config { signs = { text = diagnostic_signs } } - -- end - - -- LSP servers and clients are able to communicate to each other what features they support. - -- By default, Neovim doesn't support everything that is in the LSP specification. - -- When you add nvim-cmp, luasnip, etc. Neovim now has *more* capabilities. - -- So, we create new capabilities with nvim cmp, and then broadcast that to the servers. - local capabilities = vim.lsp.protocol.make_client_capabilities() - capabilities = vim.tbl_deep_extend('force', capabilities, require('cmp_nvim_lsp').default_capabilities()) - - -- Enable the following language servers - -- Feel free to add/remove any LSPs that you want here. They will automatically be installed. - -- - -- Add any additional override configuration in the following tables. Available keys are: - -- - cmd (table): Override the default command used to start the server - -- - filetypes (table): Override the default list of associated filetypes for the server - -- - capabilities (table): Override fields in capabilities. Can be used to disable certain LSP features. - -- - settings (table): Override the default settings passed when initializing the server. - -- For example, to see the options for `lua_ls`, you could go to: https://luals.github.io/wiki/settings/ - local servers = { - clangd = {}, -- C/C++/Objective-C - -- rust_analyzer = {}, -- Rust - pyright = {}, -- Python - -- sumneko_lua = {}, -- Lua - -- intelephense = {}, -- PHP - -- solargraph = {}, -- Ruby - -- jdtls = {}, -- Java - -- hls = {}, -- Haskell - -- sourcekit_lsp = {}, -- Swift - -- metals = {}, -- Scala - -- elixir_ls = {}, -- Elixir - -- omnisharp = {}, -- C# - -- dartls = {}, -- Dart/Flutter - jsonls = {}, -- JSON - -- yaml = {}, -- YAML - -- ... etc. See `:help lspconfig-all` for a list of all the pre-configured LSPs - -- - -- Some languages (like typescript) have entire language plugins that can be useful: - -- https://github.com/pmizio/typescript-tools.nvim - -- - -- But for many setups, the LSP (`ts_ls`) will work just fine - -- ts_ls = {}, - -- - lua_ls = { - -- cmd = {...}, - -- filetypes = { ...}, - -- capabilities = {}, - settings = { - Lua = { - completion = { - callSnippet = 'Replace', - }, - -- You can toggle below to ignore Lua_LS's noisy `missing-fields` warnings - -- diagnostics = { disable = { 'missing-fields' } }, - }, - }, - }, - } + if not is_trusted then + vim.ui.select({ 'Yes', 'No' }, { + prompt = 'LSP: Trust and run this executable? ' .. cmd, + }, function(choice) + if choice == 'Yes' then + vim.lsp.start(config) + end + end) + else + vim.lsp.start(config) + end + end - -- Ensure the servers and tools above are installed - -- To check the current status of installed tools and/or manually install - -- other tools, you can run - -- :Mason - -- - -- You can press `g?` for help in this menu. - require('mason').setup() + 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 - -- You can add other tools here that you want Mason to install - -- for you, so that they are available from within Neovim. - local ensure_installed = vim.tbl_keys(servers or {}) - vim.list_extend(ensure_installed, { - 'stylua', -- Used to format Lua code - }) - require('mason-tool-installer').setup { ensure_installed = ensure_installed } + map('gd', require('telescope.builtin').lsp_definitions, '[G]oto [D]efinition') + map('gr', require('telescope.builtin').lsp_references, '[G]oto [R]eferences') + map('gI', require('telescope.builtin').lsp_implementations, '[G]oto [I]mplementation') + map('D', require('telescope.builtin').lsp_type_definitions, 'Type [D]efinition') + map('ds', require('telescope.builtin').lsp_document_symbols, '[D]ocument [S]ymbols') + map('ws', require('telescope.builtin').lsp_dynamic_workspace_symbols, '[W]orkspace [S]ymbols') + map('rn', vim.lsp.buf.rename, '[R]e[n]ame') + map('ca', vim.lsp.buf.code_action, '[C]ode [A]ction', { 'n', 'x' }) + map('gD', vim.lsp.buf.declaration, '[G]oto [D]eclaration') + + local client = vim.lsp.get_client_by_id(event.data.client_id) + if client and client.supports_method(vim.lsp.protocol.Methods.textDocument_documentHighlight) 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 + + if client and client.supports_method(vim.lsp.protocol.Methods.textDocument_inlayHint) 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, + }) + + local capabilities = vim.lsp.protocol.make_client_capabilities() + capabilities = vim.tbl_deep_extend('force', capabilities, require('cmp_nvim_lsp').default_capabilities()) + + local servers = { + clangd = {}, + pyright = {}, + jsonls = {}, + yamlls = {}, + ts_ls = {}, + + lua_ls = { + settings = { + Lua = { + completion = { + callSnippet = 'Replace', + }, + diagnostics = { + globals = { 'vim' }, + }, + workspace = { + library = vim.api.nvim_get_runtime_file('', true), + checkThirdParty = false, + }, + }, + }, + }, + } - require('mason-lspconfig').setup { - handlers = { - function(server_name) - local server = servers[server_name] or {} - -- This handles overriding only values explicitly passed - -- by the server configuration above. Useful when disabling - -- certain features of an LSP (for example, turning off formatting for ts_ls) - server.capabilities = vim.tbl_deep_extend('force', {}, capabilities, server.capabilities or {}) - require('lspconfig')[server_name].setup(server) - end, - }, - } - end, + require('mason').setup() + + local ensure_installed = vim.tbl_keys(servers or {}) + vim.list_extend(ensure_installed, { + 'stylua', + }) + require('mason-tool-installer').setup { ensure_installed = ensure_installed } + + require('mason-lspconfig').setup { + handlers = { + function(server_name) + local server = servers[server_name] or {} + server.capabilities = vim.tbl_deep_extend('force', {}, capabilities, server.capabilities or {}) + server.cmd_hook = function(config) + start_trusted_lsp(config) + end + + require('lspconfig')[server_name].setup(server) + end, + }, + } + end, }, { -- Autoformat @@ -267,9 +180,6 @@ return { opts = { notify_on_error = false, format_on_save = function(bufnr) - -- Disable "format_on_save lsp_fallback" for languages that don't - -- have a well standardized coding style. You can add additional - -- languages here or re-enable it for the disabled ones. local disable_filetypes = { c = true, cpp = true } local lsp_format_opt if disable_filetypes[vim.bo[bufnr].filetype] then @@ -284,11 +194,6 @@ return { end, formatters_by_ft = { lua = { 'stylua' }, - -- Conform can also run multiple formatters sequentially - -- python = { "isort", "black" }, - -- - -- You can use 'stop_after_first' to run the first available formatter from the list - -- javascript = { "prettierd", "prettier", stop_after_first = true }, }, }, }, @@ -297,40 +202,20 @@ return { 'hrsh7th/nvim-cmp', event = 'InsertEnter', dependencies = { - -- Snippet Engine & its associated nvim-cmp source { 'L3MON4D3/LuaSnip', build = (function() - -- Build Step is needed for regex support in snippets. - -- This step is not supported in many windows environments. - -- Remove the below condition to re-enable on windows. if vim.fn.has 'win32' == 1 or vim.fn.executable 'make' == 0 then return end return 'make install_jsregexp' end)(), - dependencies = { - -- `friendly-snippets` contains a variety of premade snippets. - -- See the README about individual language/framework/plugin snippets: - -- https://github.com/rafamadriz/friendly-snippets - -- { - -- 'rafamadriz/friendly-snippets', - -- config = function() - -- require('luasnip.loaders.from_vscode').lazy_load() - -- end, - -- }, - }, }, 'saadparwaiz1/cmp_luasnip', - - -- Adds other completion capabilities. - -- nvim-cmp does not ship with all sources by default. They are split - -- into multiple repos for maintenance purposes. 'hrsh7th/cmp-nvim-lsp', 'hrsh7th/cmp-path', }, config = function() - -- See `:help cmp` local cmp = require 'cmp' local luasnip = require 'luasnip' luasnip.config.setup {} @@ -342,45 +227,13 @@ return { end, }, completion = { completeopt = 'menu,menuone,noinsert' }, - - -- For an understanding of why these mappings were - -- chosen, you will need to read `:help ins-completion` - -- - -- No, but seriously. Please read `:help ins-completion`, it is really good! mapping = cmp.mapping.preset.insert { - -- Select the [n]ext item [''] = cmp.mapping.select_next_item(), - -- Select the [p]revious item [''] = cmp.mapping.select_prev_item(), - - -- Scroll the documentation window [b]ack / [f]orward [''] = cmp.mapping.scroll_docs(-4), [''] = cmp.mapping.scroll_docs(4), - - -- Accept ([y]es) the completion. - -- This will auto-import if your LSP supports it. - -- This will expand snippets if the LSP sent a snippet. [''] = cmp.mapping.confirm { select = true }, - - -- If you prefer more traditional completion keymaps, - -- you can uncomment the following lines - --[''] = cmp.mapping.confirm { select = true }, - --[''] = cmp.mapping.select_next_item(), - --[''] = cmp.mapping.select_prev_item(), - - -- Manually trigger a completion from nvim-cmp. - -- Generally you don't need this, because nvim-cmp will display - -- completions whenever it has completion options available. [''] = cmp.mapping.complete {}, - - -- Think of as moving to the right of your snippet expansion. - -- So if you have a snippet that's like: - -- function $name($args) - -- $body - -- end - -- - -- will move you to the right of each of the expansion locations. - -- is similar, except moving you backwards. [''] = cmp.mapping(function() if luasnip.expand_or_locally_jumpable() then luasnip.expand_or_jump() @@ -391,14 +244,10 @@ return { luasnip.jump(-1) end end, { 'i', 's' }), - - -- For more advanced Luasnip keymaps (e.g. selecting choice nodes, expansion) see: - -- https://github.com/L3MON4D3/LuaSnip?tab=readme-ov-file#keymaps }, sources = { { name = 'lazydev', - -- set group index to 0 to skip loading LuaLS completions as lazydev recommends it group_index = 0, }, { name = 'nvim_lsp' }, diff --git a/lua/plugins/tools.lua b/lua/plugins/tools.lua index 3f3c00f7..888f5355 100644 --- a/lua/plugins/tools.lua +++ b/lua/plugins/tools.lua @@ -1,89 +1,86 @@ --- plugins/editing.lua +-- [plugins/tools.lua] return { - -- Detect tabstop and shiftwidth automatically - 'tpope/vim-sleuth', - - { -- Auto pairs for brackets, quotes, etc. - 'windwp/nvim-autopairs', - event = 'InsertEnter', - dependencies = { 'hrsh7th/nvim-cmp' }, + { -- Fuzzy Finder (files, lsp, etc) + 'nvim-telescope/telescope.nvim', + event = 'VimEnter', + branch = '0.1.x', + dependencies = { + 'nvim-lua/plenary.nvim', -- Required + { 'nvim-telescope/telescope-fzf-native.nvim', build = 'make', cond = function() return vim.fn.executable 'make' == 1 end }, -- Suggested: native sorter + { 'nvim-telescope/telescope-ui-select.nvim' }, -- Optional: better UI + { 'nvim-tree/nvim-web-devicons', enabled = vim.g.have_nerd_font }, -- Optional: icons + }, config = function() - require('nvim-autopairs').setup {} - -- If you want to automatically add `(` after selecting a function or method - local cmp_autopairs = require 'nvim-autopairs.completion.cmp' - local cmp = require 'cmp' - cmp.event:on('confirm_done', cmp_autopairs.on_confirm_done()) - end, - }, - - { -- Adds indentation guides to all lines - 'lukas-reineke/indent-blankline.nvim', - main = 'ibl', - opts = {}, - }, + require('telescope').setup { + defaults = { + mappings = { + i = { + [''] = "move_selection_next", + [''] = "move_selection_previous", + }, + }, + }, + extensions = { + ['ui-select'] = { + require('telescope.themes').get_dropdown(), + }, + }, + } + -- Load extensions if installed + pcall(require('telescope').load_extension, 'fzf') + pcall(require('telescope').load_extension, 'ui-select') - { -- Collection of small, useful plugins - 'echasnovski/mini.nvim', - config = function() - -- Better text-objects, built-in - require('mini.ai').setup { n_lines = 500 } - -- Add/delete/replace surroundings (brackets, quotes, etc.) - require('mini.surround').setup() + local builtin = require 'telescope.builtin' + vim.keymap.set('n', 'sh', builtin.help_tags, { desc = '[S]earch [H]elp' }) + vim.keymap.set('n', 'sk', builtin.keymaps, { desc = '[S]earch [K]eymaps' }) + vim.keymap.set('n', 'sf', builtin.find_files, { desc = '[S]earch [F]iles' }) + vim.keymap.set('n', 'ss', builtin.builtin, { desc = '[S]earch [S]elect Telescope' }) + vim.keymap.set('n', 'sw', builtin.grep_string, { desc = '[S]earch current [W]ord' }) + vim.keymap.set('n', 'sg', builtin.live_grep, { desc = '[S]earch by [G]rep' }) + vim.keymap.set('n', 'sd', builtin.diagnostics, { desc = '[S]earch [D]iagnostics' }) + vim.keymap.set('n', 'sr', builtin.resume, { desc = '[S]earch [R]esume' }) + vim.keymap.set('n', 's.', builtin.oldfiles, { desc = '[S]earch Recent Files ("." for repeat)' }) + vim.keymap.set('n', '', builtin.buffers, { desc = '[ ] Find existing buffers' }) end, }, - { -- Useful plugin to show you pending keybinds. - 'folke/which-key.nvim', - event = 'VimEnter', -- Sets the loading event to 'VimEnter' + { -- Treesitter for better syntax highlighting + 'nvim-treesitter/nvim-treesitter', + build = ':TSUpdate', + main = 'nvim-treesitter.configs', opts = { - 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 = '', - }, + ensure_installed = { + 'bash', 'c', 'diff', 'html', 'lua', 'luadoc', + 'markdown', 'markdown_inline', 'query', 'vim', 'vimdoc' }, + auto_install = true, + highlight = { enable = true, additional_vim_regex_highlighting = { 'ruby' } }, + indent = { enable = true, disable = { 'ruby' } }, + }, + }, - -- Document existing key chains - spec = { - { 'c', group = '[C]ode', mode = { 'n', 'x' } }, - { 'd', group = '[D]ocument' }, - { 'r', group = '[R]ename' }, - { 's', group = '[S]earch' }, - { 'w', group = '[W]orkspace' }, - { 't', group = '[T]oggle' }, - { 'h', group = 'Git [H]unk', mode = { 'n', 'v' } }, - }, + { -- Debugging (DAP) + 'mfussenegger/nvim-dap', + dependencies = { + 'williamboman/mason.nvim', + 'rcarriga/nvim-dap-ui', + }, + config = function() + local dap = require 'dap' + local dapui = require 'dapui' + dapui.setup() + dap.listeners.after.event_initialized['dapui_config'] = function() dapui.open() end + dap.listeners.before.event_terminated['dapui_config'] = function() dapui.close() end + dap.listeners.before.event_exited['dapui_config'] = function() dapui.close() end + end, + keys = { + { 'db', function() require('dap').toggle_breakpoint() end, desc = 'DAP: Toggle Breakpoint' }, + { 'dc', function() require('dap').continue() end, desc = 'DAP: Continue' }, + { 'di', function() require('dap').step_into() end, desc = 'DAP: Step Into' }, + { 'do', function() require('dap').step_over() end, desc = 'DAP: Step Over' }, + { 'dO', function() require('dap').step_out() end, desc = 'DAP: Step Out' }, + { 'dr', function() require('dap').repl.open() end, desc = 'DAP: Open REPL' }, }, }, } diff --git a/lua/plugins/ui.lua b/lua/plugins/ui.lua index 098a45ae..1ca60b97 100644 --- a/lua/plugins/ui.lua +++ b/lua/plugins/ui.lua @@ -4,18 +4,48 @@ return { { -- Colorscheme (Tokyonight) 'folke/tokyonight.nvim', priority = 1000, - init = function() + opts = { + style = "night", -- "storm" | "night" | "moon" | "day" + transparent = true, -- enable transparent background + styles = { + sidebars = "transparent", -- sidebar-like windows + floats = "transparent", -- floating windows + }, + }, + config = function(_, opts) + require("tokyonight").setup(opts) vim.cmd.colorscheme 'tokyonight-night' vim.cmd.hi 'Comment gui=none' - --[[ - vim.api.nvim_set_hl(0, "Normal", { bg = "none" }) - vim.api.nvim_set_hl(0, "NormalFloat", { bg = "none" }) - vim.api.nvim_set_hl(0, "SignColumn", { bg = "none" }) - vim.api.nvim_set_hl(0, "LineNr", { bg = "none" }) - vim.api.nvim_set_hl(0, "EndOfBuffer", { bg = "none" })]] - end, + + -- Toggle transparency function + function Toggle_transparent() + local normal = vim.api.nvim_get_hl(0, { name = "Normal" }) + if normal.bg == nil then + require("tokyonight").setup({ transparent = false }) + vim.cmd.colorscheme("tokyonight-night") + vim.cmd.hi("Comment gui=none") + else + require("tokyonight").setup({ transparent = true }) + vim.cmd.colorscheme("tokyonight-night") + vim.cmd.hi("Comment gui=none") + end + end + + -- Keymap: ut = toggle transparency + vim.keymap.set("n", "ut", Toggle_transparent, { desc = "[U]I [T]ransparency toggle" }) + + --[[ + -- Manual highlights if you want to force extra groups transparent + vim.api.nvim_set_hl(0, "Normal", { bg = "none" }) + vim.api.nvim_set_hl(0, "NormalFloat", { bg = "none" }) + vim.api.nvim_set_hl(0, "SignColumn", { bg = "none" }) + vim.api.nvim_set_hl(0, "LineNr", { bg = "none" }) + vim.api.nvim_set_hl(0, "EndOfBuffer", { bg = "none" }) + ]] + end, }, + { -- Evil Lualine (statusline) 'nvim-lualine/lualine.nvim', dependencies = { 'nvim-tree/nvim-web-devicons' },