diff --git a/.gitignore b/.gitignore index 8cb205e..e033bc6 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -plugin +lazy-lock.json diff --git a/README.md b/README.md index d904a21..e05e476 100644 --- a/README.md +++ b/README.md @@ -1,23 +1,15 @@ -## Screenshots - -
- Config preview. Terminal - Config preview. Debugger - Config preview. Keybindings menu - Config preview. Git diff -
- ## Try out this config This config requires >= [Neovim v0.9.0](https://github.com/neovim/neovim/releases). Clone the repository into the correct location (make a backup your current `nvim` directory if you want to keep it). +The following command makes it all automatically: ``` -git clone https://github.com/cuqmbr/nvim-config.git ~/.config/nvim +cp -r ~/.config/nvim ~/.config/nvim_old && rm -rf ~/.cache/nvim ~/.local/share/nvim ~/.local/state/nvim ~/.config/nvim && git clone git@gitea.cuqmbr.xyz:cuqmbr/nvim-config.git ~/.config/nvim && echo 'cuqmbr's NeoVIM config installation completed successfuly' || echo 'Failed to install cuqmbr's NeoVIM config' ``` -Run `nvim` in your terminal and wait for the plugins to be installed. Reopen nvim +Run `nvim` in your terminal and wait for the plugins to be installed. It should take less than a minute. Reopen nvim **NOTE**: [Mason](https://github.com/williamboman/mason.nvim) is used to install and manage [LSP](https://microsoft.github.io/language-server-protocol/) servers, [DAP](https://microsoft.github.io/debug-adapter-protocol/) servers, [linters](https://en.wikipedia.org/wiki/Lint_(software)), and [formatters](https://en.wikipedia.org/wiki/Prettyprint) via the `:Mason` command. @@ -33,23 +25,13 @@ Open `nvim` and enter the following: :checkhealth ``` -If you noticed that you don't have support for copy/paste also that python and node haven't been setup follow advice: - -Copy/paste fix: +If you noticed that you don't have support for copy/paste: - On mac `pbcopy` should be builtin - - On GNU/Linux install [xsel](https://vergenet.net/~conrad/software/xsel/) or [wl-clipboard](https://github.com/bugaevc/wl-clipboard) for X11 or Wayland accordingly -Python and node Neovim support: +## Credits - ``` - pip install pynvim - ``` - - ``` - npm i -g neovim - ``` ---- - -**NOTE**: Make sure you have [node](https://nodejs.org/) and [python](https://www.python.org/) installed +- [FixVim](https://github.com/Krator3/FixVim) - base configuration +- [NeoVim From Scratch by LunarVim](https://github.com/LunarVim/Neovim-from-scratch) - Additional configuration pieces and a good learning experience +- Documentation of all installed plugins - a lot of configs are default ones with minor tweaks diff --git a/ftplugin/dart.lua b/ftplugin/dart.lua deleted file mode 100644 index 10c1efc..0000000 --- a/ftplugin/dart.lua +++ /dev/null @@ -1,4 +0,0 @@ -vim.bo.tabstop = 2 -- size of a hard tabstop (ts). -vim.bo.shiftwidth = 2 -- size of an indentation (sw). -vim.bo.expandtab = true -- always uses spaces instead of tab characters (et). -vim.bo.softtabstop = 2 -- number of spaces a counts for. When 0, feature is off (sts). diff --git a/init.lua b/init.lua index ccceb95..6f19c99 100644 --- a/init.lua +++ b/init.lua @@ -1,22 +1,25 @@ -require("user.options") -require("user.keymaps") -require("user.plugins") -require("user.colorscheme") -require("user.cmp") -require("user.lsp") -require("user.telescope") -require("user.gitsigns") -require("user.treesitter") -require("user.autopairs") -require("user.comment") -require("user.nvim-tree") -require("user.bufferline") -require("user.lualine") -require("user.toggleterm") -require("user.project") -require("user.impatient") -require("user.indentline") -require("user.alpha") -require("user.whichkey") -require("user.autocommands") -require("user.dap") +-- Базовая настройка +require("core.plugins") +require("core.color") +require("core.config") +require("core.autocmds") +require("core.utils") +require("core.ru_mappings") +require("core.mappings") + +require("plugins.dashboard") +require("plugins.neotree") +require("plugins.gitsigns") +require("plugins.mason") +require("plugins.lsp") +require("plugins.cmp") +require("plugins.dap") +require("plugins.treesitter") +require("plugins.bufferline") +require("plugins.lualine") +require("plugins.autopairs") +require("plugins.toggleterm") +require("plugins.colortils") +require("plugins.colorizer") +require("plugins.comment") +require("plugins.whichkey") diff --git a/lua/.luarc.json b/lua/.luarc.json deleted file mode 100644 index 23b9ee2..0000000 --- a/lua/.luarc.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "workspace.checkThirdParty": false -} \ No newline at end of file diff --git a/lua/core/autocmds.lua b/lua/core/autocmds.lua new file mode 100644 index 0000000..e5ad469 --- /dev/null +++ b/lua/core/autocmds.lua @@ -0,0 +1,11 @@ +-- Удалять пустой буфер, который появляется после создания файла в Neotree и открытия любого файла +vim.api.nvim_create_autocmd('BufHidden', { + desc = 'Delete [No Name] buffers', + callback = function(data) + if data.file == '' and vim.bo[data.buf].buftype == '' and not vim.bo[data.buf].modified then + vim.schedule(function() + pcall(vim.api.nvim_buf_delete, data.buf, {}) + end) + end + end, +}) diff --git a/lua/core/color.lua b/lua/core/color.lua new file mode 100644 index 0000000..8c4c1ce --- /dev/null +++ b/lua/core/color.lua @@ -0,0 +1,2 @@ +vim.opt.termguicolors = true -- Enable 24-bit RGB color in the TUI +require("kanagawa").load("wave") -- Activate theme previously installed in lua/core/plugins diff --git a/lua/core/config.lua b/lua/core/config.lua new file mode 100644 index 0000000..c8178d6 --- /dev/null +++ b/lua/core/config.lua @@ -0,0 +1,50 @@ +local options = { + backup = false, -- creates a backup file + clipboard = "unnamedplus", -- allows neovim to access the system clipboard + cmdheight = 1, -- more space in the neovim command line for displaying messages + completeopt = { "menuone", "noselect" }, -- mostly just for cmp + conceallevel = 0, -- so that `` is visible in markdown files + fileencoding = "utf-8", -- the encoding written to a file + hlsearch = true, -- highlight all matches on previous search pattern + ignorecase = true, -- ignore case in search patterns + -- mouse = "a", -- allow the mouse to be used in neovim + pumheight = 10, -- pop up menu height + showmode = false, -- we don't need to see things like -- INSERT -- anymore + showtabline = 2, -- always show tabs + smartcase = true, -- smart case + smartindent = true, -- make indenting smarter again + splitbelow = true, -- force all horizontal splits to go below current window + splitright = true, -- force all vertical splits to go to the right of current window + swapfile = false, -- creates a swapfile + termguicolors = true, -- set term gui colors (most terminals support this) + timeoutlen = 300, -- time to wait for a mapped sequence to complete (in milliseconds) + undofile = true, -- enable ability to undo after closing and opening the same file + updatetime = 300, -- faster completion (4000ms default) + 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 + expandtab = true, -- convert tabs to spaces + shiftwidth = 4, -- the number of spaces inserted for each indentation + tabstop = 4, -- insert 4 spaces for a tab + softtabstop = 4, -- number of spaces a counts for. When 0, feature is off (sts). + cursorline = true, -- highlight the current line + number = true, -- set numbered lines + relativenumber = true, -- set relative numbered lines + numberwidth = 4, -- set number column width to 2 {default 4} + + signcolumn = "yes", -- always show the sign column, otherwise it would shift the text each time + wrap = true, -- display lines as one long line + linebreak = true, -- companion to wrap, don't split words + scrolloff = 8, -- minimal number of screen lines to keep above and below the cursor + sidescrolloff = 8, -- minimal number of screen columns either side of cursor if wrap is `false` + guifont = "monospace:h17", -- the font used in graphical neovim applications + whichwrap = "bs<>[]hl", -- which "horizontal" keys are allowed to travel to prev/next line +} + +for k, v in pairs(options) do + vim.opt[k] = v +end + +-- vim.opt.shortmess = "ilmnrx" -- flags to shorten vim messages, see :help 'shortmess' +vim.opt.shortmess:append "c" -- don't give |ins-completion-menu| messages +vim.opt.iskeyword:append "-" -- hyphenated words recognized by searches +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. +vim.opt.runtimepath:remove("/usr/share/vim/vimfiles") -- separate vim plugins from neovim in case vim still in use diff --git a/lua/user/keymaps.lua b/lua/core/mappings.lua similarity index 96% rename from lua/user/keymaps.lua rename to lua/core/mappings.lua index bf36018..35b97b2 100644 --- a/lua/user/keymaps.lua +++ b/lua/core/mappings.lua @@ -1,7 +1,5 @@ local opts = { noremap = true, silent = true } -local term_opts = { silent = true } - -- Shorten function name local keymap = vim.keymap.set @@ -40,7 +38,7 @@ keymap("n", "", ":m .+1==", opts) keymap("n", "", ":m .-2==", opts) -- Insert -- --- Press jk fast to exit insert mode +-- Press jk fast to exit insert mode keymap("i", "jk", "", opts) keymap("i", "kj", "", opts) diff --git a/lua/core/plugins.lua b/lua/core/plugins.lua new file mode 100644 index 0000000..163dc90 --- /dev/null +++ b/lua/core/plugins.lua @@ -0,0 +1,125 @@ +local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim" +if not vim.loop.fs_stat(lazypath) then + vim.fn.system({ + "git", + "clone", + "--filter=blob:none", + "https://github.com/folke/lazy.nvim.git", + "--branch=stable", + lazypath, + }) +end +vim.opt.rtp:prepend(lazypath) + +require("lazy").setup { + + -- Colorschemes + { "rebelot/kanagawa.nvim" }, + { "Mofiqul/vscode.nvim" }, + + -- Create and explore menus of keybindings + { + "folke/which-key.nvim", + tag = "v1.6.0" + }, + + -- Fuzzy find everything and everywhere + { + "nvim-telescope/telescope.nvim", + tag = "v0.1.5", + dependencies = { "nvim-lua/plenary.nvim", "BurntSushi/ripgrep" } + }, + + -- Git integration for buffers + { + "lewis6991/gitsigns.nvim", + tag = "v0.7" + }, + + -- Better commenting + { + "numToStr/Comment.nvim", + tag = "v0.8.0" + }, + + -- LSP and DAP plugin manager. DO NOT change installation order of the following three plugins! + { "williamboman/mason.nvim" }, + -- Integration with lspconfig + { "williamboman/mason-lspconfig.nvim" }, + { "neovim/nvim-lspconfig" }, + -- Integration wiht dap + { "mfussenegger/nvim-dap" }, + { "rcarriga/nvim-dap-ui" }, + + -- Completion + { "hrsh7th/cmp-nvim-lsp" }, + { "hrsh7th/cmp-buffer" }, + { "hrsh7th/cmp-path" }, + { "hrsh7th/cmp-cmdline" }, + { "hrsh7th/cmp-nvim-lsp-signature-help" }, + { "hrsh7th/nvim-cmp" }, + -- vsnip and other snippet engines support + { "hrsh7th/cmp-vsnip" }, + { "hrsh7th/vim-vsnip" }, + { "hrsh7th/vim-vsnip-integ" }, + { "rafamadriz/friendly-snippets" }, + + -- Manage terminal windows inside neovim + { + "akinsho/toggleterm.nvim", + version = "*", + config = true + }, + + -- Manage the file system and other tree like structures + { + "nvim-neo-tree/neo-tree.nvim", + branch = "v3.x", + dependencies = { "nvim-lua/plenary.nvim", "nvim-tree/nvim-web-devicons", "MunifTanjim/nui.nvim", } + }, + + -- Line at the top of the screen with all opened buffers + { + "akinsho/bufferline.nvim", + tag = "v4.5.0", + dependencies = "nvim-tree/nvim-web-devicons" + }, + + -- Line at the bottom of the screen with useful information about opened buffer + { "nvim-lualine/lualine.nvim", + dependencies = "nvim-tree/nvim-web-devicons" + }, + + { "nvimdev/dashboard-nvim", + event = "VimEnter", + dependencies = "nvim-tree/nvim-web-devicons" + }, + + -- Text highlighting + { + "nvim-treesitter/nvim-treesitter", + tag = "v0.9.2", + dependencies = "JoosepAlviste/nvim-ts-context-commentstring", build = ":TSUpdate" + }, + + -- Autopairs for different kind of brackets and other symbols + { "windwp/nvim-autopairs" }, + + -- Manipulations with colors + { "max397574/colortils.nvim", + cmd = "Colortils" + }, + + -- Highlight colorcodes + { "NvChad/nvim-colorizer.lua" }, + + -- Preview markdown + { + "iamcco/markdown-preview.nvim", + cmd = { "MarkdownPreviewToggle", "MarkdownPreview", "MarkdownPreviewStop" }, + ft = { "markdown" }, + build = function() vim.fn["mkdp#util#install"]() end + }, + + { "folke/neodev.nvim" }, +} diff --git a/lua/core/ru_mappings.lua b/lua/core/ru_mappings.lua new file mode 100644 index 0000000..cd13e3b --- /dev/null +++ b/lua/core/ru_mappings.lua @@ -0,0 +1,131 @@ +--[[ +буква(ы) = Space (пробел) + = = Meta (Alt) (также можно исп. вместо ) + = Ctrl + или = Shift (русские буквы писать заглавной и без <>) + = Meta eсли ≠ Alt + = Super (Win) +--]] + +-- Для исп. нескольких символов в комбинации клавиш можно исп. только (остальные не сработают) +-- Для того, чтобы исп. shift и ещё какой-то модификатор, букву нужно писать заглавной +-- Учтите, что клавишы, назначенные системой, будут главнее => сработает системная комбинация вместо установленной здесь +-- Русские сочетания клавиш добавляются здесь (для сохранения удобной структуры), хотя никто не запрещает создавать их в lua/core/mappings.lua + +vim.keymap.set("n", "", ":w") -- Сохранить файл +vim.keymap.set("n", "", ":q") -- Закрыть Neovim + +-- Normal mode +vim.keymap.set("i", "оо", "") + +-- Command mode +vim.keymap.set("n", "Ж", ":") + +-- Insert mode +vim.keymap.set("n", "ф", "a") +vim.keymap.set("n", "Ф", "A") +vim.keymap.set("n", "щ", "o") +vim.keymap.set("n", "Щ", "O") +vim.keymap.set("n", "ш", "i") +vim.keymap.set("n", "Ш", "I") +vim.keymap.set("v", "с", "c") + +-- Перемещение влево +vim.keymap.set("n", "р", "h") +vim.keymap.set("v", "р", "h") + +-- Перемещение вниз +vim.keymap.set("n", "о", "j") +vim.keymap.set("v", "о", "j") + +-- Перемещение вверх +vim.keymap.set("n", "л", "k") +vim.keymap.set("v", "л", "k") + +-- Перемещение вправо +vim.keymap.set("n", "д", "l") +vim.keymap.set("v", "д", "l") + +-- Удаление +vim.keymap.set("n", "в", "d") +vim.keymap.set("v", "в", "d") +vim.keymap.set("n", "вв", "dd") +vim.keymap.set("n", "ч", "x") + +-- Вставка +vim.keymap.set("n", "з", "p") +vim.keymap.set("n", "З", "P") +vim.keymap.set("v", "з", "p") +vim.keymap.set("v", "З", "P") + +-- Отмена действия +vim.keymap.set("n", "г", "u") + +-- Копирование +vim.keymap.set("n", "нн", "yy") +vim.keymap.set("n", "н", "y") +vim.keymap.set("v", "н", "yy") + +-- Замена replace +vim.keymap.set("n", "к", "r") + +-- Работа с вкладками (буферами) +vim.keymap.set("n", "ч", ":BufferLineSortByTabs:BufferLineCloseRight") -- Закрытие всех буферов +vim.keymap.set("n", "Ч", ":BufferLinePickClose") -- Закрытие одного буфера +vim.api.nvim_set_keymap("n", "", ":lua _G.close_and_go_right()", { noremap = true, silent = true }) -- подробнее в lua/core/utils.lua +vim.keymap.set("n", "", ":BufferLineMoveNext") -- переместить вкладку вперед +vim.keymap.set("n", "", ":BufferLineMovePrev") -- переместить вкладку назад + +-- Выделение +vim.keymap.set("n", "м", "v") +vim.keymap.set("v", "м", "v") +vim.keymap.set("n", "М", "V") +vim.keymap.set("v", "М", "V") + +-- Файловый менеджер +vim.keymap.set("n", "", ":Neotree toggle float") -- Открыть/Закрыть файловое дерево в плавающем режиме +vim.keymap.set("n", "", ":Neotree toggle left") -- -- Открыть/Закрыть файловое дерево слева сбоку +-- vim.keymap.set("n", "", ":Neotree toggle") -- Открыть/Закрыть файловое дерево (используется последний активный режим) +vim.keymap.set("n", "ы", ":Neotree show reveal") -- Показать файл в дереве (не работает в плавающем режиме) + +-- Навигация +vim.keymap.set("n", "", ":wincmd k") -- Переключиться на верхнее окно +vim.keymap.set("n", "", ":wincmd j") -- Переключиться на нижнее окно +vim.keymap.set("n", "", ":wincmd h") -- Переключиться на левое окно +vim.keymap.set("n", "", ":wincmd l") -- Переключиться на правое окно + +-- В начало и конец файла +vim.keymap.set("n", "пп", "gg") +vim.keymap.set("v", "пп", "gg") +vim.keymap.set("n", "П", "G") +vim.keymap.set("v", "П", "G") + +--[[ Если строка визуально разбита на несколько строк, то курсор перепрыгнет через них, так как считает, что это одна строка +При помощи настройки ниже курсор будет перемещаться по ним будто это разные строки --]] +vim.keymap.set('n', 'о', "v:count == 0 ? 'gj' : 'j'", { + expr = true, +}) +vim.keymap.set('n', 'л', "v:count == 0 ? 'gk' : 'k'", { + expr = true, +}) + + +-- Терминал +vim.keymap.set("n", "", ":ToggleTerm direction=float") -- Открыть терминал в плавающем режиме + +vim.keymap.set("n", "Е", function() require("trouble").toggle() end) -- Открыть/Закрыть список проблем (расширение ) + +--[[ +Включить/Выключить подсветку Treesitter, то есть исп. подсветку от Treesitter или встроенную от LSP +Подсветка от Treesitter выдаёт более качественную подсветку по сравнению с LSP, но может замедлять работу Neovim в больших файлах +Благодаря этому хоткею можно переключаться между ними в зависимости от потребностей и личных приоритетов +--]] +vim.keymap.set("n", "", + function() if vim.b.ts_highlight then vim.treesitter.stop() else vim.treesitter.start() end end, + { desc = "Toggle Treesitter Highlight" }) + + +vim.keymap.set("n", "се", ":ColorizerToggle") -- Включить/Отключить подсветку цветовых кодов + +vim.keymap.set("n", "", ":m+1") -- Переместить строку под курсором на одну строку вниз +vim.keymap.set("n", "", ":m-2") -- Переместить строку под курсором на одну строку вверх diff --git a/lua/core/utils.lua b/lua/core/utils.lua new file mode 100644 index 0000000..1584ef3 --- /dev/null +++ b/lua/core/utils.lua @@ -0,0 +1,29 @@ +-- Функция для правильного и более удобного (функционального) закрытия буфера +_G.close_and_go_right = function() + local current_buf = vim.api.nvim_get_current_buf() + local buf_list = vim.fn.getbufinfo({ buflisted = 1 }) + + -- Если только один буфер, ничего не делаем + if #buf_list == 1 then + return + end + + -- Находим следующий или предыдущий буфер + local next_bufnr + for i, buf in ipairs(buf_list) do + if buf.bufnr == current_buf then + if i == #buf_list then + -- Если текущий буфер последний, идем к предыдущему + next_bufnr = buf_list[i - 1].bufnr + else + -- Иначе идем к следующему + next_bufnr = buf_list[i % #buf_list + 1].bufnr + end + break + end + end + + -- Переходим к выбранному буферу и закрываем текущий + vim.cmd("buffer " .. next_bufnr) + vim.cmd("bdelete! " .. current_buf) +end diff --git a/lua/plugins/autopairs.lua b/lua/plugins/autopairs.lua new file mode 100644 index 0000000..ba62d44 --- /dev/null +++ b/lua/plugins/autopairs.lua @@ -0,0 +1 @@ +require("nvim-autopairs").setup {} diff --git a/lua/plugins/bufferline.lua b/lua/plugins/bufferline.lua new file mode 100644 index 0000000..90b1367 --- /dev/null +++ b/lua/plugins/bufferline.lua @@ -0,0 +1,103 @@ +-- The following option is required for bufferline to work correctly (already activated in lua/core/color.lua) +-- vim.opt.termguicolors = true +local bufferline = require('bufferline') +bufferline.setup { + options = { + mode = "buffers", -- set to "tabs" to only show tabpages instead + style_preset = bufferline.style_preset.default, -- or bufferline.style_preset.minimal, + themable = true, -- allows highlight groups to be overriden i.e. sets highlights as default + numbers = "ordinal", + close_command = "bdelete! %d", -- can be a string | function, | false see "Mouse actions" + right_mouse_command = "bdelete! %d", -- can be a string | function | false, see "Mouse actions" + left_mouse_command = "buffer %d", -- can be a string | function, | false see "Mouse actions" + middle_mouse_command = nil, -- can be a string | function, | false see "Mouse actions" + indicator = { + icon = '▎', -- this should be omitted if indicator style is not 'icon' + style = 'icon', + }, + buffer_close_icon = '󰅖', + modified_icon = '●', + close_icon = '', + left_trunc_marker = '', + right_trunc_marker = '', + --- name_formatter can be used to change the buffer's label in the bufferline. + --- Please note some names can/will break the + --- bufferline so use this at your discretion knowing that it has + --- some limitations that will *NOT* be fixed. + name_formatter = function(buf) -- buf contains: + -- name | str | the basename of the active file + -- path | str | the full path of the active file + -- bufnr (buffer only) | int | the number of the active buffer + -- buffers (tabs only) | table(int) | the numbers of the buffers in the tab + -- tabnr (tabs only) | int | the "handle" of the tab, can be converted to its ordinal number using: `vim.api.nvim_tabpage_get_number(buf.tabnr)` + end, + max_name_length = 15, + max_prefix_length = 6, -- prefix used when a buffer is de-duplicated + truncate_names = true, -- whether or not tab names should be truncated + tab_size = 15, + diagnostics = false, + diagnostics_update_in_insert = false, + -- The diagnostics indicator can be set to nil to keep the buffer name highlight but delete the highlighting + diagnostics_indicator = function(count, level, diagnostics_dict, context) + return "(" .. count .. ")" + end, + -- NOTE: this will be called a lot so don't do any heavy processing here + custom_filter = function(buf_number, buf_numbers) + -- filter out filetypes you don't want to see + if vim.bo[buf_number].filetype ~= "" then + return true + end + -- filter out by buffer name + if vim.fn.bufname(buf_number) ~= "" then + return true + end + -- filter out based on arbitrary rules + -- e.g. filter out vim wiki buffer from tabline in your work repo + if vim.fn.getcwd() == "" and vim.bo[buf_number].filetype ~= "wiki" then + return true + end + -- filter out by it's index number in list (don't show first buffer) + if buf_numbers[1] ~= buf_number then + return true + end + end, + offsets = { + { + filetype = "neo-tree", + text = "File Tree", + text_align = "center", + separator = false + } + }, + color_icons = true, -- whether or not to add the filetype icon highlights + get_element_icon = function(element) + -- element consists of {filetype: string, path: string, extension: string, directory: string} + -- This can be used to change how bufferline fetches the icon + -- for an element e.g. a buffer or a tab. + -- e.g. + local icon, hl = require('nvim-web-devicons').get_icon_by_filetype(element.filetype, { default = false }) + return icon, hl + -- or + -- local custom_map = {my_thing_ft: {icon = "my_thing_icon", hl}} + -- return custom_map[element.filetype] + end, + show_buffer_icons = true, -- disable filetype icons for buffers + show_buffer_close_icons = false, + show_close_icon = false, + show_tab_indicators = true, + show_duplicate_prefix = true, -- whether to show duplicate buffer prefix + persist_buffer_sort = true, -- whether or not custom sorted buffers should persist + move_wraps_at_ends = false, -- whether or not the move command "wraps" at the first or last position + -- can also be a table containing 2 custom separators + -- [focused and unfocused]. eg: { '|', '|' } + separator_style = "thin", + enforce_regular_tabs = false, + always_show_bufferline = true, + hover = { + enabled = true, + delay = 200, + reveal = { 'close' } + }, + sort_by = 'insert_after_current' + } +} diff --git a/lua/plugins/cmp.lua b/lua/plugins/cmp.lua new file mode 100644 index 0000000..c662e95 --- /dev/null +++ b/lua/plugins/cmp.lua @@ -0,0 +1,105 @@ +local cmp = require("cmp") + +cmp.setup { + snippet = { + expand = function(args) + vim.fn["vsnip#anonymous"](args.body) + end, + }, + + window = { + completion = { + border = { "╭", "─", "╮", "│", "╯", "─", "╰", "│" }, + }, + documentation = { + border = { "╭", "─", "╮", "│", "╯", "─", "╰", "│" }, + }, + }, + + -- window = { + -- completion = cmp.config.window.bordered(), + -- documentation = cmp.config.window.bordered(), + -- }, + + mapping = cmp.mapping.preset.insert({ + [""] = cmp.mapping.select_prev_item(), + [""] = cmp.mapping.select_next_item(), + [""] = cmp.mapping(cmp.mapping.scroll_docs(-1), { "i", "c" }), + [""] = cmp.mapping(cmp.mapping.scroll_docs(1), { "i", "c" }), + [""] = cmp.mapping(cmp.mapping.complete(), { "i", "c" }), + [""] = cmp.config.disable, -- Specify `cmp.config.disable` if you want to remove the default `` mapping. + [""] = cmp.mapping { + i = cmp.mapping.abort(), + c = cmp.mapping.close(), + }, + -- Accept currently selected item. If none selected, `select` first item. + -- Set `select` to `false` to only confirm explicitly selected items. + [""] = cmp.mapping.confirm { select = false }, + [""] = cmp.mapping(function(fallback) + if cmp.visible() then + cmp.select_next_item() + else + fallback() + end + end, { "i", "s" }), + [""] = cmp.mapping(function(fallback) + if cmp.visible() then + cmp.select_prev_item() + else + fallback() + end + end, { "i", "s" }) + }), + + sources = cmp.config.sources( + { + { name = 'nvim_lsp' }, + { name = 'nvim_lsp_signature_help' }, + { name = 'vsnip' }, + { name = 'nvim_lua' }, + { name = 'path' }, + { name = 'buffer' }, + } + ), + + experimental = { + ghost_text = false, + native_menu = false, + }, +} + +-- Setup configuration for a specific type of file +cmp.setup.filetype('gitcommit', { + sources = cmp.config.sources({ + { name = 'git' }, + }, { + { name = 'buffer' }, + }) +}) + +-- Использовать источник буфера для `/` и `?` (если вы включили `native_menu`, это больше не будет работать) +cmp.setup.cmdline({ '/', '?' }, { + mapping = cmp.mapping.preset.cmdline(), + sources = { { name = 'buffer' } } +}) + +-- Используйте cmdline и источник пути для ':' (если вы включили `native_menu`, это больше не будет работать) +cmp.setup.cmdline(':', { + mapping = cmp.mapping.preset.cmdline(), + sources = cmp.config.sources({ { name = 'path' } }, { { name = 'cmdline' } }) +}) + +-- Настройка конфига LSP +local capabilities = require('cmp_nvim_lsp').default_capabilities() +-- Замените на нужный lsp-сервер (для каждого нужно создавать отдельный параметр) +-- require('lspconfig')[''].setup {capabilities = capabilities} +require('lspconfig')['pyright'].setup { capabilities = capabilities } + + + +-- Подстановка скобок к подсказкам, которым это нужно (дополнение для nvim-autopairs) +local cmp_autopairs = require('nvim-autopairs.completion.cmp') +cmp.event:on( + 'confirm_done', + cmp_autopairs.on_confirm_done() +) diff --git a/lua/plugins/colorizer.lua b/lua/plugins/colorizer.lua new file mode 100644 index 0000000..4b8f34c --- /dev/null +++ b/lua/plugins/colorizer.lua @@ -0,0 +1,17 @@ +require("colorizer").setup { + filetypes = { "*" }, + user_default_options = { + RGB = true, -- #RGB hex codes + RRGGBB = true, -- #RRGGBB hex codes + names = true, -- "Name" codes like Blue + RRGGBBAA = false, -- #RRGGBBAA hex codes + rgb_fn = false, -- CSS rgb() and rgba() functions + hsl_fn = false, -- CSS hsl() and hsla() functions + css = false, -- Enable all CSS features: rgb_fn, hsl_fn, names, RGB, RRGGBB + css_fn = false, -- Enable all CSS *functions*: rgb_fn, hsl_fn + -- Available modes: foreground, background + mode = 'background', -- Set the display mode. + }, + -- Все дополнительные параметры типов файлов применяются к типам буферов + buftypes = {}, +} diff --git a/lua/plugins/colortils.lua b/lua/plugins/colortils.lua new file mode 100644 index 0000000..e9bae65 --- /dev/null +++ b/lua/plugins/colortils.lua @@ -0,0 +1,57 @@ +require("colortils").setup { + -- Register in which color codes will be copied + register = "+", + -- Preview for colors, if it contains `%s` this will be replaced with a hex color code of the color + color_preview = "█ %s", + -- The default in which colors should be saved + -- This can be hex, hsl or rgb + default_format = "hex", + -- Border for the float + border = "rounded", + -- Some mappings which are used inside the tools + mappings = { + -- increment values + increment = "l", + -- decrement values + decrement = "h", + -- increment values with bigger steps + increment_big = "L", + -- decrement values with bigger steps + decrement_big = "H", + -- set values to the minimum + min_value = "0", + -- set values to the maximum + max_value = "$", + -- save the current color in the register specified above with the format specified above + set_register_default_format = "", + -- save the current color in the register specified above with a format you can choose + set_register_cjoose_format = "g", + -- replace the color under the cursor with the current color in the format specified above + replace_default_format = "", + -- replace the color under the cursor with the current color in a format you can choose + replace_choose_format = "g", + -- export the current color to a different tool + export = "E", + -- set the value to a certain number (done by just entering numbers) + set_value = "c", + -- toggle transparency + transparency = "T", + -- choose the background (for transparent colors) + choose_background = "B", + } +} + +--[[ + +You can use the different tools with commands. Those take the format Colortils . The color can be any of the supported formats. Notice that symbols like #, % and space need to be escaped like e.g. this \#FF00AB. + +If no valid color is provided as argument the color under the cursor (if available) will be used. If there isn't any found the user will be asked for input (notice that you don't need to escape characters there). + +:Colortils picker +:Colortils lighten +:Colortils darken +:Colortils greyscale +:Colortils gradient +:Colortils css list + +--]] diff --git a/lua/plugins/comment.lua b/lua/plugins/comment.lua new file mode 100644 index 0000000..282482d --- /dev/null +++ b/lua/plugins/comment.lua @@ -0,0 +1,45 @@ +local comment = require("Comment") + +comment.setup { + ---Add a space b/w comment and the line + padding = true, + ---Whether the cursor should stay at its position + sticky = true, + ---Lines to be ignored while (un)comment + ignore = nil, + ---LHS of toggle mappings in NORMAL mode + toggler = { + ---Line-comment toggle keymap + line = 'gcc', + ---Block-comment toggle keymap + block = 'gbc', + }, + ---LHS of operator-pending mappings in NORMAL and VISUAL mode + opleader = { + ---Line-comment keymap + line = 'gc', + ---Block-comment keymap + block = 'gb', + }, + ---LHS of extra mappings + extra = { + ---Add comment on the line above + above = 'gcO', + ---Add comment on the line below + below = 'gco', + ---Add comment at the end of line + eol = 'gcA', + }, + ---Enable keybindings + ---NOTE: If given `false` then the plugin won't create any mappings + mappings = { + ---Operator-pending mapping; `gcc` `gbc` `gc[count]{motion}` `gb[count]{motion}` + basic = true, + ---Extra mapping; `gco`, `gcO`, `gcA` + extra = true, + }, + ---Function to call before (un)comment + pre_hook = require('ts_context_commentstring.integrations.comment_nvim').create_pre_hook(), + ---Function to call after (un)comment + post_hook = nil, +} diff --git a/lua/plugins/dap.lua b/lua/plugins/dap.lua new file mode 100644 index 0000000..e4a13d2 --- /dev/null +++ b/lua/plugins/dap.lua @@ -0,0 +1,51 @@ +local dap = require("dap") + +-- dotnet + +dap.adapters.coreclr = { + type = "executable", + command = "netcoredbg", + args = { "--interpreter=vscode" } +} + +dap.configurations.cs = { + { + type = "coreclr", + name = "launch - netcoredbg", + request = "launch", + program = function() + return vim.fn.input("Path to dll: ", vim.fn.getcwd(), "file") + end, + }, +} + +-- DapUI + +local dapui = require("dapui") + +dapui.setup() + +-- Open and close windows automatically on certain events from DAP +dap.listeners.before.attach.dapui_config = function() + dapui.open() +end +dap.listeners.before.launch.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 + +-- Keymaps +vim.keymap.set("n", "", ":lua require('dap').continue()") +vim.keymap.set("n", "", ":lua require('dap').step_over()") +vim.keymap.set("n", "", ":lua require('dap').step_into()") +vim.keymap.set("n", "", ":lua require('dap').step_out()") +vim.keymap.set("n", "db", ":lua require('dap').toggle_breakpoint()") +vim.keymap.set("n", "dB", ":lua require('dap').set_breakpoint(vim.fn.input('Breakpoint condition: '))") +-- vim.keymap.set("n", "lp", ":lua require('dap').set_breakpoint(nil, nil, vim.fn.input('Log point message: '))") +-- vim.keymap.set("n", "dr", ":lua require('dap').repl.open()") +-- vim.keymap.set("n", "dl", ":lua require('dap').run_last()") diff --git a/lua/plugins/dashboard.lua b/lua/plugins/dashboard.lua new file mode 100644 index 0000000..57c5e37 --- /dev/null +++ b/lua/plugins/dashboard.lua @@ -0,0 +1,68 @@ +local function default_header() + return { + "", + "", + "", + + " ) (", + " ( ) )", + " ) ( (", + " mrf_______)_", + " .-'---------|", + "( C|/\\/\\/\\/\\/|", + " '-./\\/\\/\\/\\/|", + " '_________'", + " '-------'", + + "", + "", + "", + } +end +require("dashboard").setup { + theme = "doom", + config = { + header = default_header(), + center = { + { + icon = "󰙅 ", + icon_hl = "Title", + desc = "Open tree", + desc_hl = "String", + key = "o", + key_hl = "Number", + action = ":Neotree float", + }, + + { + icon = " ", + icon_hl = "Title", + desc = "New file", + desc_hl = "String", + key = "n", + key_hl = "Number", + action = ":ene", + }, + + { + icon = " ", + icon_hl = "Title", + desc = "Lazy", + desc_hl = "String", + key = "l", + key_hl = "Number", + action = ":Lazy", + }, + + { + icon = "⏻ ", + icon_hl = "Title", + desc = "Quit Neovim", + desc_hl = "String", + key = "q", + key_hl = "Number", + action = ":q", + }, + }, + }, +} diff --git a/lua/plugins/gitsigns.lua b/lua/plugins/gitsigns.lua new file mode 100644 index 0000000..d0bd650 --- /dev/null +++ b/lua/plugins/gitsigns.lua @@ -0,0 +1,45 @@ +local gitsigns = require("gitsigns") + +gitsigns.setup { + signs = { + add = { text = '│' }, + change = { text = '│' }, + delete = { text = '_' }, + topdelete = { text = '‾' }, + changedelete = { text = '~' }, + untracked = { text = '┆' }, + }, + signcolumn = true, -- Toggle with `:Gitsigns toggle_signs` + numhl = false, -- Toggle with `:Gitsigns toggle_numhl` + linehl = false, -- Toggle with `:Gitsigns toggle_linehl` + word_diff = false, -- Toggle with `:Gitsigns toggle_word_diff` + watch_gitdir = { + follow_files = true + }, + auto_attach = true, + attach_to_untracked = false, + current_line_blame = false, -- Toggle with `:Gitsigns toggle_current_line_blame` + current_line_blame_opts = { + virt_text = true, + virt_text_pos = 'eol', -- 'eol' | 'overlay' | 'right_align' + delay = 1000, + ignore_whitespace = false, + virt_text_priority = 100, + }, + current_line_blame_formatter = ', - ', + sign_priority = 6, + update_debounce = 100, + status_formatter = nil, -- Use default + max_file_length = 40000, -- Disable if file is longer than this (in lines) + preview_config = { + -- Options passed to nvim_open_win + border = 'single', + style = 'minimal', + relative = 'cursor', + row = 0, + col = 1 + }, + yadm = { + enable = false + }, +} diff --git a/lua/plugins/lsp.lua b/lua/plugins/lsp.lua new file mode 100644 index 0000000..0b16c89 --- /dev/null +++ b/lua/plugins/lsp.lua @@ -0,0 +1,58 @@ +-- nvim-cmp supports LSP capabilities so set it as default LSP engine +local capabilities = vim.lsp.protocol.make_client_capabilities() +capabilities = require('cmp_nvim_lsp').default_capabilities(capabilities) + + +-- LSP setup for different programming languages +local lspconfig = require('lspconfig') +local lsputil = require('lspconfig/util') + +lspconfig.omnisharp.setup {} + +-- lua_ls LSP setup via Neodev extension which provides additional functionality +require("neodev").setup() +lspconfig.lua_ls.setup { + settings = { + Lua = { + completion = { + callSnippet = "Replace" + } + } + } +} + +-- Global mappings. +-- See `:help vim.diagnostic.*` for documentation on any of the below functions +vim.keymap.set('n', 'e', vim.diagnostic.open_float) +vim.keymap.set('n', '[d', vim.diagnostic.goto_prev) +vim.keymap.set('n', ']d', vim.diagnostic.goto_next) +vim.keymap.set('n', 'q', vim.diagnostic.setloclist) + +-- Use LspAttach autocommand to only map the following keys +-- after the language server attaches to the current buffer +vim.api.nvim_create_autocmd('LspAttach', { + group = vim.api.nvim_create_augroup('UserLspConfig', {}), + callback = function(ev) + -- Enable completion triggered by + vim.bo[ev.buf].omnifunc = 'v:lua.vim.lsp.omnifunc' + + -- Buffer local mappings. + -- See `:help vim.lsp.*` for documentation on any of the below functions + local opts = { buffer = ev.buf } + vim.keymap.set("n", "gD", "lua vim.lsp.buf.declaration()", opts) + vim.keymap.set("n", "gd", "lua vim.lsp.buf.definition()", opts) + vim.keymap.set("n", "K", "lua vim.lsp.buf.hover()", opts) + vim.keymap.set("n", "gI", "lua vim.lsp.buf.implementation()", opts) + vim.keymap.set("n", "gr", "lua vim.lsp.buf.references()", opts) + vim.keymap.set("n", "gl", "lua vim.diagnostic.open_float()", opts) + vim.keymap.set("n", "lf", "lua vim.lsp.buf.format{ async = true }", opts) + vim.keymap.set("n", "li", "LspInfo", opts) + vim.keymap.set("n", "lI", "LspInstallInfo", opts) + vim.keymap.set("n", "la", "lua vim.lsp.buf.code_action()", opts) + vim.keymap.set("n", "lj", "lua vim.diagnostic.goto_next({buffer=0})", opts) + vim.keymap.set("n", "lk", "lua vim.diagnostic.goto_prev({buffer=0})", opts) + vim.keymap.set("n", "lr", "lua vim.lsp.buf.rename()", opts) + vim.keymap.set("n", "ls", "lua vim.lsp.buf.signature_help()", opts) + vim.keymap.set("n", "lq", "lua vim.diagnostic.setloclist()", opts) + end, +}) diff --git a/lua/plugins/lualine.lua b/lua/plugins/lualine.lua new file mode 100644 index 0000000..cc917b5 --- /dev/null +++ b/lua/plugins/lualine.lua @@ -0,0 +1,86 @@ +require("lualine").setup { + options = { + icons_enabled = true, + theme = "auto", + component_separators = { left = "", right = "|" }, + section_separators = { left = "", right = "" }, + disabled_filetypes = { + statusline = { "neo-tree" }, + winbar = {}, + }, + ignore_focus = {}, + always_divide_middle = true, + globalstatus = false, + refresh = { + statusline = 1000, + tabline = 1000, + winbar = 1000, + } + }, + + --[[ + Lualine has sections as shown below + +-------------------------------------------------+ + | A | B | C X | Y | Z | + +-------------------------------------------------+ + --]] + + sections = { + lualine_a = { "mode" }, + lualine_b = { "branch", "diff" }, + lualine_c = { + { "filename", path = 1 }, + { + "diagnostics", + sources = { "nvim_diagnostic", "nvim_lsp" }, + sections = { "error", "warn", "info", "hint" }, + diagnostics_color = { + error = "DiagnosticError", + warn = "DiagnosticWarn", + info = "DiagnosticInfo", + hint = "DiagnosticHint", + }, + symbols = { error = "󰅙 ", warn = " ", info = "", hint = " " }, + colored = true, + update_in_insert = true, + always_visible = false, + } + }, + lualine_x = { "filetype", "encoding", "fileformat", "filesize" }, + lualine_y = { "progress" }, + lualine_z = { "location" } + }, + inactive_sections = { + lualine_a = {}, + lualine_b = {}, + lualine_c = { { "filename", path = 3 } }, + lualine_x = { "filetype", "encoding", "fileformat", "filesize" }, + lualine_y = {}, + lualine_z = {}, + }, + tabline = {}, + winbar = {}, + inactive_winbar = {}, + extensions = {} +} + +--[[ +Available components + - branch (git branch) + - buffers (shows currently available buffers) + - diagnostics (diagnostics count from your preferred source) + - diff (git diff status) + - encoding (file encoding) + - fileformat (file format) + - filename + - filesize + - filetype + - hostname + - location (location in file in line:column format) + - mode (vim mode) + - progress (%progress in file) + - searchcount (number of search matches when hlsearch is active) + - selectioncount (number of selected characters or lines) + - tabs (shows currently available tabs) + - windows (shows currently available windows) +--]] diff --git a/lua/plugins/mason.lua b/lua/plugins/mason.lua new file mode 100644 index 0000000..8692e4f --- /dev/null +++ b/lua/plugins/mason.lua @@ -0,0 +1,129 @@ +require("mason").setup { + -- The directory in which to install packages. + -- install_root_dir = path.concat { vim.fn.stdpath "data", "mason" }, + + -- Where Mason should put its bin location in your PATH. Can be one of: + -- - "prepend" (default, Mason's bin location is put first in PATH) + -- - "append" (Mason's bin location is put at the end of PATH) + -- - "skip" (doesn't modify PATH) + ---@type '"prepend"' | '"append"' | '"skip"' + PATH = "prepend", + + -- Controls to which degree logs are written to the log file. It's useful to set this to vim.log.levels.DEBUG when + -- debugging issues with package installations. + log_level = vim.log.levels.INFO, + + -- Limit for the maximum amount of packages to be installed at the same time. Once this limit is reached, any further + -- packages that are requested to be installed will be put in a queue. + max_concurrent_installers = 4, + + -- [Advanced setting] + -- The registries to source packages from. Accepts multiple entries. Should a package with the same name exist in + -- multiple registries, the registry listed first will be used. + registries = { + "github:mason-org/mason-registry", + }, + + -- The provider implementations to use for resolving supplementary package metadata (e.g., all available versions). + -- Accepts multiple entries, where later entries will be used as fallback should prior providers fail. + -- Builtin providers are: + -- - mason.providers.registry-api - uses the https://api.mason-registry.dev API + -- - mason.providers.client - uses only client-side tooling to resolve metadata + providers = { + "mason.providers.registry-api", + "mason.providers.client", + }, + + github = { + -- The template URL to use when downloading assets from GitHub. + -- The placeholders are the following (in order): + -- 1. The repository (e.g. "rust-lang/rust-analyzer") + -- 2. The release version (e.g. "v0.3.0") + -- 3. The asset name (e.g. "rust-analyzer-v0.3.0-x86_64-unknown-linux-gnu.tar.gz") + download_url_template = "https://github.com/%s/releases/download/%s/%s", + }, + + pip = { + -- Whether to upgrade pip to the latest version in the virtual environment before installing packages. + upgrade_pip = false, + + -- These args will be added to `pip install` calls. Note that setting extra args might impact intended behavior + -- and is not recommended. + -- + -- Example: { "--proxy", "https://proxyserver" } + install_args = {}, + }, + + ui = { + -- Whether to automatically check for new versions when opening the :Mason window. + check_outdated_packages_on_open = true, + + -- The border to use for the UI window. Accepts same border values as |nvim_open_win()|. + border = { "╭", "─", "╮", "│", "╯", "─", "╰", "│" }, -- рамка для окна + + -- Width of the window. Accepts: + -- - Integer greater than 1 for fixed width. + -- - Float in the range of 0-1 for a percentage of screen width. + width = 0.8, + + -- Height of the window. Accepts: + -- - Integer greater than 1 for fixed height. + -- - Float in the range of 0-1 for a percentage of screen height. + height = 0.9, + + icons = { + -- The list icon to use for installed packages. + package_installed = "✓", + -- The list icon to use for packages that are installing, or queued for installation. + package_pending = "➜", + -- The list icon to use for packages that are not installed. + package_uninstalled = "✗" + }, + + keymaps = { + -- Keymap to expand a package + toggle_package_expand = "", + -- Keymap to install the package under the current cursor position + install_package = "i", + -- Keymap to reinstall/update the package under the current cursor position + update_package = "u", + -- Keymap to check for new version for the package under the current cursor position + check_package_version = "c", + -- Keymap to update all installed packages + update_all_packages = "U", + -- Keymap to check which installed packages are outdated + check_outdated_packages = "C", + -- Keymap to uninstall a package + uninstall_package = "X", + -- Keymap to cancel a package installation + cancel_installation = "", + -- Keymap to apply language filter + apply_language_filter = "", + -- Keymap to toggle viewing package installation log + toggle_package_install_log = "", + -- Keymap to toggle the help view + toggle_help = "g?", + }, + } +} + +require("mason-lspconfig").setup { + -- A list of servers to automatically install if they're not already installed. Example: { "rust_analyzer@nightly", "lua_ls" } + -- This setting has no relation with the `automatic_installation` setting. + ---@type string[] + ensure_installed = { "lua_ls" }, + + -- Whether servers that are set up (via lspconfig) should be automatically installed if they're not already installed. + -- This setting has no relation with the `ensure_installed` setting. + -- Can either be: + -- - false: Servers are not automatically installed. + -- - true: All servers set up via lspconfig are automatically installed. + -- - { exclude: string[] }: All servers set up via lspconfig, except the ones provided in the list, are automatically installed. + -- Example: automatic_installation = { exclude = { "rust_analyzer", "solargraph" } } + ---@type boolean + automatic_installation = false, -- Автоматическая установка + + -- See `:h mason-lspconfig.setup_handlers()` + ---@type table? + handlers = nil, +} diff --git a/lua/plugins/neotree.lua b/lua/plugins/neotree.lua new file mode 100644 index 0000000..a8f82f5 --- /dev/null +++ b/lua/plugins/neotree.lua @@ -0,0 +1,275 @@ +-- If you want icons for diagnostic errors, you'll need to define them somewhere: +vim.fn.sign_define("DiagnosticSignError", { text = "󰅙 ", texthl = "DiagnosticSignError" }) +vim.fn.sign_define("DiagnosticSignWarn", { text = " ", texthl = "DiagnosticSignWarn" }) +vim.fn.sign_define("DiagnosticSignInfo", { text = "", texthl = "DiagnosticSignInfo" }) +vim.fn.sign_define("DiagnosticSignHint", { text = "", texthl = "DiagnosticSignHint" }) + +require("neo-tree").setup({ + close_if_last_window = false, -- Close Neo-tree if it is the last window left in the tab + popup_border_style = "rounded", + enable_git_status = true, + enable_diagnostics = true, + enable_normal_mode_for_inputs = false, -- Enable normal mode for input dialogs. + open_files_do_not_replace_types = { "terminal", "trouble", "qf" }, -- when opening files, do not use windows containing these filetypes or buftypes + sort_case_insensitive = false, -- used when sorting files and directories in the tree + sort_function = nil, -- use a custom function for sorting files and directories in the tree + -- sort_function = function (a,b) + -- if a.type == b.type then + -- return a.path > b.path + -- else + -- return a.type > b.type + -- end + -- end , -- this sorts files and directories descendantly + default_component_configs = { + container = { + enable_character_fade = true + }, + indent = { + indent_size = 2, + padding = 1, -- extra padding on left hand side + -- indent guides + with_markers = true, + indent_marker = "│", + last_indent_marker = "└", + highlight = "NeoTreeIndentMarker", + -- expander config, needed for nesting files + with_expanders = nil, -- if nil and file nesting is enabled, will enable expanders + expander_collapsed = "", + expander_expanded = "", + expander_highlight = "NeoTreeExpander", + }, + icon = { + folder_closed = "", + folder_open = "", + folder_empty = "󰜌", + -- The next two settings are only a fallback, if you use nvim-web-devicons and configure default icons there + -- then these will never be used. + default = "*", + highlight = "NeoTreeFileIcon" + }, + modified = { + symbol = "[+]", + highlight = "NeoTreeModified", + }, + name = { + trailing_slash = false, + use_git_status_colors = true, + highlight = "NeoTreeFileName", + }, + git_status = { + symbols = { + -- Change type + added = "", -- or "✚", but this is redundant info if you use git_status_colors on the name + modified = "", -- or "", but this is redundant info if you use git_status_colors on the name + deleted = "✖", -- this can only be used in the git_status source + renamed = "󰁕", -- this can only be used in the git_status source + -- Status type + untracked = "", + ignored = "", + unstaged = "󰄱", + staged = "", + conflict = "", + } + }, + -- If you don't want to use these columns, you can set `enabled = false` for each of them individually + file_size = { + enabled = true, + required_width = 64, -- min width of window required to show this column + }, + type = { + enabled = true, + required_width = 122, -- min width of window required to show this column + }, + last_modified = { + enabled = true, + required_width = 88, -- min width of window required to show this column + }, + created = { + enabled = true, + required_width = 110, -- min width of window required to show this column + }, + symlink_target = { + enabled = false, + }, + }, + -- A list of functions, each representing a global custom command + -- that will be available in all sources (if not overridden in `opts[source_name].commands`) + -- see `:h neo-tree-custom-commands-global` + commands = {}, + window = { + position = "left", + width = 40, + mapping_options = { + noremap = true, + nowait = true, + }, + mappings = { + [""] = { + "toggle_node", + nowait = false, -- disable `nowait` if you have existing combos starting with this char that you want to use + }, + [""] = "open", + ["l"] = "open", + [""] = "cancel", -- close preview or floating neo-tree window + ["P"] = { "toggle_preview", config = { use_float = true, use_image_nvim = true } }, + -- Read `# Preview Mode` for more information + ["F"] = "focus_preview", + ["S"] = "open_split", + ["s"] = "open_vsplit", + -- ["S"] = "split_with_window_picker", + -- ["s"] = "vsplit_with_window_picker", + ["t"] = "open_tabnew", + -- [""] = "open_drop", + -- ["t"] = "open_tab_drop", + ["w"] = "open_with_window_picker", + --["P"] = "toggle_preview", -- enter preview mode, which shows the current node without focusing + ["C"] = "close_node", + ["h"] = "close_node", + -- ['C'] = 'close_all_subnodes', + ["z"] = "close_all_nodes", + --["Z"] = "expand_all_nodes", + ["a"] = { + "add", + -- this command supports BASH style brace expansion ("x{a,b,c}" -> xa,xb,xc). see `:h neo-tree-file-actions` for details + -- some commands may take optional config options, see `:h neo-tree-mappings` for details + config = { + show_path = "none" -- "none", "relative", "absolute" + } + }, + ["A"] = "add_directory", -- also accepts the optional config.show_path option like "add". this also supports BASH style brace expansion. + ["d"] = "delete", + ["r"] = "rename", + ["y"] = "copy_to_clipboard", + ["x"] = "cut_to_clipboard", + ["p"] = "paste_from_clipboard", + ["c"] = "copy", -- takes text input for destination, also accepts the optional config.show_path option like "add": + -- ["c"] = { + -- "copy", + -- config = { + -- show_path = "none" -- "none", "relative", "absolute" + -- } + --} + ["m"] = "move", -- takes text input for destination, also accepts the optional config.show_path option like "add". + ["q"] = "close_window", + ["R"] = "refresh", + ["?"] = "show_help", + ["<"] = "prev_source", + [">"] = "next_source", + ["i"] = "show_file_details", + } + }, + nesting_rules = {}, + filesystem = { + filtered_items = { + visible = false, -- when true, they will just be displayed differently than normal items + hide_dotfiles = true, + hide_gitignored = true, + hide_hidden = true, -- only works on Windows for hidden files/directories + hide_by_name = { + --"node_modules" + }, + hide_by_pattern = { -- uses glob style patterns + --"*.meta", + --"*/src/*/tsconfig.json", + }, + always_show = { -- remains visible even if other settings would normally hide it + --".gitignored", + }, + never_show = { -- remains hidden even if visible is toggled to true, this overrides always_show + --".DS_Store", + --"thumbs.db" + }, + never_show_by_pattern = { -- uses glob style patterns + --".null-ls_*", + }, + }, + follow_current_file = { + enabled = false, -- This will find and focus the file in the active buffer every time + -- -- the current file is changed while the tree is open. + leave_dirs_open = false, -- `false` closes auto expanded dirs, such as with `:Neotree reveal` + }, + group_empty_dirs = false, -- when true, empty folders will be grouped together + hijack_netrw_behavior = "open_default", -- netrw disabled, opening a directory opens neo-tree + -- in whatever position is specified in window.position + -- "open_current", -- netrw disabled, opening a directory opens within the + -- window like netrw would, regardless of window.position + -- "disabled", -- netrw left alone, neo-tree does not handle opening dirs + use_libuv_file_watcher = false, -- This will use the OS level file watchers to detect changes + -- instead of relying on nvim autocmd events. + window = { + mappings = { + [""] = "navigate_up", + ["."] = "set_root", + ["H"] = "toggle_hidden", + ["/"] = "fuzzy_finder", + ["D"] = "fuzzy_finder_directory", + ["#"] = "fuzzy_sorter", -- fuzzy sorting using the fzy algorithm + -- ["D"] = "fuzzy_sorter_directory", + ["f"] = "filter_on_submit", + [""] = "clear_filter", + ["[g"] = "prev_git_modified", + ["]g"] = "next_git_modified", + ["o"] = { "show_help", nowait = false, config = { title = "Order by", prefix_key = "o" } }, + ["oc"] = { "order_by_created", nowait = false }, + ["od"] = { "order_by_diagnostics", nowait = false }, + ["og"] = { "order_by_git_status", nowait = false }, + ["om"] = { "order_by_modified", nowait = false }, + ["on"] = { "order_by_name", nowait = false }, + ["os"] = { "order_by_size", nowait = false }, + ["ot"] = { "order_by_type", nowait = false }, + }, + fuzzy_finder_mappings = { -- define keymaps for filter popup window in fuzzy_finder_mode + [""] = "move_cursor_down", + [""] = "move_cursor_down", + [""] = "move_cursor_up", + [""] = "move_cursor_up", + }, + }, + + commands = {} -- Add a custom command or override a global one using the same function name + }, + buffers = { + follow_current_file = { + enabled = true, -- This will find and focus the file in the active buffer every time + -- -- the current file is changed while the tree is open. + leave_dirs_open = false, -- `false` closes auto expanded dirs, such as with `:Neotree reveal` + }, + group_empty_dirs = true, -- when true, empty folders will be grouped together + show_unloaded = true, + window = { + mappings = { + ["bd"] = "buffer_delete", + [""] = "navigate_up", + ["."] = "set_root", + ["o"] = { "show_help", nowait = false, config = { title = "Order by", prefix_key = "o" } }, + ["oc"] = { "order_by_created", nowait = false }, + ["od"] = { "order_by_diagnostics", nowait = false }, + ["om"] = { "order_by_modified", nowait = false }, + ["on"] = { "order_by_name", nowait = false }, + ["os"] = { "order_by_size", nowait = false }, + ["ot"] = { "order_by_type", nowait = false }, + } + }, + }, + git_status = { + window = { + position = "float", + mappings = { + ["A"] = "git_add_all", + ["gu"] = "git_unstage_file", + ["ga"] = "git_add_file", + ["gr"] = "git_revert_file", + ["gc"] = "git_commit", + ["gp"] = "git_push", + ["gg"] = "git_commit_and_push", + ["o"] = { "show_help", nowait = false, config = { title = "Order by", prefix_key = "o" } }, + ["oc"] = { "order_by_created", nowait = false }, + ["od"] = { "order_by_diagnostics", nowait = false }, + ["om"] = { "order_by_modified", nowait = false }, + ["on"] = { "order_by_name", nowait = false }, + ["os"] = { "order_by_size", nowait = false }, + ["ot"] = { "order_by_type", nowait = false }, + } + } + } +}) diff --git a/lua/plugins/toggleterm.lua b/lua/plugins/toggleterm.lua new file mode 100644 index 0000000..807e063 --- /dev/null +++ b/lua/plugins/toggleterm.lua @@ -0,0 +1,11 @@ +require("toggleterm").setup({ open_mapping = [[]] }) + +function _G.set_terminal_keymaps() + local opts = { buffer = 0 } + -- Switching between terminal and normal mode inside terminal window + vim.keymap.set("t", "", [[]], opts) + vim.keymap.set("t", "jk", [[]], opts) + vim.keymap.set("t", "kj", [[]], opts) +end + +vim.cmd("autocmd! TermOpen term://* lua set_terminal_keymaps()") diff --git a/lua/plugins/treesitter.lua b/lua/plugins/treesitter.lua new file mode 100644 index 0000000..edeaa03 --- /dev/null +++ b/lua/plugins/treesitter.lua @@ -0,0 +1,41 @@ +require("nvim-treesitter.configs").setup { + -- A list of parser names, or "all" (the five listed parsers should always be installed) + ensure_installed = { "lua", "vim", "vimdoc", "query" }, + + -- Install parsers synchronously (only applied to `ensure_installed`) + sync_install = false, + + -- Automatically install missing parsers when entering buffer + -- Recommendation: set to false if you don't have `tree-sitter` CLI installed locally + auto_install = false, + + -- List of parsers to ignore installing (or "all") + -- ignore_install = { "javascript" }, + + ---- If you need to change the installation directory of the parsers (see -> Advanced Setup) + -- parser_install_dir = "/some/path/to/store/parsers", -- Remember to run vim.opt.runtimepath:append("/some/path/to/store/parsers")! + + highlight = { + enable = true, + + -- NOTE: these are the names of the parsers and not the filetype. (for example if you want to + -- disable highlighting for the `tex` filetype, you need to include `latex` in this list as this is + -- the name of the parser) + -- list of language that will be disabled + -- disable = { "c", "rust" }, + -- Or use a function for more flexibility, e.g. to disable slow treesitter highlight for large files + disable = function(lang, buf) + local max_filesize = 100 * 1024 -- 100 KB + local ok, stats = pcall(vim.loop.fs_stat, vim.api.nvim_buf_get_name(buf)) + if ok and stats and stats.size > max_filesize then + return true + end + end, + + -- Setting this to true will run `:h syntax` and tree-sitter at the same time. + -- Set this to `true` if you depend on 'syntax' being enabled (like for indentation). + -- Using this option may slow down your editor, and you may see some duplicate highlights. + -- Instead of true it can also be a list of languages + additional_vim_regex_highlighting = false, + } +} diff --git a/lua/plugins/whichkey.lua b/lua/plugins/whichkey.lua new file mode 100644 index 0000000..10a39e1 --- /dev/null +++ b/lua/plugins/whichkey.lua @@ -0,0 +1,158 @@ +local setup = { + plugins = { + marks = true, -- shows a list of your marks on ' and ` + registers = true, -- shows your registers on " in NORMAL or in INSERT mode + spelling = { + enabled = true, -- enabling this will show WhichKey when pressing z= to select spelling suggestions + suggestions = 20, -- how many suggestions should be shown in the list? + }, + -- the presets plugin, adds help for a bunch of default keybindings in Neovim + -- No actual key bindings are created + presets = { + operators = true, -- adds help for operators like d, y, ... and registers them for motion / text object completion + motions = true, -- adds help for motions + text_objects = true, -- help for text objects triggered after entering an operator + windows = true, -- default bindings on + nav = true, -- misc bindings to work with windows + z = true, -- bindings for folds, spelling and others prefixed with z + g = true, -- bindings for prefixed with g + }, + }, + -- add operators that will trigger motion and text object completion + -- to enable all native operators, set the preset / operators plugin above + -- operators = { gc = "Comments" }, + key_labels = { + -- override the label used to display some keys. It doesn't effect WK in any other way. + -- For example: + -- [""] = "SPC", + -- [""] = "RET", + -- [""] = "TAB", + }, + icons = { + breadcrumb = "»", -- symbol used in the command line area that shows your active key combo + separator = "➜", -- symbol used between a key and it's label + group = "+", -- symbol prepended to a group + }, + popup_mappings = { + scroll_down = "", -- binding to scroll down inside the popup + scroll_up = "", -- binding to scroll up inside the popup + }, + window = { + border = "rounded", -- none, single, double, shadow + position = "bottom", -- bottom, top + margin = { 1, 0, 1, 0 }, -- extra window margin [top, right, bottom, left] + padding = { 2, 2, 2, 2 }, -- extra window padding [top, right, bottom, left] + winblend = 0, + }, + layout = { + height = { min = 4, max = 25 }, -- min and max height of the columns + width = { min = 20, max = 50 }, -- min and max width of the columns + spacing = 3, -- spacing between columns + align = "left", -- align columns left, center or right + }, + ignore_missing = true, -- enable this to hide mappings for which you didn't specify a label + hidden = { "", "", "", "", "call", "lua", "^:", "^ " }, -- hide mapping boilerplate + show_help = true, -- show help message on the command line when the popup is visible + triggers = "auto", -- automatically setup triggers + -- triggers = {""} -- or specify a list manually + triggers_blacklist = { + -- list of mode / prefixes that should never be hooked by WhichKey + -- this is mostly relevant for key maps that start with a native binding + -- most people should not need to change this + i = { "j", "k" }, + v = { "j", "k" }, + }, +} + +local opts = { + mode = "n", -- NORMAL mode + prefix = "", + buffer = nil, -- Global mappings. Specify a buffer number for buffer local mappings + silent = true, -- use `silent` when creating keymaps + noremap = true, -- use `noremap` when creating keymaps + nowait = true, -- use `nowait` when creating keymaps +} + +local mappings = { + ["b"] = { + "lua require('telescope.builtin').buffers(require('telescope.themes').get_dropdown{previewer = false})", + "Buffers", + }, + ["c"] = { "lua _G.close_and_go_right()", "Close Buffer" }, + ["e"] = { "Neotree toggle left", "Explorer" }, + ["f"] = { + "lua require('telescope.builtin').find_files(require('telescope.themes').get_dropdown{previewer = false})", + "Find files", + }, + ["F"] = { "Telescope live_grep theme=ivy", "Find Text" }, + ["h"] = { "nohlsearch", "No Highlight" }, + ["m"] = { "MarkdownPreviewToggle", "Toggle markdow previewer" }, + + g = { + name = "Git", + g = { "lua _LAZYGIT_TOGGLE()", "Lazygit" }, + j = { "lua require('gitsigns').next_hunk()", "Next Hunk" }, + k = { "lua require('gitsigns').prev_hunk()", "Prev Hunk" }, + l = { "lua require('gitsigns').blame_line()", "Blame" }, + p = { "lua require('gitsigns').preview_hunk()", "Preview Hunk" }, + r = { "lua require('gitsigns').reset_hunk()", "Reset Hunk" }, + R = { "lua require('gitsigns').reset_buffer()", "Reset Buffer" }, + s = { "lua require('gitsigns').stage_hunk()", "Stage Hunk" }, + u = { "lua require('gitsigns').undo_stage_hunk()", "Undo Stage Hunk", }, + o = { "Telescope git_status", "Open changed file" }, + b = { "Telescope git_branches", "Checkout branch" }, + c = { "Telescope git_commits", "Checkout commit" }, + d = { "Gitsigns diffthis HEAD", "Diff", }, + }, + + l = { + name = "LSP", + a = { "lua vim.lsp.buf.code_action()", "Code Action" }, + d = { "Telescope diagnostics bufnr=0", "Document Diagnostics", }, + w = { "Telescope diagnostics", "Workspace Diagnostics", }, + f = { "lua vim.lsp.buf.format{async=true}", "Format" }, + i = { "LspInfo", "Info" }, + I = { "LspInstallInfo", "Installer Info" }, + j = { "lua vim.lsp.diagnostic.goto_next()", "Next Diagnostic", }, + k = { "lua vim.lsp.diagnostic.goto_prev()", "Prev Diagnostic", }, + l = { "lua vim.lsp.codelens.run()", "CodeLens Action" }, + q = { "lua vim.diagnostic.setloclist()", "Quickfix" }, + r = { "lua vim.lsp.buf.rename()", "Rename" }, + s = { "Telescope lsp_document_symbols", "Document Symbols" }, + S = { "Telescope lsp_dynamic_workspace_symbols", "Workspace Symbols", }, + }, + + s = { + name = "Search", + b = { "Telescope git_branches", "Checkout branch" }, + c = { "Telescope colorscheme", "Colorscheme" }, + h = { "Telescope help_tags", "Find Help" }, + r = { "Telescope oldfiles", "Open Recent File" }, + R = { "Telescope registers", "Registers" }, + k = { "Telescope keymaps", "Keymaps" }, + C = { "Telescope commands", "Commands" }, + }, + + t = { + name = "Terminal", + f = { "ToggleTerm direction=float", "Float" }, + h = { "ToggleTerm size=10 direction=horizontal", "Horizontal" }, + v = { "ToggleTerm size=80 direction=vertical", "Vertical" }, + }, + + d = { + name = "Debugging", + c = { "lua require('dap').continue()", "Start/Continue (F5)" }, + o = { "lua require('dap').step_over()", "Step Over (F10)" }, + ["["] = { "lua require('dap').step_out()", "Step Out (F12)" }, + ["]"] = { "lua require('dap').step_into()", "Step Into (F11)" }, + b = { "lua require('dap').toggle_breakpoint()", "Toggle Braekpoint" }, + B = { "lua require('dap').set_breakpoint(vim.fn.input('Breakpoint condition: '))", "Set Breakpoint with Condition" }, + u = { "lua require('dapui').toggle()", "Toggle UI" } + } +} + +local which_key = require("which-key") + +which_key.setup(setup) +which_key.register(mappings, opts) diff --git a/lua/user/alpha.lua b/lua/user/alpha.lua deleted file mode 100644 index 439b77c..0000000 --- a/lua/user/alpha.lua +++ /dev/null @@ -1,42 +0,0 @@ -local status_ok, alpha = pcall(require, "alpha") -if not status_ok then - return -end - -local dashboard = require("alpha.themes.dashboard") -dashboard.section.header.val = { - [[ __ ]], - [[ ___ ___ ___ __ __ /\_\ ___ ___ ]], - [[ / _ `\ / __`\ / __`\/\ \/\ \\/\ \ / __` __`\ ]], - [[/\ \/\ \/\ __//\ \_\ \ \ \_/ |\ \ \/\ \/\ \/\ \ ]], - [[\ \_\ \_\ \____\ \____/\ \___/ \ \_\ \_\ \_\ \_\]], - [[ \/_/\/_/\/____/\/___/ \/__/ \/_/\/_/\/_/\/_/]], -} -dashboard.section.buttons.val = { - dashboard.button("f", " Find file", ":Telescope find_files "), - dashboard.button("e", " New file", ":ene startinsert "), - dashboard.button("p", " Find project", ":Telescope projects "), - dashboard.button("r", " Recently used files", ":Telescope oldfiles "), - dashboard.button("t", "󱎸 Find text", ":Telescope live_grep "), - dashboard.button("c", " Configuration", ":e $MYVIMRC "), - dashboard.button("q", " Quit Neovim", ":qa"), -} - -local function footer() --- NOTE: requires the fortune-mod package to work - -- local handle = io.popen("fortune") - -- local fortune = handle:read("*a") - -- handle:close() - -- return fortune - return "cuqmbr's config" -end - -dashboard.section.footer.val = footer() - -dashboard.section.footer.opts.hl = "Type" -dashboard.section.header.opts.hl = "Include" -dashboard.section.buttons.opts.hl = "Keyword" - -dashboard.opts.opts.noautocmd = true --- vim.cmd([[autocmd User AlphaReady echo 'ready']]) -alpha.setup(dashboard.opts) diff --git a/lua/user/autocommands.lua b/lua/user/autocommands.lua deleted file mode 100644 index c438738..0000000 --- a/lua/user/autocommands.lua +++ /dev/null @@ -1,37 +0,0 @@ -vim.cmd [[ - augroup _general_settings - autocmd! - autocmd FileType qf,help,man,lspinfo nnoremap q :close - autocmd TextYankPost * silent!lua require('vim.highlight').on_yank({higroup = 'Visual', timeout = 200}) - autocmd BufWinEnter * :set formatoptions-=cro - autocmd FileType qf set nobuflisted - augroup end - - augroup _git - autocmd! - autocmd FileType gitcommit setlocal wrap - autocmd FileType gitcommit setlocal spell - augroup end - - augroup _markdown - autocmd! - autocmd FileType markdown setlocal wrap - autocmd FileType markdown setlocal spell - augroup end - - augroup _auto_resize - autocmd! - autocmd VimResized * tabdo wincmd = - augroup end - - augroup _alpha - autocmd! - autocmd User AlphaReady set showtabline=0 | autocmd BufUnload set showtabline=2 - augroup end -]] - --- Autoformat --- augroup _lsp --- autocmd! --- autocmd BufWritePre * lua vim.lsp.buf.formatting() --- augroup end diff --git a/lua/user/autopairs.lua b/lua/user/autopairs.lua deleted file mode 100644 index 577e571..0000000 --- a/lua/user/autopairs.lua +++ /dev/null @@ -1,33 +0,0 @@ --- Setup nvim-cmp. -local status_ok, npairs = pcall(require, "nvim-autopairs") -if not status_ok then - return -end - -npairs.setup { - check_ts = true, - ts_config = { - lua = { "string", "source" }, - javascript = { "string", "template_string" }, - java = false, - }, - disable_filetype = { "TelescopePrompt", "spectre_panel" }, - fast_wrap = { - map = "", - chars = { "{", "[", "(", '"', "'" }, - pattern = string.gsub([[ [%'%"%)%>%]%)%}%,] ]], "%s+", ""), - offset = 0, -- Offset from pattern match - end_key = "$", - keys = "qwertyuiopzxcvbnmasdfghjkl", - check_comma = true, - highlight = "PmenuSel", - highlight_grey = "LineNr", - }, -} - -local cmp_autopairs = require "nvim-autopairs.completion.cmp" -local cmp_status_ok, cmp = pcall(require, "cmp") -if not cmp_status_ok then - return -end -cmp.event:on("confirm_done", cmp_autopairs.on_confirm_done { map_char = { tex = "" } }) diff --git a/lua/user/bufferline.lua b/lua/user/bufferline.lua deleted file mode 100644 index a5756d8..0000000 --- a/lua/user/bufferline.lua +++ /dev/null @@ -1,159 +0,0 @@ -local status_ok, bufferline = pcall(require, "bufferline") -if not status_ok then - return -end - -bufferline.setup { - options = { - numbers = "none", -- | "ordinal" | "buffer_id" | "both" | function({ ordinal, id, lower, raise }): string, - close_command = "Bdelete! %d", -- can be a string | function, see "Mouse actions" - right_mouse_command = "Bdelete! %d", -- can be a string | function, see "Mouse actions" - left_mouse_command = "buffer %d", -- can be a string | function, see "Mouse actions" - middle_mouse_command = nil, -- can be a string | function, see "Mouse actions" - -- NOTE: this plugin is designed with this icon in mind, - -- and so changing this is NOT recommended, this is intended - -- as an escape hatch for people who cannot bear it for whatever reason - indicator_icon = nil, - indicator = { style = "icon", icon = "▎"}, - buffer_close_icon = '', - modified_icon = "●", - close_icon = "", - left_trunc_marker = "", - right_trunc_marker = "", - --- name_formatter can be used to change the buffer's label in the bufferline. - --- Please note some names can/will break the - --- bufferline so use this at your discretion knowing that it has - --- some limitations that will *NOT* be fixed. - -- name_formatter = function(buf) -- buf contains a "name", "path" and "bufnr" - -- -- remove extension from markdown files for example - -- if buf.name:match('%.md') then - -- return vim.fn.fnamemodify(buf.name, ':t:r') - -- end - -- end, - max_name_length = 30, - max_prefix_length = 30, -- prefix used when a buffer is de-duplicated - tab_size = 21, - diagnostics = false, -- | "nvim_lsp" | "coc", - diagnostics_update_in_insert = false, - -- diagnostics_indicator = function(count, level, diagnostics_dict, context) - -- return "("..count..")" - -- end, - -- NOTE: this will be called a lot so don't do any heavy processing here - -- custom_filter = function(buf_number) - -- -- filter out filetypes you don't want to see - -- if vim.bo[buf_number].filetype ~= "" then - -- return true - -- end - -- -- filter out by buffer name - -- if vim.fn.bufname(buf_number) ~= "" then - -- return true - -- end - -- -- filter out based on arbitrary rules - -- -- e.g. filter out vim wiki buffer from tabline in your work repo - -- if vim.fn.getcwd() == "" and vim.bo[buf_number].filetype ~= "wiki" then - -- return true - -- end - -- end, - offsets = { { filetype = "NvimTree", text = "", padding = 1 } }, - show_buffer_icons = true, - show_buffer_close_icons = true, - show_close_icon = true, - show_tab_indicators = true, - persist_buffer_sort = true, -- whether or not custom sorted buffers should persist - -- can also be a table containing 2 custom separators - -- [focused and unfocused]. eg: { '|', '|' } - separator_style = "thin", -- | "thick" | "thin" | { 'any', 'any' }, - enforce_regular_tabs = true, - always_show_bufferline = true, - -- sort_by = 'id' | 'extension' | 'relative_directory' | 'directory' | 'tabs' | function(buffer_a, buffer_b) - -- -- add custom logic - -- return buffer_a.modified > buffer_b.modified - -- end - }, - highlights = { - fill = { - fg = { attribute = "fg", highlight = "Visual" }, - bg = { attribute = "bg", highlight = "TabLine" } - }, - background = { - fg = { attribute = "fg", highlight = "TabLine" }, - bg = { attribute = "bg", highlight = "TabLine" } - }, - buffer_selected = { - fg = { attribute = "fg", highlight = "TabLine" }, - bg = { attribute = "bg", highlight = "TabLine" } - }, - buffer_visible = { - fg = { attribute = "fg", highlight = "TabLine" }, - bg = { attribute = "bg", highlight = "TabLine" } - }, - close_button = { - fg = { attribute = "fg", highlight = "TabLine" }, - bg = { attribute = "bg", highlight = "TabLine" } - }, - close_button_visible = { - fg = { attribute = "fg", highlight = "TabLine" }, - bg = { attribute = "bg", highlight = "TabLine" } - }, - close_button_selected = { - fg = {attribute = "fg", highlight = "TabLineSel" }, - bg ={attribute = "bg", highlight = "TabLineSel" } - }, - tab_selected = { - fg = { attribute = "fg", highlight = "Normal" }, - bg = { attribute = "bg", highlight = "Normal" } - }, - tab = { - fg = { attribute = "fg", highlight = "TabLine" }, - bg = { attribute = "bg", highlight = "TabLine" } - }, - tab_close = { - fg = { attribute = "fg", highlight = "LspDiagnosticsDefaultError" }, - fg = { attribute = "fg", highlight = "TabLineSel" }, - bg = { attribute = "bg", highlight = "Normal" } - }, - duplicate_selected = { - fg = { attribute = "fg", highlight = "TabLineSel" }, - bg = { attribute = "bg", highlight = "TabLineSel" }, - underline = true, - }, - duplicate_visible = { - fg = { attribute = "fg", highlight = "TabLine" }, - bg = { attribute = "bg", highlight = "TabLine" }, - underline = true, - }, - duplicate = { - fg = { attribute = "fg", highlight = "TabLine" }, - bg = { attribute = "bg", highlight = "TabLine" }, - underline = true, - }, - modified = { - fg = { attribute = "fg", highlight = "TabLine" }, - bg = { attribute = "bg", highlight = "TabLine" } - }, - modified_selected = { - fg = { attribute = "fg", highlight = "Normal" }, - bg = { attribute = "bg", highlight = "Normal" } - }, - modified_visible = { - fg = { attribute = "fg", highlight = "TabLine" }, - bg = { attribute = "bg", highlight = "TabLine" } - }, - separator = { - fg = { attribute = "bg", highlight = "TabLine" }, - bg = { attribute = "bg", highlight = "TabLine" } - }, - separator_selected = { - fg = { attribute = "bg", highlight = "Normal" }, - bg = { attribute = "bg", highlight = "Normal" } - }, - separator_visible = { - fg = {attribute="bg", highlight="TabLine" }, - bg = {attribute="bg", highlight="TabLine" } - }, - indicator_selected = { - fg = { attribute = "fg", highlight = "LspDiagnosticsDefaultHint" }, - bg = { attribute = "bg", highlight = "Normal" } - }, - }, -} diff --git a/lua/user/cmp.lua b/lua/user/cmp.lua deleted file mode 100644 index cb5c680..0000000 --- a/lua/user/cmp.lua +++ /dev/null @@ -1,132 +0,0 @@ -local cmp_status_ok, cmp = pcall(require, "cmp") -if not cmp_status_ok then - return -end - -local snip_status_ok, luasnip = pcall(require, "luasnip") -if not snip_status_ok then - return -end - -require("luasnip/loaders/from_vscode").lazy_load() - -local check_backspace = function() - local col = vim.fn.col "." - 1 - return col == 0 or vim.fn.getline("."):sub(col, col):match "%s" -end - -local kind_icons = { - Text = "󰉿", - Method = "󰆧", - Function = "󰊕", - Constructor = "", - Field = " ", - Variable = "󰀫", - Class = "󰠱", - Interface = "", - Module = "", - Property = "󰜢", - Unit = "󰑭", - Value = "󰎠", - Enum = "", - Keyword = "󰌋", - Snippet = "", - Color = "󰏘", - File = "󰈙", - Reference = "", - Folder = "󰉋", - EnumMember = "", - Constant = "󰏿", - Struct = "", - Event = "", - Operator = "󰆕", - TypeParameter = " ", - Misc = " ", -} --- find more here: https://www.nerdfonts.com/cheat-sheet - -cmp.setup { - snippet = { - expand = function(args) - luasnip.lsp_expand(args.body) -- For `luasnip` users. - end, - }, - mapping = { - [""] = cmp.mapping.select_prev_item(), - [""] = cmp.mapping.select_next_item(), - [""] = cmp.mapping(cmp.mapping.scroll_docs(-1), { "i", "c" }), - [""] = cmp.mapping(cmp.mapping.scroll_docs(1), { "i", "c" }), - [""] = cmp.mapping(cmp.mapping.complete(), { "i", "c" }), - [""] = cmp.config.disable, -- Specify `cmp.config.disable` if you want to remove the default `` mapping. - [""] = cmp.mapping { - i = cmp.mapping.abort(), - c = cmp.mapping.close(), - }, - -- Accept currently selected item. If none selected, `select` first item. - -- Set `select` to `false` to only confirm explicitly selected items. - [""] = cmp.mapping.confirm { select = true }, - [""] = cmp.mapping(function(fallback) - if cmp.visible() then - cmp.select_next_item() - elseif luasnip.expandable() then - luasnip.expand() - elseif luasnip.expand_or_jumpable() then - luasnip.expand_or_jump() - elseif check_backspace() then - fallback() - else - fallback() - end - end, { - "i", - "s", - }), - [""] = cmp.mapping(function(fallback) - if cmp.visible() then - cmp.select_prev_item() - elseif luasnip.jumpable(-1) then - luasnip.jump(-1) - else - fallback() - end - end, { - "i", - "s", - }), - }, - formatting = { - fields = { "kind", "abbr", "menu" }, - format = function(entry, vim_item) - -- Kind icons - vim_item.kind = string.format("%s", kind_icons[vim_item.kind]) - -- vim_item.kind = string.format('%s %s', kind_icons[vim_item.kind], vim_item.kind) -- This concatonates the icons with the name of the item kind - vim_item.menu = ({ - nvim_lsp = "[LSP]", - luasnip = "[Snippet]", - buffer = "[Buffer]", - path = "[Path]", - })[entry.source.name] - return vim_item - end, - }, - sources = { - { name = "nvim_lsp" }, - { name = "nvim_lsp_signature_help" }, - { name = "luasnip" }, - { name = "buffer" }, - { name = "path" }, - }, - confirm_opts = { - behavior = cmp.ConfirmBehavior.Replace, - select = false, - }, - window = { - documentation = { - border = { "╭", "─", "╮", "│", "╯", "─", "╰", "│" }, - }, - }, - experimental = { - ghost_text = true, - native_menu = false, - }, -} diff --git a/lua/user/colorscheme.lua b/lua/user/colorscheme.lua deleted file mode 100644 index 837a901..0000000 --- a/lua/user/colorscheme.lua +++ /dev/null @@ -1,19 +0,0 @@ -local colorscheme = "vscode" - -local vim_cmd_status_ok, _ = pcall(vim.cmd, "colorscheme " .. colorscheme) -if not vim_cmd_status_ok then - return -end - -local vscode_status_ok, vscode_theme = pcall(require, "vscode") -if not vscode_status_ok then - return -end - -vscode_theme.setup { - style = "dark", -- Alternatively set style in setup - transparent = false, -- Enable transparent background - italic_comments = true, -- Enable italic comment - disable_nvimtree_bg = false, -- Disable nvim-tree background color -} -vscode_theme.load() diff --git a/lua/user/comment.lua b/lua/user/comment.lua deleted file mode 100644 index 2c1c217..0000000 --- a/lua/user/comment.lua +++ /dev/null @@ -1,8 +0,0 @@ -local status_ok, comment = pcall(require, "Comment") -if not status_ok then - return -end - -comment.setup { - pre_hook = require('ts_context_commentstring.integrations.comment_nvim').create_pre_hook(), -} diff --git a/lua/user/dap.lua b/lua/user/dap.lua deleted file mode 100644 index e961609..0000000 --- a/lua/user/dap.lua +++ /dev/null @@ -1,81 +0,0 @@ -local dap_status_ok, dap = pcall(require, "dap") -if not dap_status_ok then - return -end - --- .NET - -dap.adapters.coreclr = { - type = 'executable', - command = 'netcoredbg', - args = {'--interpreter=vscode'} -} - -dap.configurations.cs = { - { - type = "coreclr", - name = "launch - netcoredbg", - request = "launch", - env = { - ASPNETCORE_ENVIRONMENT = "Development", - DOTNET_ENVIRONMENT = "Development" - }, - program = function() - return vim.fn.input('Path to dll ', vim.fn.getcwd(), 'file') - end, - cwd = "${workspaceFolder}/ShoppingAssistantApi.Api", - }, -} - --- Flutter on Dart - -dap.adapters.dart = { - type = "executable", - command = "flutter", - -- This command was introduced upstream in https://github.com/dart-lang/sdk/commit/b68ccc9a - args = {"debug_adapter"} -} - -dap.configurations.dart = { - { - type = "dart", - request = "launch", - name = "Launch Flutter Program", - -- The nvim-dap plugin populates this variable with the filename of the current buffer - program = "${file}", - -- The nvim-dap plugin populates this variable with the editor's current working directory - cwd = "${workspaceFolder}", - -- toolArgs = {"-d", "linux"}, -- Note for Dart apps this is args, for Flutter apps toolArgs - } -} - --- DapUI - -local dapui_status_ok, dapui = pcall(require, "dapui") -if not dapui_status_ok then - return -end - -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 - --- Keymaps - -vim.keymap.set("n", "", ":lua require('dap').continue()") -vim.keymap.set("n", "", ":lua require('dap').step_over()") -vim.keymap.set("n", "", ":lua require('dap').step_into()") -vim.keymap.set("n", "", ":lua require('dap').step_out()") -vim.keymap.set("n", "db", ":lua require('dap').toggle_breakpoint()") -vim.keymap.set("n", "dB", ":lua require('dap').set_breakpoint(vim.fn.input('Breakpoint condition: '))") -vim.keymap.set("n", "lp", ":lua require('dap').set_breakpoint(nil, nil, vim.fn.input('Log point message: '))") -vim.keymap.set("n", "dr", ":lua require('dap').repl.open()") -vim.keymap.set("n", "dl", ":lua require('dap').run_last()") diff --git a/lua/user/gitsigns.lua b/lua/user/gitsigns.lua deleted file mode 100644 index 6d16a2b..0000000 --- a/lua/user/gitsigns.lua +++ /dev/null @@ -1,48 +0,0 @@ -local status_ok, gitsigns = pcall(require, "gitsigns") -if not status_ok then - return -end - -gitsigns.setup { - signs = { - add = { hl = "GitSignsAdd", text = " ", numhl = "GitSignsAddNr", linehl = "GitSignsAddLn" }, - change = { hl = "GitSignsChange", text = " ", numhl = "GitSignsChangeNr", linehl = "GitSignsChangeLn" }, - delete = { hl = "GitSignsDelete", text = " ", numhl = "GitSignsDeleteNr", linehl = "GitSignsDeleteLn" }, - topdelete = { hl = "GitSignsDelete", text = "󱅁 ", numhl = "GitSignsDeleteNr", linehl = "GitSignsDeleteLn" }, - changedelete = { hl = "GitSignsChange", text = "󰍷 ", numhl = "GitSignsChangeNr", linehl = "GitSignsChangeLn" }, - }, - signcolumn = true, -- Toggle with `:Gitsigns toggle_signs` - numhl = false, -- Toggle with `:Gitsigns toggle_numhl` - linehl = false, -- Toggle with `:Gitsigns toggle_linehl` - word_diff = false, -- Toggle with `:Gitsigns toggle_word_diff` - watch_gitdir = { - interval = 1000, - follow_files = true, - }, - attach_to_untracked = true, - current_line_blame = false, -- Toggle with `:Gitsigns toggle_current_line_blame` - current_line_blame_opts = { - virt_text = true, - virt_text_pos = "eol", -- 'eol' | 'overlay' | 'right_align' - delay = 1000, - ignore_whitespace = false, - }, - current_line_blame_formatter_opts = { - relative_time = false, - }, - sign_priority = 6, - update_debounce = 100, - status_formatter = nil, -- Use default - max_file_length = 40000, - preview_config = { - -- Options passed to nvim_open_win - border = "single", - style = "minimal", - relative = "cursor", - row = 0, - col = 1, - }, - yadm = { - enable = false, - }, -} diff --git a/lua/user/impatient.lua b/lua/user/impatient.lua deleted file mode 100644 index 84419e0..0000000 --- a/lua/user/impatient.lua +++ /dev/null @@ -1,6 +0,0 @@ -local status_ok, impatient = pcall(require, "impatient") -if not status_ok then - return -end - -impatient.enable_profile() diff --git a/lua/user/indentline.lua b/lua/user/indentline.lua deleted file mode 100644 index 370dbcc..0000000 --- a/lua/user/indentline.lua +++ /dev/null @@ -1,70 +0,0 @@ -local status_ok, indent_blankline = pcall(require, "ibl") -if not status_ok then - return -end - -vim.g.indent_blankline_buftype_exclude = { "terminal", "nofile" } -vim.g.indent_blankline_filetype_exclude = { - "help", - "startify", - "dashboard", - "packer", - "neogitstatus", - "NvimTree", - "Trouble", -} -vim.g.indentLine_enabled = 1 --- vim.g.indent_blankline_char = "│" -vim.g.indent_blankline_char = "▏" --- vim.g.indent_blankline_char = "▎" -vim.g.indent_blankline_show_trailing_blankline_indent = false -vim.g.indent_blankline_show_first_indent_level = true -vim.g.indent_blankline_use_treesitter = true -vim.g.indent_blankline_show_current_context = true -vim.g.indent_blankline_context_patterns = { - "class", - "return", - "function", - "method", - "^if", - "^while", - "jsx_element", - "^for", - "^object", - "^table", - "block", - "arguments", - "if_statement", - "else_clause", - "jsx_element", - "jsx_self_closing_element", - "try_statement", - "catch_clause", - "import_statement", - "operation_type", -} --- HACK: work-around for https://github.com/lukas-reineke/indent-blankline.nvim/issues/59 -vim.wo.colorcolumn = "99999" - --- vim.cmd [[highlight IndentBlanklineIndent1 guifg=#E06C75 gui=nocombine]] --- vim.cmd [[highlight IndentBlanklineIndent2 guifg=#E5C07B gui=nocombine]] --- vim.cmd [[highlight IndentBlanklineIndent3 guifg=#98C379 gui=nocombine]] --- vim.cmd [[highlight IndentBlanklineIndent4 guifg=#56B6C2 gui=nocombine]] --- vim.cmd [[highlight IndentBlanklineIndent5 guifg=#61AFEF gui=nocombine]] --- vim.cmd [[highlight IndentBlanklineIndent6 guifg=#C678DD gui=nocombine]] --- vim.opt.list = true --- vim.opt.listchars:append "space:⋅" --- vim.opt.listchars:append "space:" --- vim.opt.listchars:append "eol:↴" - -indent_blankline.setup({ - -- show_end_of_line = true, - -- space_char_blankline = " ", - -- show_current_context = true, - -- show_current_context_start = true, - -- char_highlight_list = { - -- "IndentBlanklineIndent1", - -- "IndentBlanklineIndent2", - -- "IndentBlanklineIndent3", - -- }, -}) diff --git a/lua/user/lsp/handlers.lua b/lua/user/lsp/handlers.lua deleted file mode 100644 index d88eaea..0000000 --- a/lua/user/lsp/handlers.lua +++ /dev/null @@ -1,161 +0,0 @@ -local M = {} - -local status_cmp_ok, cmp_nvim_lsp = pcall(require, "cmp_nvim_lsp") -if not status_cmp_ok then - return -end - -M.capabilities = vim.lsp.protocol.make_client_capabilities() -M.capabilities.textDocument.completion.completionItem.snippetSupport = true -M.capabilities = cmp_nvim_lsp.default_capabilities(M.capabilities) -M.capabilities.offsetEncoding = 'utf-16' - -M.setup = function() - local signs = { - { name = "DiagnosticSignError", text = "" }, - { name = "DiagnosticSignWarn", text = "" }, - { name = "DiagnosticSignHint", text = "" }, - { name = "DiagnosticSignInfo", text = "" }, - } - - for _, sign in ipairs(signs) do - vim.fn.sign_define(sign.name, { texthl = sign.name, text = sign.text, numhl = "" }) - end - - local config = { - virtual_text = false, -- disable virtual text - signs = { - active = signs, -- show signs - }, - update_in_insert = true, - underline = true, - severity_sort = true, - float = { - focusable = true, - style = "minimal", - border = "rounded", - source = "always", - header = "", - prefix = "", - }, - } - - vim.diagnostic.config(config) - - vim.lsp.handlers["textDocument/hover"] = vim.lsp.with(vim.lsp.handlers.hover, { - border = "rounded", - }) - - vim.lsp.handlers["textDocument/signatureHelp"] = vim.lsp.with(vim.lsp.handlers.signature_help, { - border = "rounded", - }) -end - -local function lsp_keymaps(bufnr) - local opts = { noremap = true, silent = true } - local keymap = vim.api.nvim_buf_set_keymap - keymap(bufnr, "n", "gD", "lua vim.lsp.buf.declaration()", opts) - keymap(bufnr, "n", "gd", "lua vim.lsp.buf.definition()", opts) - keymap(bufnr, "n", "K", "lua vim.lsp.buf.hover()", opts) - keymap(bufnr, "n", "gI", "lua vim.lsp.buf.implementation()", opts) - keymap(bufnr, "n", "gr", "lua vim.lsp.buf.references()", opts) - keymap(bufnr, "n", "gl", "lua vim.diagnostic.open_float()", opts) - keymap(bufnr, "n", "lf", "lua vim.lsp.buf.format{ async = true }", opts) - keymap(bufnr, "n", "li", "LspInfo", opts) - keymap(bufnr, "n", "lI", "LspInstallInfo", opts) - keymap(bufnr, "n", "la", "lua vim.lsp.buf.code_action()", opts) - keymap(bufnr, "n", "lj", "lua vim.diagnostic.goto_next({buffer=0})", opts) - keymap(bufnr, "n", "lk", "lua vim.diagnostic.goto_prev({buffer=0})", opts) - keymap(bufnr, "n", "lr", "lua vim.lsp.buf.rename()", opts) - keymap(bufnr, "n", "ls", "lua vim.lsp.buf.signature_help()", opts) - keymap(bufnr, "n", "lq", "lua vim.diagnostic.setloclist()", opts) -end - -M.on_attach = function(client, bufnr) - - if client.name == "omnisharp" then - client.server_capabilities.semanticTokensProvider = { - full = vim.empty_dict(), - legend = { - tokenModifiers = { "static_symbol" }, - tokenTypes = { - "comment", - "excluded_code", - "identifier", - "keyword", - "keyword_control", - "number", - "operator", - "operator_overloaded", - "preprocessor_keyword", - "string", - "whitespace", - "text", - "static_symbol", - "preprocessor_text", - "punctuation", - "string_verbatim", - "string_escape_character", - "class_name", - "delegate_name", - "enum_name", - "interface_name", - "module_name", - "struct_name", - "type_parameter_name", - "field_name", - "enum_member_name", - "constant_name", - "local_name", - "parameter_name", - "method_name", - "extension_method_name", - "property_name", - "event_name", - "namespace_name", - "label_name", - "xml_doc_comment_attribute_name", - "xml_doc_comment_attribute_quotes", - "xml_doc_comment_attribute_value", - "xml_doc_comment_cdata_section", - "xml_doc_comment_comment", - "xml_doc_comment_delimiter", - "xml_doc_comment_entity_reference", - "xml_doc_comment_name", - "xml_doc_comment_processing_instruction", - "xml_doc_comment_text", - "xml_literal_attribute_name", - "xml_literal_attribute_quotes", - "xml_literal_attribute_value", - "xml_literal_cdata_section", - "xml_literal_comment", - "xml_literal_delimiter", - "xml_literal_embedded_expression", - "xml_literal_entity_reference", - "xml_literal_name", - "xml_literal_processing_instruction", - "xml_literal_text", - "regex_comment", - "regex_character_class", - "regex_anchor", - "regex_quantifier", - "regex_grouping", - "regex_alternation", - "regex_text", - "regex_self_escaped_character", - "regex_other_escape", - }, - }, - range = true, - } - end - - lsp_keymaps(bufnr) - local status_ok, illuminate = pcall(require, "illuminate") - if not status_ok then - return - end - illuminate.on_attach(client) -end - -return M diff --git a/lua/user/lsp/init.lua b/lua/user/lsp/init.lua deleted file mode 100644 index 6eb3f5f..0000000 --- a/lua/user/lsp/init.lua +++ /dev/null @@ -1,8 +0,0 @@ -local status_ok, _ = pcall(require, "lspconfig") -if not status_ok then - return -end - -require("user.lsp.mason") -require("user.lsp.handlers").setup() -require("user.lsp.null-ls") diff --git a/lua/user/lsp/mason.lua b/lua/user/lsp/mason.lua deleted file mode 100644 index 551b2cc..0000000 --- a/lua/user/lsp/mason.lua +++ /dev/null @@ -1,50 +0,0 @@ -local servers = { - "lua_ls", - "omnisharp", - "bashls", - "jdtls", - "clangd", - "dartls", -} - -local settings = { - ui = { - border = "none", - icons = { - package_installed = "◍", - package_pending = "◍", - package_uninstalled = "◍", - }, - }, - log_level = vim.log.levels.INFO, - max_concurrent_installers = 4, -} - -require("mason").setup(settings) -require("mason-lspconfig").setup({ - -- ensure_installed = servers, - -- automatic_installation = true -}) - -local lspconfig_status_ok, lspconfig = pcall(require, "lspconfig") -if not lspconfig_status_ok then - return -end - -local opts = {} - -for _, server in pairs(servers) do - opts = { - on_attach = require("user.lsp.handlers").on_attach, - capabilities = require("user.lsp.handlers").capabilities - } - - server = vim.split(server, "@")[1] - - local require_ok, conf_opts = pcall(require, "user.lsp.settings." .. server) - if require_ok then - opts = vim.tbl_deep_extend("force", conf_opts, opts) - end - - lspconfig[server].setup(opts) -end diff --git a/lua/user/lsp/null-ls.lua b/lua/user/lsp/null-ls.lua deleted file mode 100644 index 8f3e432..0000000 --- a/lua/user/lsp/null-ls.lua +++ /dev/null @@ -1,20 +0,0 @@ --- local null_ls_status_ok, null_ls = pcall(require, "null-ls") --- if not null_ls_status_ok then --- return --- end --- --- -- https://github.com/jose-elias-alvarez/null-ls.nvim/tree/main/lua/null-ls/builtins/formatting --- local formatting = null_ls.builtins.formatting --- -- https://github.com/jose-elias-alvarez/null-ls.nvim/tree/main/lua/null-ls/builtins/diagnostics --- local diagnostics = null_ls.builtins.diagnostics --- --- null_ls.setup({ --- debug = false, --- sources = { --- -- formatting.prettier.with({ extra_args = { "--no-semi", "--single-quote", "--jsx-single-quote" } }), --- -- formatting.black.with({ extra_args = { "--fast" } }), --- -- formatting.stylua, --- -- diagnostics.flake8 --- formatting.astyle --- }, --- }) diff --git a/lua/user/lsp/settings/clangd.lua b/lua/user/lsp/settings/clangd.lua deleted file mode 100644 index 04220c4..0000000 --- a/lua/user/lsp/settings/clangd.lua +++ /dev/null @@ -1,3 +0,0 @@ -return { - -} diff --git a/lua/user/lsp/settings/dartls.lua b/lua/user/lsp/settings/dartls.lua deleted file mode 100644 index 282648a..0000000 --- a/lua/user/lsp/settings/dartls.lua +++ /dev/null @@ -1,3 +0,0 @@ -return { - cmd = { "dart", 'language-server', '--protocol=lsp' }, -} diff --git a/lua/user/lsp/settings/jdtls.lua b/lua/user/lsp/settings/jdtls.lua deleted file mode 100644 index eb553d4..0000000 --- a/lua/user/lsp/settings/jdtls.lua +++ /dev/null @@ -1,3 +0,0 @@ -return { - root_dir = vim.loop.cwd, -} diff --git a/lua/user/lsp/settings/lua_ls.lua b/lua/user/lsp/settings/lua_ls.lua deleted file mode 100644 index 17f0abe..0000000 --- a/lua/user/lsp/settings/lua_ls.lua +++ /dev/null @@ -1,19 +0,0 @@ -return { - settings = { - Lua = { - runtime = { - version = "LuaJIT", -- Tell the language server which version of Lua you"re using (most likely LuaJIT in the case of Neovim) - }, - diagnostics = { - globals = { "vim" }, -- Get the language server to recognize the `vim` global - }, - workspace = { - library = vim.api.nvim_get_runtime_file("", true), -- Make the server aware of Neovim runtime files - }, - -- Do not send telemetry data containing a randomized but unique identifier - telemetry = { - enable = false, - }, - }, - }, -} diff --git a/lua/user/lualine.lua b/lua/user/lualine.lua deleted file mode 100644 index 3318ecd..0000000 --- a/lua/user/lualine.lua +++ /dev/null @@ -1,93 +0,0 @@ -local status_ok, lualine = pcall(require, "lualine") -if not status_ok then - return -end - -local hide_in_width = function() - return vim.fn.winwidth(0) > 80 -end - -local diagnostics = { - "diagnostics", - sources = { "nvim_diagnostic" }, - sections = { "error", "warn" }, - symbols = { error = " ", warn = " " }, - colored = false, - update_in_insert = false, - always_visible = true, -} - -local diff = { - "diff", - colored = false, - symbols = { added = " ", modified = " ", removed = " " }, -- changes diff symbols - cond = hide_in_width -} - -local mode = { - "mode", - fmt = function(str) - return "-- " .. str .. " --" - end, -} - -local filetype = { - "filetype", - icons_enabled = false, - icon = nil, -} - -local branch = { - "branch", - icons_enabled = true, - icon = "", -} - -local location = { - "location", - padding = 0, -} - --- cool function for progress -local progress = function() - local current_line = vim.fn.line(".") - local total_lines = vim.fn.line("$") - local chars = { "__", "▁▁", "▂▂", "▃▃", "▄▄", "▅▅", "▆▆", "▇▇", "██" } - local line_ratio = current_line / total_lines - local index = math.ceil(line_ratio * #chars) - return chars[index] -end - -local spaces = function() - return "spaces: " .. vim.api.nvim_buf_get_option(0, "shiftwidth") -end - -lualine.setup({ - options = { - icons_enabled = true, - theme = "auto", - component_separators = { left = "", right = "" }, - section_separators = { left = "", right = "" }, - disabled_filetypes = { "alpha", "dashboard", "NvimTree", "Outline" }, - always_divide_middle = true, - }, - sections = { - lualine_a = { branch, diagnostics }, - lualine_b = { mode }, - lualine_c = {}, - -- lualine_x = { "encoding", "fileformat", "filetype" }, - lualine_x = { diff, spaces, "encoding", filetype }, - lualine_y = { location }, - lualine_z = { progress }, - }, - inactive_sections = { - lualine_a = {}, - lualine_b = {}, - lualine_c = { "filename" }, - lualine_x = { "location" }, - lualine_y = {}, - lualine_z = {}, - }, - tabline = {}, - extensions = {}, -}) diff --git a/lua/user/nvim-tree.lua b/lua/user/nvim-tree.lua deleted file mode 100644 index c55ae65..0000000 --- a/lua/user/nvim-tree.lua +++ /dev/null @@ -1,130 +0,0 @@ -local status_ok, nvim_tree = pcall(require, "nvim-tree") -if not status_ok then - return -end - --- https://github.com/nvim-tree/nvim-tree.lua/wiki/Migrating-To-on_attach for assistance in migrating. -local function on_attach(bufnr) - local api = require('nvim-tree.api') - - local function opts(desc) - return { desc = 'nvim-tree: ' .. desc, buffer = bufnr, noremap = true, silent = true, nowait = true } - end - - -- Default mappings. Feel free to modify or remove as you wish. - -- - -- BEGIN_DEFAULT_ON_ATTACH - vim.keymap.set('n', '', api.tree.change_root_to_node, opts('CD')) - vim.keymap.set('n', '', api.node.open.replace_tree_buffer, opts('Open: In Place')) - vim.keymap.set('n', '', api.node.show_info_popup, opts('Info')) - vim.keymap.set('n', '', api.fs.rename_sub, opts('Rename: Omit Filename')) - vim.keymap.set('n', '', api.node.open.tab, opts('Open: New Tab')) - vim.keymap.set('n', '', api.node.open.vertical, opts('Open: Vertical Split')) - vim.keymap.set('n', '', api.node.open.horizontal, opts('Open: Horizontal Split')) - vim.keymap.set('n', '', api.node.navigate.parent_close, opts('Close Directory')) - vim.keymap.set('n', '', api.node.open.edit, opts('Open')) - vim.keymap.set('n', '', api.node.open.preview, opts('Open Preview')) - vim.keymap.set('n', '>', api.node.navigate.sibling.next, opts('Next Sibling')) - vim.keymap.set('n', '<', api.node.navigate.sibling.prev, opts('Previous Sibling')) - vim.keymap.set('n', '.', api.node.run.cmd, opts('Run Command')) - vim.keymap.set('n', '-', api.tree.change_root_to_parent, opts('Up')) - vim.keymap.set('n', 'a', api.fs.create, opts('Create')) - vim.keymap.set('n', 'bd', api.marks.bulk.delete, opts('Delete Bookmarked')) - vim.keymap.set('n', 'bmv', api.marks.bulk.move, opts('Move Bookmarked')) - vim.keymap.set('n', 'B', api.tree.toggle_no_buffer_filter, opts('Toggle No Buffer')) - vim.keymap.set('n', 'c', api.fs.copy.node, opts('Copy')) - vim.keymap.set('n', 'C', api.tree.toggle_git_clean_filter, opts('Toggle Git Clean')) - vim.keymap.set('n', '[c', api.node.navigate.git.prev, opts('Prev Git')) - vim.keymap.set('n', ']c', api.node.navigate.git.next, opts('Next Git')) - vim.keymap.set('n', 'd', api.fs.remove, opts('Delete')) - vim.keymap.set('n', 'D', api.fs.trash, opts('Trash')) - vim.keymap.set('n', 'E', api.tree.expand_all, opts('Expand All')) - vim.keymap.set('n', 'e', api.fs.rename_basename, opts('Rename: Basename')) - vim.keymap.set('n', ']e', api.node.navigate.diagnostics.next, opts('Next Diagnostic')) - vim.keymap.set('n', '[e', api.node.navigate.diagnostics.prev, opts('Prev Diagnostic')) - vim.keymap.set('n', 'F', api.live_filter.clear, opts('Clean Filter')) - vim.keymap.set('n', 'f', api.live_filter.start, opts('Filter')) - vim.keymap.set('n', 'g?', api.tree.toggle_help, opts('Help')) - vim.keymap.set('n', 'gy', api.fs.copy.absolute_path, opts('Copy Absolute Path')) - vim.keymap.set('n', 'H', api.tree.toggle_hidden_filter, opts('Toggle Dotfiles')) - vim.keymap.set('n', 'I', api.tree.toggle_gitignore_filter, opts('Toggle Git Ignore')) - vim.keymap.set('n', 'J', api.node.navigate.sibling.last, opts('Last Sibling')) - vim.keymap.set('n', 'K', api.node.navigate.sibling.first, opts('First Sibling')) - vim.keymap.set('n', 'm', api.marks.toggle, opts('Toggle Bookmark')) - vim.keymap.set('n', 'o', api.node.open.edit, opts('Open')) - vim.keymap.set('n', 'O', api.node.open.no_window_picker, opts('Open: No Window Picker')) - vim.keymap.set('n', 'p', api.fs.paste, opts('Paste')) - vim.keymap.set('n', 'P', api.node.navigate.parent, opts('Parent Directory')) - vim.keymap.set('n', 'q', api.tree.close, opts('Close')) - vim.keymap.set('n', 'r', api.fs.rename, opts('Rename')) - vim.keymap.set('n', 'R', api.tree.reload, opts('Refresh')) - vim.keymap.set('n', 's', api.node.run.system, opts('Run System')) - vim.keymap.set('n', 'S', api.tree.search_node, opts('Search')) - vim.keymap.set('n', 'U', api.tree.toggle_custom_filter, opts('Toggle Hidden')) - vim.keymap.set('n', 'W', api.tree.collapse_all, opts('Collapse')) - vim.keymap.set('n', 'x', api.fs.cut, opts('Cut')) - vim.keymap.set('n', 'y', api.fs.copy.filename, opts('Copy Name')) - vim.keymap.set('n', 'Y', api.fs.copy.relative_path, opts('Copy Relative Path')) - vim.keymap.set('n', '<2-LeftMouse>', api.node.open.edit, opts('Open')) - vim.keymap.set('n', '<2-RightMouse>', api.tree.change_root_to_node, opts('CD')) - -- END_DEFAULT_ON_ATTACH - - -- Mappings migrated from view.mappings.list - -- - -- You will need to insert "your code goes here" for any mappings with a custom action_cb - vim.keymap.set('n', 'l', api.node.open.edit, opts('Open')) - vim.keymap.set('n', '', api.node.open.edit, opts('Open')) - vim.keymap.set('n', 'o', api.node.open.edit, opts('Open')) - vim.keymap.set('n', 'h', api.node.navigate.parent_close, opts('Close Directory')) - vim.keymap.set('n', 'v', api.node.open.vertical, opts('Open: Vertical Split')) -end - -nvim_tree.setup { - update_focused_file = { - enable = true, - update_cwd = true, - }, - renderer = { - root_folder_modifier = ":t", - icons = { - glyphs = { - default = "", - symlink = "", - folder = { - arrow_open = "", - arrow_closed = "", - default = "", - open = "", - empty = "", - empty_open = "", - symlink = "", - symlink_open = "", - }, - git = { - unstaged = "", - staged = "S", - unmerged = "", - renamed = "➜", - untracked = "U", - deleted = "", - ignored = "◌", - }, - }, - }, - }, - diagnostics = { - enable = true, - show_on_dirs = true, - icons = { - hint = "", - info = "", - warning = "", - error = "", - }, - }, - view = { - width = 30, - side = "left" - }, - on_attach = on_attach -} diff --git a/lua/user/options.lua b/lua/user/options.lua deleted file mode 100644 index 3dec50b..0000000 --- a/lua/user/options.lua +++ /dev/null @@ -1,51 +0,0 @@ -local options = { - backup = false, -- creates a backup file - clipboard = "unnamedplus", -- allows neovim to access the system clipboard - cmdheight = 1, -- more space in the neovim command line for displaying messages - completeopt = { "menuone", "noselect" }, -- mostly just for cmp - conceallevel = 0, -- so that `` is visible in markdown files - fileencoding = "utf-8", -- the encoding written to a file - hlsearch = true, -- highlight all matches on previous search pattern - ignorecase = true, -- ignore case in search patterns - mouse = "a", -- allow the mouse to be used in neovim - pumheight = 10, -- pop up menu height - showmode = false, -- we don't need to see things like -- INSERT -- anymore - showtabline = 2, -- always show tabs - smartcase = true, -- smart case - smartindent = true, -- make indenting smarter again - splitbelow = true, -- force all horizontal splits to go below current window - splitright = true, -- force all vertical splits to go to the right of current window - swapfile = false, -- creates a swapfile - -- termguicolors = true, -- set term gui colors (most terminals support this) - timeoutlen = 300, -- time to wait for a mapped sequence to complete (in milliseconds) - undofile = true, -- enable persistent undo - updatetime = 300, -- faster completion (4000ms default) - 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 - expandtab = true, -- convert tabs to spaces - shiftwidth = 4, -- the number of spaces inserted for each indentation - tabstop = 4, -- insert 4 spaces for a tab - softtabstop = 4, -- number of spaces a counts for. When 0, feature is off (sts). - cursorline = true, -- highlight the current line - number = true, -- set numbered lines - relativenumber = true, -- set relative numbered lines - numberwidth = 4, -- set number column width to 2 {default 4} - - signcolumn = "yes", -- always show the sign column, otherwise it would shift the text each time - wrap = true, -- display lines as one long line - linebreak = true, -- companion to wrap, don't split words - scrolloff = 8, -- minimal number of screen lines to keep above and below the cursor - sidescrolloff = 8, -- minimal number of screen columns either side of cursor if wrap is `false` - guifont = "monospace:h17", -- the font used in graphical neovim applications - whichwrap = "bs<>[]hl", -- which "horizontal" keys are allowed to travel to prev/next line -} - -for k, v in pairs(options) do - vim.opt[k] = v -end - --- vim.opt.shortmess = "ilmnrx" -- flags to shorten vim messages, see :help 'shortmess' -vim.opt.shortmess:append "c" -- don't give |ins-completion-menu| messages -vim.opt.iskeyword:append "-" -- hyphenated words recognized by searches -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. -vim.opt.runtimepath:remove("/usr/share/vim/vimfiles") -- separate vim plugins from neovim in case vim still in use - diff --git a/lua/user/plugins.lua b/lua/user/plugins.lua deleted file mode 100644 index b1cf9ab..0000000 --- a/lua/user/plugins.lua +++ /dev/null @@ -1,105 +0,0 @@ --- Automatically install packerplug -local ensure_packer = function() - local fn = vim.fn - local install_path = fn.stdpath("data").."/site/pack/packer/start/packer.nvim" - if fn.empty(fn.glob(install_path)) > 0 then - fn.system({ "git", "clone", "--depth", "1", "https://github.com/wbthomason/packer.nvim", install_path }) - print("Installing packer close and reopen Neovim...") - vim.cmd [[packadd packer.nvim]] - return true - end - return false -end - -local packer_bootstrap = ensure_packer() - --- Autocommand that reloads neovim whenever you save the plugins.lua file -vim.cmd([[ - augroup packer_user_config - autocmd! - autocmd BufWritePost plugins.lua source | PackerSync - augroup end -]]) - --- Use a protected call so we don't error out on first use -local status_ok, packer = pcall(require, "packer") -if not status_ok then - return -end - --- Have packer use a popup window -packer.init({ - display = { - open_fn = function() - return require("packer.util").float({ border = "rounded" }) - end, - }, -}) - --- Install your plugins here -return packer.startup(function(use) - use "wbthomason/packer.nvim" -- Have packer manage itself - use "nvim-lua/plenary.nvim" -- Useful lua functions used by lots of plugins - use "windwp/nvim-autopairs" -- Autopairs, integrates with both cmp and treesitter - use "numToStr/Comment.nvim" - use "nvim-tree/nvim-tree.lua" - use "akinsho/bufferline.nvim" - use "moll/vim-bbye" - use { "nvim-lualine/lualine.nvim", requires = { "nvim-tree/nvim-web-devicons" } } - use "akinsho/toggleterm.nvim" - use "ahmedkhalf/project.nvim" - use "lewis6991/impatient.nvim" - use "lukas-reineke/indent-blankline.nvim" - use "goolord/alpha-nvim" - use "folke/which-key.nvim" - use { "iamcco/markdown-preview.nvim", run = function() vim.fn["mkdp#util#install"]() end } - - -- Colorschemes - use "folke/tokyonight.nvim" - use "lunarvim/darkplus.nvim" - use "Mofiqul/vscode.nvim" - - -- Cmp - use "hrsh7th/nvim-cmp" -- The completion plugin - use "hrsh7th/cmp-buffer" -- buffer completions - use "hrsh7th/cmp-path" -- path completions - -- use "hrsh7th/cmp-cmdline" - use "hrsh7th/cmp-nvim-lsp" - use "hrsh7th/cmp-nvim-lsp-signature-help" - use "saadparwaiz1/cmp_luasnip" -- snippet completions - use "hrsh7th/cmp-nvim-lua" - - - -- Snippets - use "L3MON4D3/LuaSnip" --snippet engine - use "rafamadriz/friendly-snippets" -- a bunch of snippets to use - - -- LSP - use "neovim/nvim-lspconfig" -- enable LSP - use "williamboman/mason.nvim" -- simple to use language server installer - use "williamboman/mason-lspconfig.nvim" - use "jose-elias-alvarez/null-ls.nvim" -- for formatters and linters - use "RRethy/vim-illuminate" - - -- DAP - use { "rcarriga/nvim-dap-ui", requires = { "mfussenegger/nvim-dap" } } - - -- Telescope - use "nvim-telescope/telescope.nvim" - - -- Treesitter - use { "nvim-treesitter/nvim-treesitter", requires = { "JoosepAlviste/nvim-ts-context-commentstring", commit = "4d3a68c41a53add8804f471fcc49bb398fe8de08" } } - - -- Git - use "lewis6991/gitsigns.nvim" - - -- Flutter - -- use "neoclide/coc.nvim" - -- use "iamcco/coc-flutter" - - -- Automatically set up your configuration after cloning packer.nvim - -- Put this at the end after all plugins - if packer_bootstrap then - require("packer").sync() - end -end) diff --git a/lua/user/project.lua b/lua/user/project.lua deleted file mode 100644 index 27a1329..0000000 --- a/lua/user/project.lua +++ /dev/null @@ -1,48 +0,0 @@ -local status_ok, project = pcall(require, "project_nvim") -if not status_ok then - return -end -project.setup({ - ---@usage set to false to disable project.nvim. - --- This is on by default since it's currently the expected behavior. - active = true, - - on_config_done = nil, - - ---@usage set to true to disable setting the current-woriking directory - --- Manual mode doesn't automatically change your root directory, so you have - --- the option to manually do so using `:ProjectRoot` command. - manual_mode = false, - - ---@usage Methods of detecting the root directory - --- Allowed values: **"lsp"** uses the native neovim lsp - --- **"pattern"** uses vim-rooter like glob pattern matching. Here - --- order matters: if one is not detected, the other is used as fallback. You - --- can also delete or rearangne the detection methods. - -- detection_methods = { "lsp", "pattern" }, -- NOTE: lsp detection will get annoying with multiple langs in one project - detection_methods = { "pattern" }, - - ---@usage patterns used to detect root dir, when **"pattern"** is in detection_methods - patterns = { ".git", "_darcs", ".hg", ".bzr", ".svn", "Makefile", "package.json" }, - - ---@ Show hidden files in telescope when searching for files in a project - show_hidden = false, - - ---@usage When set to false, you will get a message when project.nvim changes your directory. - -- When set to false, you will get a message when project.nvim changes your directory. - silent_chdir = true, - - ---@usage list of lsp client names to ignore when using **lsp** detection. eg: { "efm", ... } - ignore_lsp = {}, - - ---@type string - ---@usage path to store the project history for use in telescope - datapath = vim.fn.stdpath("data"), -}) - -local tele_status_ok, telescope = pcall(require, "telescope") -if not tele_status_ok then - return -end - -telescope.load_extension('projects') diff --git a/lua/user/telescope.lua b/lua/user/telescope.lua deleted file mode 100644 index 54b83a9..0000000 --- a/lua/user/telescope.lua +++ /dev/null @@ -1,99 +0,0 @@ -local status_ok, telescope = pcall(require, "telescope") -if not status_ok then - return -end - -local actions = require "telescope.actions" - -telescope.setup { - defaults = { - - prompt_prefix = " ", - selection_caret = " ", - path_display = { "smart" }, - - mappings = { - i = { - [""] = actions.cycle_history_next, - [""] = actions.cycle_history_prev, - - [""] = actions.move_selection_next, - [""] = actions.move_selection_previous, - - [""] = actions.close, - - [""] = actions.move_selection_next, - [""] = actions.move_selection_previous, - - [""] = actions.select_default, - [""] = actions.select_horizontal, - [""] = actions.select_vertical, - [""] = actions.select_tab, - - [""] = actions.preview_scrolling_up, - [""] = actions.preview_scrolling_down, - - [""] = actions.results_scrolling_up, - [""] = actions.results_scrolling_down, - - [""] = actions.toggle_selection + actions.move_selection_worse, - [""] = actions.toggle_selection + actions.move_selection_better, - [""] = actions.send_to_qflist + actions.open_qflist, - [""] = actions.send_selected_to_qflist + actions.open_qflist, - [""] = actions.complete_tag, - [""] = actions.which_key, -- keys from pressing - }, - - n = { - [""] = actions.close, - [""] = actions.select_default, - [""] = actions.select_horizontal, - [""] = actions.select_vertical, - [""] = actions.select_tab, - - [""] = actions.toggle_selection + actions.move_selection_worse, - [""] = actions.toggle_selection + actions.move_selection_better, - [""] = actions.send_to_qflist + actions.open_qflist, - [""] = actions.send_selected_to_qflist + actions.open_qflist, - - ["j"] = actions.move_selection_next, - ["k"] = actions.move_selection_previous, - ["H"] = actions.move_to_top, - ["M"] = actions.move_to_middle, - ["L"] = actions.move_to_bottom, - - [""] = actions.move_selection_next, - [""] = actions.move_selection_previous, - ["gg"] = actions.move_to_top, - ["G"] = actions.move_to_bottom, - - [""] = actions.preview_scrolling_up, - [""] = actions.preview_scrolling_down, - - [""] = actions.results_scrolling_up, - [""] = actions.results_scrolling_down, - - ["?"] = actions.which_key, - }, - }, - }, - pickers = { - -- Default configuration for builtin pickers goes here: - -- picker_name = { - -- picker_config_key = value, - -- ... - -- } - -- Now the picker_config_key will be applied every time you call this - -- builtin picker - planets = { - show_pluto = true, - }, - }, - extensions = { - -- Your extension configuration goes here: - -- extension_name = { - -- extension_config_key = value, - -- } - -- please take a look at the readme of the extension you want to configure - }, -} diff --git a/lua/user/toggleterm.lua b/lua/user/toggleterm.lua deleted file mode 100644 index 1678b57..0000000 --- a/lua/user/toggleterm.lua +++ /dev/null @@ -1,70 +0,0 @@ -local status_ok, toggleterm = pcall(require, "toggleterm") -if not status_ok then - return -end - -toggleterm.setup({ - size = 20, - open_mapping = [[]], - hide_numbers = true, - shade_filetypes = {}, - shade_terminals = true, - shading_factor = 2, - start_in_insert = true, - insert_mappings = true, - persist_size = true, - direction = "horizontal", - close_on_exit = true, - shell = vim.o.shell, - float_opts = { - border = "curved", - winblend = 0, - highlights = { - border = "Normal", - background = "Normal", - }, - }, -}) - -function _G.set_terminal_keymaps() - local opts = {noremap = true} - vim.api.nvim_buf_set_keymap(0, 't', '', [[]], opts) - vim.api.nvim_buf_set_keymap(0, 't', 'jk', [[]], opts) - vim.api.nvim_buf_set_keymap(0, 't', '', [[h]], opts) - vim.api.nvim_buf_set_keymap(0, 't', '', [[j]], opts) - vim.api.nvim_buf_set_keymap(0, 't', '', [[k]], opts) - vim.api.nvim_buf_set_keymap(0, 't', '', [[l]], opts) -end - -vim.cmd('autocmd! TermOpen term://* lua set_terminal_keymaps()') - -local Terminal = require("toggleterm.terminal").Terminal -local lazygit = Terminal:new({ cmd = "lazygit", hidden = true }) - -function _LAZYGIT_TOGGLE() - lazygit:toggle() -end - -local node = Terminal:new({ cmd = "node", hidden = true }) - -function _NODE_TOGGLE() - node:toggle() -end - -local ncdu = Terminal:new({ cmd = "ncdu", hidden = true }) - -function _NCDU_TOGGLE() - ncdu:toggle() -end - -local htop = Terminal:new({ cmd = "htop", hidden = true }) - -function _HTOP_TOGGLE() - htop:toggle() -end - -local python = Terminal:new({ cmd = "python", hidden = true }) - -function _PYTHON_TOGGLE() - python:toggle() -end diff --git a/lua/user/treesitter.lua b/lua/user/treesitter.lua deleted file mode 100644 index 5c071d6..0000000 --- a/lua/user/treesitter.lua +++ /dev/null @@ -1,27 +0,0 @@ -local status_ok, configs = pcall(require, "nvim-treesitter.configs") -if not status_ok then - return -end - -configs.setup { - modules = { "" }, - auto_install = false, - ensure_installed = { "" }, -- put the language you want in this array - ignore_install = { "" }, -- List of parsers to ignore installing - sync_install = false, -- install languages synchronously (only applied to `ensure_installed`) - highlight = { - enable = true, -- false will disable the whole extension - --disable = { "css" }, -- list of language that will be disabled - }, - autopairs = { - enable = true, - }, - indent = { - enable = true, - disable = { "python", "css" } - }, - -- context_commentstring = { - -- enable = true, - -- enable_autocmd = false, - -- } -} diff --git a/lua/user/whichkey.lua b/lua/user/whichkey.lua deleted file mode 100644 index 0832841..0000000 --- a/lua/user/whichkey.lua +++ /dev/null @@ -1,174 +0,0 @@ -local status_ok, which_key = pcall(require, "which-key") -if not status_ok then - return -end - -local setup = { - plugins = { - marks = true, -- shows a list of your marks on ' and ` - registers = true, -- shows your registers on " in NORMAL or in INSERT mode - spelling = { - enabled = true, -- enabling this will show WhichKey when pressing z= to select spelling suggestions - suggestions = 20, -- how many suggestions should be shown in the list? - }, - -- the presets plugin, adds help for a bunch of default keybindings in Neovim - -- No actual key bindings are created - presets = { - operators = false, -- adds help for operators like d, y, ... and registers them for motion / text object completion - motions = true, -- adds help for motions - text_objects = true, -- help for text objects triggered after entering an operator - windows = true, -- default bindings on - nav = true, -- misc bindings to work with windows - z = true, -- bindings for folds, spelling and others prefixed with z - g = true, -- bindings for prefixed with g - }, - }, - -- add operators that will trigger motion and text object completion - -- to enable all native operators, set the preset / operators plugin above - -- operators = { gc = "Comments" }, - key_labels = { - -- override the label used to display some keys. It doesn't effect WK in any other way. - -- For example: - -- [""] = "SPC", - -- [""] = "RET", - -- [""] = "TAB", - }, - icons = { - breadcrumb = "»", -- symbol used in the command line area that shows your active key combo - separator = "➜", -- symbol used between a key and it's label - group = "+", -- symbol prepended to a group - }, - popup_mappings = { - scroll_down = "", -- binding to scroll down inside the popup - scroll_up = "", -- binding to scroll up inside the popup - }, - window = { - border = "rounded", -- none, single, double, shadow - position = "bottom", -- bottom, top - margin = { 1, 0, 1, 0 }, -- extra window margin [top, right, bottom, left] - padding = { 2, 2, 2, 2 }, -- extra window padding [top, right, bottom, left] - winblend = 0, - }, - layout = { - height = { min = 4, max = 25 }, -- min and max height of the columns - width = { min = 20, max = 50 }, -- min and max width of the columns - spacing = 3, -- spacing between columns - align = "left", -- align columns left, center or right - }, - ignore_missing = true, -- enable this to hide mappings for which you didn't specify a label - hidden = { "", "", "", "", "call", "lua", "^:", "^ " }, -- hide mapping boilerplate - show_help = true, -- show help message on the command line when the popup is visible - triggers = "auto", -- automatically setup triggers - -- triggers = {""} -- or specify a list manually - triggers_blacklist = { - -- list of mode / prefixes that should never be hooked by WhichKey - -- this is mostly relevant for key maps that start with a native binding - -- most people should not need to change this - i = { "j", "k" }, - v = { "j", "k" }, - }, -} - -local opts = { - mode = "n", -- NORMAL mode - prefix = "", - buffer = nil, -- Global mappings. Specify a buffer number for buffer local mappings - silent = true, -- use `silent` when creating keymaps - noremap = true, -- use `noremap` when creating keymaps - nowait = true, -- use `nowait` when creating keymaps -} - -local mappings = { - ["a"] = { "Alpha", "Alpha" }, - ["b"] = { - "lua require('telescope.builtin').buffers(require('telescope.themes').get_dropdown{previewer = false})", - "Buffers", - }, - ["e"] = { "NvimTreeToggle", "Explorer" }, - ["w"] = { "w!", "Save" }, - ["q"] = { "q!", "Quit" }, - ["c"] = { "Bdelete!", "Close Buffer" }, - ["h"] = { "nohlsearch", "No Highlight" }, - ["f"] = { - "lua require('telescope.builtin').find_files(require('telescope.themes').get_dropdown{previewer = false})", - "Find files", - }, - ["m"] = { "MarkdownPreviewToggle", "Toggle markdow previewer" }, - ["F"] = { "Telescope live_grep theme=ivy", "Find Text" }, - ["P"] = { "lua require('telescope').extensions.projects.projects()", "Projects" }, - p = { - name = "Packer", - c = { "PackerCompile", "Compile" }, - i = { "PackerInstall", "Install" }, - s = { "PackerSync", "Sync" }, - S = { "PackerStatus", "Status" }, - u = { "PackerUpdate", "Update" }, - }, - g = { - name = "Git", - g = { "lua _LAZYGIT_TOGGLE()", "Lazygit" }, - j = { "lua require('gitsigns').next_hunk()", "Next Hunk" }, - k = { "lua require('gitsigns').prev_hunk()", "Prev Hunk" }, - l = { "lua require('gitsigns').blame_line()", "Blame" }, - p = { "lua require('gitsigns').preview_hunk()", "Preview Hunk" }, - r = { "lua require('gitsigns').reset_hunk()", "Reset Hunk" }, - R = { "lua require('gitsigns').reset_buffer()", "Reset Buffer" }, - s = { "lua require('gitsigns').stage_hunk()", "Stage Hunk" }, - u = { "lua require('gitsigns').undo_stage_hunk()", "Undo Stage Hunk", }, - o = { "Telescope git_status", "Open changed file" }, - b = { "Telescope git_branches", "Checkout branch" }, - c = { "Telescope git_commits", "Checkout commit" }, - d = { "Gitsigns diffthis HEAD", "Diff", }, - }, - l = { - name = "LSP", - a = { "lua vim.lsp.buf.code_action()", "Code Action" }, - d = { "Telescope diagnostics bufnr=0", "Document Diagnostics", }, - w = { "Telescope diagnostics", "Workspace Diagnostics", }, - f = { "lua vim.lsp.buf.format{async=true}", "Format" }, - i = { "LspInfo", "Info" }, - I = { "LspInstallInfo", "Installer Info" }, - j = { "lua vim.lsp.diagnostic.goto_next()", "Next Diagnostic", }, - k = { "lua vim.lsp.diagnostic.goto_prev()", "Prev Diagnostic", }, - l = { "lua vim.lsp.codelens.run()", "CodeLens Action" }, - q = { "lua vim.diagnostic.setloclist()", "Quickfix" }, - r = { "lua vim.lsp.buf.rename()", "Rename" }, - s = { "Telescope lsp_document_symbols", "Document Symbols" }, - S = { "Telescope lsp_dynamic_workspace_symbols", "Workspace Symbols", }, - }, - s = { - name = "Search", - b = { "Telescope git_branches", "Checkout branch" }, - c = { "Telescope colorscheme", "Colorscheme" }, - h = { "Telescope help_tags", "Find Help" }, - M = { "Telescope man_pages", "Man Pages" }, - r = { "Telescope oldfiles", "Open Recent File" }, - R = { "Telescope registers", "Registers" }, - k = { "Telescope keymaps", "Keymaps" }, - C = { "Telescope commands", "Commands" }, - }, - - t = { - name = "Terminal", - n = { "lua _NODE_TOGGLE()", "Node" }, - u = { "lua _NCDU_TOGGLE()", "NCDU" }, - t = { "lua _HTOP_TOGGLE()", "Htop" }, - p = { "lua _PYTHON_TOGGLE()", "Python" }, - f = { "ToggleTerm direction=float", "Float" }, - h = { "ToggleTerm size=10 direction=horizontal", "Horizontal" }, - v = { "ToggleTerm size=80 direction=vertical", "Vertical" }, - }, - d = { - name = "Debugging", - c = { "lua require('dap').continue()", "Start/Continue (F5)" }, - o = { "lua require('dap').step_over()", "Step Over (F10)" }, - ["["] = { "lua require('dap').step_out()", "Step Out (F12)" }, - ["]"] = { "lua require('dap').step_into()", "Step Into (F11)" }, - b = { "lua require('dap').toggle_breakpoint()", "Toggle Braekpoint" }, - B = { "lua require('dap').set_breakpoint(vim.fn.input('Breakpoint condition: '))", "Set Breakpoint with Condition" }, - u = { "lua require('dapui').toggle()", "Toggle UI" } - } -} - -which_key.setup(setup) -which_key.register(mappings, opts)