From 35a5cf15c595f10759971c92f17f6667b1045a84 Mon Sep 17 00:00:00 2001 From: Michael Housh Date: Thu, 28 Sep 2023 10:26:46 -0400 Subject: [PATCH] Re-arrange neovim config --- nvim/m-housh/init.lua | 10 +- nvim/m-housh/lua/user/mappings.lua | 34 +-- nvim/m-housh/lua/user/plugin-config/cmp.lua | 143 ------------ .../lua/user/plugin-config/diffview.lua | 48 ---- nvim/m-housh/lua/user/plugin-config/init.lua | 146 ------------ nvim/m-housh/lua/user/plugin-config/lsp.lua | 209 ------------------ .../lua/user/plugin-config/lualine.lua | 119 ---------- .../m-housh/lua/user/plugin-config/neogit.lua | 38 ---- .../lua/user/plugin-config/telescope.lua | 78 ------- .../lua/user/plugin-config/treesitter.lua | 75 ------- nvim/m-housh/lua/user/plugins.lua | 33 +-- 11 files changed, 43 insertions(+), 890 deletions(-) delete mode 100644 nvim/m-housh/lua/user/plugin-config/cmp.lua delete mode 100644 nvim/m-housh/lua/user/plugin-config/diffview.lua delete mode 100644 nvim/m-housh/lua/user/plugin-config/init.lua delete mode 100644 nvim/m-housh/lua/user/plugin-config/lsp.lua delete mode 100644 nvim/m-housh/lua/user/plugin-config/lualine.lua delete mode 100644 nvim/m-housh/lua/user/plugin-config/neogit.lua delete mode 100644 nvim/m-housh/lua/user/plugin-config/telescope.lua delete mode 100644 nvim/m-housh/lua/user/plugin-config/treesitter.lua diff --git a/nvim/m-housh/init.lua b/nvim/m-housh/init.lua index 7100f87..bd49a60 100644 --- a/nvim/m-housh/init.lua +++ b/nvim/m-housh/init.lua @@ -1,6 +1,3 @@ - -require('user.plugins') - -- Key maps require('user.mappings') @@ -10,5 +7,10 @@ require('user.settings') -- Auto commands require('user.autocmd') --- Theme +-- Plugins +require('user.plugins') + +-- Theme (must stay after plugins are loaded) require('user.theme') + + diff --git a/nvim/m-housh/lua/user/mappings.lua b/nvim/m-housh/lua/user/mappings.lua index 1e44978..954f681 100644 --- a/nvim/m-housh/lua/user/mappings.lua +++ b/nvim/m-housh/lua/user/mappings.lua @@ -31,32 +31,32 @@ keymap("x", "J", ":move '>+1gv-gv", default_options) keymap("n", "", ":Neotree toggle", default_options) -- LuaSnip Keymaps -local ls = require('luasnip') +--local ls = require('luasnip') -- to expand snippets. -- This will expand the snippet or jump to the next item within the snippet. -vim.keymap.set({ "i", "s" }, "", function() - if ls.expand_or_jumpable() then - ls.expand_or_jump() - end -end, { silent = true }) +-- vim.keymap.set({ "i", "s" }, "", function() +-- if ls.expand_or_jumpable() then +-- ls.expand_or_jump() +-- end +-- end, { silent = true }) -- -- This will jump backwards in the snippet. -vim.keymap.set({ "i", "s" }, "", function() - if ls.jumpable(-1) then - ls.jump(-1) - end -end, { silent = true }) +-- vim.keymap.set({ "i", "s" }, "", function() +-- if ls.jumpable(-1) then +-- ls.jump(-1) +-- end +-- end, { silent = true }) -- -- This is for selecting withing a list of options. -vim.keymap.set("i", "", function() - if ls.choice_active() then - ls.change_choice(1) - end -end, { silent = true }) +-- vim.keymap.set("i", "", function() +-- if ls.choice_active() then +-- ls.change_choice(1) +-- end +-- end, { silent = true }) -- Reload the snippets. -vim.keymap.set("n", "s", "source ~/.config/m-housh/lua/snippets/init.lua") +--vim.keymap.set("n", "s", "source ~/.config/m-housh/lua/snippets/init.lua") diff --git a/nvim/m-housh/lua/user/plugin-config/cmp.lua b/nvim/m-housh/lua/user/plugin-config/cmp.lua deleted file mode 100644 index 691df05..0000000 --- a/nvim/m-housh/lua/user/plugin-config/cmp.lua +++ /dev/null @@ -1,143 +0,0 @@ -return { - "hrsh7th/nvim-cmp", - enabled = true, - dependencies = { - "hrsh7th/cmp-nvim-lsp", - "hrsh7th/cmp-buffer", - "hrsh7th/cmp-path", - "hrsh7th/cmp-cmdline", - --"hrsh7th/cmp-vsnip", - "saadparwaiz1/cmp_luasnip", - "f3fora/cmp-spell", - "hrsh7th/cmp-calc", - "hrsh7th/cmp-emoji" - }, - config = function() - -- Setup nvim-cmp. - local cmp = require "cmp" - local lspkind = require("lspkind") - local capabilities = require('cmp_nvim_lsp').default_capabilities() - local luasnip = require('luasnip') - - local has_words_before = function() - local line, col = unpack(vim.api.nvim_win_get_cursor(0)) - return col ~= 0 - and vim.api.nvim_buf_get_lines(0, line - 1, line, true)[1]:sub( - col, col):match("%s") == nil - end - - local feedkey = function(key, mode) - vim.api.nvim_feedkeys(vim.api.nvim_replace_termcodes(key, true, true, true), - mode, true) - end - - - require('lspconfig').sourcekit.setup { - capabilities = capabilities - } - - lspkind.init({ - symbol_map = { - - 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 = "" - } - }) - - cmp.setup({ - formatting = { - format = lspkind.cmp_format { - with_text = false, - maxwidth = 50, - menu = { - buffer = "BUF", - nvim_lsp = "LSP", - path = "PATH", - vsnip = "SNIP", - calc = "CALC", - spell = "SPELL", - emoji = "EMOJI" - } - } - }, - experimental = {native_menu = false, ghost_text = false}, - snippet = { - expand = function(args) - require('luasnip').lsp_expand(args.body) - end - }, - mapping = { - [""] = cmp.mapping.select_prev_item(), - [""] = cmp.mapping.select_next_item(), - [""] = cmp.mapping.scroll_docs(-4), - [""] = cmp.mapping.scroll_docs(4), - [""] = cmp.mapping.complete(), - [""] = cmp.mapping.close(), - [""] = cmp.mapping.confirm { - behavior = cmp.ConfirmBehavior.Replace, - select = false - }, - [""] = 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 has_words_before() then - cmp.complete() - else - fallback() - end - end, {"i", "s"}), - [""] = cmp.mapping(function() - if cmp.visible() then - cmp.select_prev_item() - elseif vim.fn["vsnip#jumpable"](-1) == 1 then - feedkey("(vsnip-jump-prev)", "") - end - end, {"i", "s"}) - }, - sources = { - {name = "nvim_lsp"}, - {name = "buffer", keyword_length = 5}, - {name = 'luasnip', option = { show_autosnippets = true } }, - {name = "calc"}, - {name = "emoji"}, - {name = "spell"}, - {name = "path"} - } - }) - - -- Use buffer source for `/`. - cmp.setup.cmdline("/", {sources = {{name = "buffer"}}}) - - -- Use cmdline & path source for ':'. - cmp.setup.cmdline(":", { - sources = cmp.config.sources({{name = "path"}}, {{name = "cmdline"}}) - }) - end - } diff --git a/nvim/m-housh/lua/user/plugin-config/diffview.lua b/nvim/m-housh/lua/user/plugin-config/diffview.lua deleted file mode 100644 index fe54e53..0000000 --- a/nvim/m-housh/lua/user/plugin-config/diffview.lua +++ /dev/null @@ -1,48 +0,0 @@ -return { - "sindrets/diffview.nvim", - cmd = { - "DiffviewOpen", - "DiffviewClose", - "DiffviewToggleFiles", - "DiffviewFocusFiles" - }, - config = function() - local cb = require('diffview.config').diffview_callback - - require('diffview').setup { - diff_binaries = false, -- Show diffs for binaries - use_icons = true, -- Requires nvim-web-devicons - file_panel = { - width = 35, - }, - key_bindings = { - disable_defaults = false, -- Disable the default key bindings - -- The `view` bindings are active in the diff buffers, only when the current - -- tabpage is a Diffview. - view = { - [""] = cb("select_next_entry"), -- Open the diff for the next file - [""] = cb("select_prev_entry"), -- Open the diff for the previous file - ["e"] = cb("focus_files"), -- Bring focus to the files panel - ["b"] = cb("toggle_files"), -- Toggle the files panel. - }, - file_panel = { - ["j"] = cb("next_entry"), -- Bring the cursor to the next file entry - [""] = cb("next_entry"), - ["k"] = cb("prev_entry"), -- Bring the cursor to the previous file entry. - [""] = cb("prev_entry"), - [""] = cb("select_entry"), -- Open the diff for the selected entry. - ["o"] = cb("select_entry"), - ["<2-LeftMouse>"] = cb("select_entry"), - ["-"] = cb("toggle_stage_entry"), -- Stage / unstage the selected entry. - ["S"] = cb("stage_all"), -- Stage all entries. - ["U"] = cb("unstage_all"), -- Unstage all entries. - ["R"] = cb("refresh_files"), -- Update stats and entries in the file list. - [""] = cb("select_next_entry"), - [""] = cb("select_prev_entry"), - ["e"] = cb("focus_files"), - ["b"] = cb("toggle_files"), - } - } - } - end -} diff --git a/nvim/m-housh/lua/user/plugin-config/init.lua b/nvim/m-housh/lua/user/plugin-config/init.lua deleted file mode 100644 index fb895b7..0000000 --- a/nvim/m-housh/lua/user/plugin-config/init.lua +++ /dev/null @@ -1,146 +0,0 @@ --- This file contains plugin's that don't require much configuration. -return { - { - "L3MON4D3/LuaSnip", - version = "2.*", - build = "make install_jsregexp", - config = function() - local luasnip = require('luasnip') - local types = require('luasnip.util.types') - luasnip.config.set_config { - history = true, - updateevents = "TextChanged,TextChangedI", - enable_autosnippets = true, - ext_opts = { - [types.choiceNode] = { - active = { - virt_text = { { "<-", "Error" } }, - }, - }, - }, - } - end - }, - { - 'EdenEast/nightfox.nvim', - lazy = false, -- make sure we load this during startup - priority = 1000, -- make sure to load this before all other plugins. - opts = { - fox = "terafox", -- change the colorscheme to use terafox - styles = { - comments = "italic", -- change style of comments to be italic - keywords = "bold", -- change style of keywords to be bold - functions = "italic,bold" -- styles can be a comma separated list - }, - inverse = { - match_paren = true, -- inverse the highlighting of match_parens - }, - colors = { - red = "#FF000", -- Override the red color for MAX POWER - --bg_alt = "#000000", - }, - hlgroups = { - TSPunctDelimiter = { fg = "${red}" }, -- Override a highlight group with the color red - LspCodeLens = { bg = "#000000", style = "italic" }, - } - - }, - config = function() - require('nightfox').load() - vim.cmd("colorscheme terafox") - end - }, - { - "hrsh7th/vim-vsnip", - config = function() - vim.g.vsnip_snippet_dir = os.getenv('HOME') .. '/.config/m-housh/lua/snippets/' - end - }, - { - "folke/which-key.nvim", - event = "VeryLazy", - init = function() - vim.o.timeout = true - vim.o.timeoutlen = 300 - end, - }, - { - 'akinsho/toggleterm.nvim', - enable = true, - opts = { - size = 20, - open_mapping = [[]], - hide_numbers = true, - shade_terminals = true, - shading_factor = 2, - start_in_insert = true, - insert_mappings = true, - persist_size = true, - direction = "float", - close_on_exit = true, - shell = vim.o.shell, - float_opts = { - border = "curved", - winblend = 0, - highlights = { - border = "Normal", - background = "Normal", - }, - }, - } - }, - { - "nvim-neo-tree/neo-tree.nvim", - branch = "v3.x", - dependencies = { - "nvim-lua/plenary.nvim", - "nvim-tree/nvim-web-devicons", -- not strictly required, but recommended - "MunifTanjim/nui.nvim", - }, - opts = { - close_if_last_window = false, - enable_git_status = true, - enable_diagnostics = true, - filesystem = { - filtered_items = { - hide_dotfiles = false - }, - use_libuv_file_watcher = true - }, - } - }, - { - 'm-housh/swift.nvim', - dependencies = { - 'akinsho/toggleterm.nvim' - }, - config = function() - require('swift').setup() - local default_options = { noremap = true, silent = true } - local actions = require('swift.actions') - - vim.keymap.set('n', '', actions.build, default_options) - vim.keymap.set('n', '', actions.test, default_options) - end - }, - { - "andrewferrier/wrapping.nvim", - opts = { - auto_set_mode_filetype_allowlist = { - "asciidoc", - "gitcommit", - "latex", - "markdown", - "tex", - "text" - }, - }, - config = function() - require("wrapping").setup({ - softener = { - markdown = 1.3 - }, - }) - end - }, -} diff --git a/nvim/m-housh/lua/user/plugin-config/lsp.lua b/nvim/m-housh/lua/user/plugin-config/lsp.lua deleted file mode 100644 index 6d86fad..0000000 --- a/nvim/m-housh/lua/user/plugin-config/lsp.lua +++ /dev/null @@ -1,209 +0,0 @@ -return { - { - "williamboman/nvim-lsp-installer", - config = function() - require("nvim-lsp-installer").setup() - end - }, - { - "williamboman/mason-lspconfig.nvim", - dependencies = { - "williamboman/mason.nvim", - "onsails/lspkind-nvim", - "famiu/bufdelete.nvim", - "ray-x/lsp_signature.nvim", - "neovim/nvim-lspconfig" - }, - opts = { - ensure_installed = { - "bashls", - "clangd", - "dockerls", - "gopls", - "jsonls", - "jedi_language_server", - "lua_ls", - "marksman", - "terraformls", - "tsserver", - "texlab", - "yamlls", - } - } - }, - { - "neovim/nvim-lspconfig", - dependencies = { - "hrsh7th/cmp-nvim-lsp", - }, - config = function() - require("mason").setup() - require("mason-lspconfig").setup() - local nvim_lsp = require("lspconfig") - - -- Use an on_attach function to only map the following keys - -- after the language server attaches to the current buffer - local on_attach = function(bufnr) - local function buf_set_keymap(...) - vim.api.nvim_buf_set_keymap(bufnr, ...) - end - - -- Mappings. - local opts = {noremap = true, silent = true} - - -- See `:help vim.lsp.*` for documentation on any of the below functions - buf_set_keymap("n", "gD", "lua vim.lsp.buf.declaration()", opts) - buf_set_keymap("n", "gd", "lua vim.lsp.buf.definition()", opts) - buf_set_keymap("n", "K", "lua vim.lsp.buf.hover()", opts) - buf_set_keymap("n", "gi", "lua vim.lsp.buf.implementation()", opts) - buf_set_keymap("n", "gT", vim.lsp.buf.type_definition, opts) - -- buf_set_keymap('n', '', 'lua vim.lsp.buf.signature_help()', opts) - buf_set_keymap("n", "wa", - "lua vim.lsp.buf.add_workspace_folder()", opts) - buf_set_keymap("n", "wr", - "lua vim.lsp.buf.remove_workspace_folder()", opts) - buf_set_keymap("n", "wl", - "lua print(vim.inspect(vim.lsp.buf.list_workspace_folders()))", - opts) - buf_set_keymap("n", "D", - "lua vim.lsp.buf.type_definition()", opts) - buf_set_keymap("n", "rn", "lua vim.lsp.buf.rename()", opts) - buf_set_keymap("n", "ca", "lua vim.lsp.buf.code_action()", - opts) - buf_set_keymap("n", "gr", "lua vim.lsp.buf.references()", opts) - buf_set_keymap("n", "e", "lua vim.lsp.diagnostic.show_line_diagnostics()", opts) - buf_set_keymap("n", "[d", "lua vim.lsp.diagnostic.goto_prev()", opts) - - buf_set_keymap("n", "]d", "lua vim.lsp.diagnostic.goto_next()", opts) - buf_set_keymap("n", "q", "lua vim.lsp.diagnostic.set_loclist()", opts) - buf_set_keymap("n", "f", "lua vim.lsp.buf.formatting()", opts) - - end - - -- Use a loop to conveniently call 'setup' on multiple servers and - -- map buffer local keybindings when the language server attaches - --local capabilities = vim.lsp.protocol.make_client_capabilities() - capabilities = require("cmp_nvim_lsp").default_capabilities() - - local servers = { - "bashls", - "clangd", - "dockerls", - "gopls", - "jsonls", - "jedi_language_server", - "lua_ls", - "marksman", - "sourcekit", - "terraformls", - "tsserver", - "texlab", - "yamlls", - } - for _, lsp in ipairs(servers) do - nvim_lsp[lsp].setup { - on_attach = on_attach, - capabilities = capabilities, - settings = { - gopls = {analyses = {unusedparams = false}, staticcheck = true}, - lua_ls = { - Lua = { - workspace = { checkThirdParty = false }, - telemetry = { enable = false }, - } - }, - json = { - format = {enabled = false}, - schemas = { - { - description = "ESLint config", - fileMatch = {".eslintrc.json", ".eslintrc"}, - url = "http://json.schemastore.org/eslintrc" - }, { - description = "Package config", - fileMatch = {"package.json"}, - url = "https://json.schemastore.org/package" - }, { - description = "Packer config", - fileMatch = {"packer.json"}, - url = "https://json.schemastore.org/packer" - }, { - description = "Renovate config", - fileMatch = { - "renovate.json", "renovate.json5", - ".github/renovate.json", ".github/renovate.json5", - ".renovaterc", ".renovaterc.json" - }, - url = "https://docs.renovatebot.com/renovate-schema" - }, { - description = "OpenApi config", - fileMatch = {"*api*.json"}, - url = "https://raw.githubusercontent.com/OAI/OpenAPI-Specification/main/schemas/v3.1/schema.json" - } - } - }, - redhat = {telemetry = {enabled = false}}, - texlab = { - auxDirectory = ".", - bibtexFormatter = "texlab", - build = { - args = { - "--keep-intermediates", "--keep-logs", "--synctex", "%f" - }, - executable = "tectonic", - forwardSearchAfter = false, - onSave = false - }, - chktex = {onEdit = false, onOpenAndSave = false}, - diagnosticsDelay = 300, - formatterLineLength = 80, - forwardSearch = {args = {}}, - latexFormatter = "latexindent", - latexindent = {modifyLineBreaks = false} - }, - yaml = { - schemaStore = { - enable = true, - url = "https://www.schemastore.org/api/json/catalog.json" - }, - schemas = { - kubernetes = "/*.yaml", - ["http://json.schemastore.org/github-workflow"] = ".github/workflows/*.{yml,yaml}", - ["http://json.schemastore.org/github-action"] = ".github/action.{yml,yaml}", - ["http://json.schemastore.org/ansible-stable-2.9"] = "roles/tasks/*.{yml,yaml}", - ["http://json.schemastore.org/prettierrc"] = ".prettierrc.{yml,yaml}", - ["http://json.schemastore.org/kustomization"] = "kustomization.{yml,yaml}", - ["http://json.schemastore.org/ansible-playbook"] = "*play*.{yml,yaml}", - ["http://json.schemastore.org/chart"] = "Chart.{yml,yaml}", - ["https://json.schemastore.org/dependabot-v2"] = ".github/dependabot.{yml,yaml}", - ["https://json.schemastore.org/gitlab-ci"] = "*gitlab-ci*.{yml,yaml}", - ["https://raw.githubusercontent.com/OAI/OpenAPI-Specification/main/schemas/v3.1/schema.json"] = "*api*.{yml,yaml}", - ["https://raw.githubusercontent.com/compose-spec/compose-spec/master/schema/compose-spec.json"] = "docker-compose.{yml,yaml}", - ["https://raw.githubusercontent.com/argoproj/argo-workflows/master/api/jsonschema/schema.json"] = "*flow*.{yml,yaml}" - }, - format = {enabled = false}, - validate = false, -- TODO: conflicts between Kubernetes resources and kustomization.yaml - completion = true, - hover = true - } - }, - flags = {debounce_text_changes = 150} - } - require"lsp_signature".setup({ - bind = true, -- This is mandatory, otherwise border config won't get registered. - floating_window = true, -- show hint in a floating window, set to false for virtual text only mode - doc_lines = 2, -- Set to 0 for not showing doc - hint_prefix = "🐼 ", - -- use_lspsaga = false, -- set to true if you want to use lspsaga popup - handler_opts = { - border = "shadow" -- double, single, shadow, none - } - }) - end - - -- Test source-kit - require('lspconfig').sourcekit.setup{} - - end - } -} diff --git a/nvim/m-housh/lua/user/plugin-config/lualine.lua b/nvim/m-housh/lua/user/plugin-config/lualine.lua deleted file mode 100644 index a48bf77..0000000 --- a/nvim/m-housh/lua/user/plugin-config/lualine.lua +++ /dev/null @@ -1,119 +0,0 @@ -return { - "nvim-lualine/lualine.nvim", - config = function() - local colors = { - red = '#ca1243', - grey = '#a0a1a7', - black = '#383a42', - white = '#f3f3f3', - light_green = '#83a598', - orange = '#fe8019', - green = '#8ec07c', - } - - local empty = require('lualine.component'):extend() - function empty:draw(default_highlight) - self.status = '' - self.applied_separator = '' - self:apply_highlights(default_highlight) - self:apply_section_separators() - return self.status - end - - -- Put proper separators and gaps between components in sections - local function process_sections(sections) - for name, section in pairs(sections) do - local left = name:sub(9, 10) < 'x' - for pos = 1, name ~= 'lualine_z' and #section or #section - 1 do - table.insert(section, pos * 2, { empty, color = { fg = colors.white, bg = colors.white } }) - end - for id, comp in ipairs(section) do - if type(comp) ~= 'table' then - comp = { comp } - section[id] = comp - end - comp.separator = left and { right = '' } or { left = '' } - end - end - return sections - end - - local function search_result() - if vim.v.hlsearch == 0 then - return '' - end - local last_search = vim.fn.getreg '/' - if not last_search or last_search == '' then - return '' - end - local searchcount = vim.fn.searchcount { maxcount = 9999 } - return last_search .. '(' .. searchcount.current .. '/' .. searchcount.total .. ')' - end - - local function modified() - if vim.bo.modified then - return '+' - elseif vim.bo.modifiable == false or vim.bo.readonly == true then - return '-' - end - return '' - end - - require('lualine').setup { - options = { - theme = 'auto', - component_separators = '', - section_separators = { left = '', right = '' }, - }, - sections = process_sections { - lualine_a = { 'mode' }, - lualine_b = { - 'branch', - 'diff', - { - 'diagnostics', - source = { 'nvim' }, - sections = { 'error' }, - diagnostics_color = { error = { bg = colors.red, fg = colors.white } }, - }, - { - 'diagnostics', - source = { 'nvim' }, - sections = { 'warn' }, - diagnostics_color = { warn = { bg = colors.orange, fg = colors.white } }, - }, - { 'filename', file_status = false, path = 1 }, - { modified, color = { bg = colors.red } }, - { - '%w', - cond = function() - return vim.wo.previewwindow - end, - }, - { - '%r', - cond = function() - return vim.bo.readonly - end, - }, - { - '%q', - cond = function() - return vim.bo.buftype == 'quickfix' - end, - }, - }, - lualine_c = {}, - lualine_x = {}, - lualine_y = { search_result, 'filetype' }, - lualine_z = { '%l:%c', '%p%%/%L' }, - }, - inactive_sections = { - lualine_c = { '%f %y %m' }, - lualine_x = {}, - }, - tabline = {}, - extensions = {"nvim-tree"} - } - end -} diff --git a/nvim/m-housh/lua/user/plugin-config/neogit.lua b/nvim/m-housh/lua/user/plugin-config/neogit.lua deleted file mode 100644 index c19d6e9..0000000 --- a/nvim/m-housh/lua/user/plugin-config/neogit.lua +++ /dev/null @@ -1,38 +0,0 @@ -return { - "TimUntersberger/neogit", - dependencies = { - "nvim-lua/plenary.nvim", - "nvim-telescope/telescope.nvim", -- optional - "sindrets/diffview.nvim", -- optional - }, - opts = { - disable_signs = false, - disable_context_highlighting = false, - disable_commit_confirmation = true, - -- customize displayed signs - signs = { - -- { CLOSED, OPENED } - section = { ">", "v" }, - item = { ">", "v" }, - hunk = { "", "" }, - }, - integrations = { - diffview = true - }, - -- override/add mappings - mappings = { - -- modify status buffer mappings - status = { - -- Adds a mapping with "B" as key that does the "BranchPopup" command - ["B"] = "BranchPopup", - ["C"] = "CommitPopup", - -- ["P"] = "PullPopup", - ["S"] = "Stage", - -- ["D"] = "Discard", - -- Removes the default mapping of "s" - -- ["s"] = "", - } - } - }, - cmd = "Neogit", -} diff --git a/nvim/m-housh/lua/user/plugin-config/telescope.lua b/nvim/m-housh/lua/user/plugin-config/telescope.lua deleted file mode 100644 index 4cdd7b2..0000000 --- a/nvim/m-housh/lua/user/plugin-config/telescope.lua +++ /dev/null @@ -1,78 +0,0 @@ -return { - 'nvim-telescope/telescope.nvim', - branch = '0.1.x', - dependencies = { - 'nvim-lua/plenary.nvim' - }, - config = function() - local actions = require('telescope.actions') - - require('telescope').setup({ - defaults = { - file_ignore_patterns = {"node_modules", "%.jpg", "%.png"}, - vimgrep_arguments = { - 'rg', - '--follow', - '--color=never', - '--no-heading', - '--with-filename', - '--line-number', - '--column', - '--smart-case' - }, - mappings = { - i = { - -- Close on first esc instead of gonig to normal mode - [""] = actions.close, - [""] = actions.send_selected_to_qflist, - [""] = actions.send_to_qflist, - [""] = actions.toggle_selection + actions.move_selection_next, - [""] = actions.toggle_selection + actions.move_selection_previous, - }, - n = { - [""] = actions.toggle_selection + actions.move_selection_next, - [""] = actions.toggle_selection + actions.move_selection_previous, - [""] = actions.send_selected_to_qflist, - [""] = actions.send_to_qflist, - }, - }, - prompt_prefix = " ", - selection_caret = " ", - entry_prefix = " ", - initial_mode = "insert", - selection_strategy = "reset", - sorting_strategy = "descending", - layout_strategy = "flex", - layout_config = { - width = 0.75, - prompt_position = "bottom", - preview_cutoff = 120, - horizontal = { mirror = false }, - vertical = { mirror = true }, - }, - file_sorter = require'telescope.sorters'.get_fuzzy_file, - generic_sorter = require'telescope.sorters'.get_generic_fuzzy_sorter, - -- path_display = true, -- strange behaviour not showing the files in result window - winblend = 0, - border = {}, - borderchars = { '─', '│', '─', '│', '╭', '╮', '╯', '╰' }, - color_devicons = true, - use_less = true, - set_env = { ['COLORTERM'] = 'truecolor' }, -- default = nil, - file_previewer = require'telescope.previewers'.vim_buffer_cat.new, - grep_previewer = require'telescope.previewers'.vim_buffer_vimgrep.new, - qflist_previewer = require'telescope.previewers'.vim_buffer_qflist.new, - - -- Developer configurations: Not meant for general override - buffer_previewer_maker = require'telescope.previewers'.buffer_previewer_maker - } - }) - - local builtin = require('telescope.builtin') - -- Telescope keymaps - vim.keymap.set('n', 'ff', builtin.find_files, {}) - vim.keymap.set('n', 'fg', builtin.live_grep, {}) - vim.keymap.set('n', 'fb', builtin.buffers, {}) - vim.keymap.set('n', 'fh', builtin.help_tags, {}) - end -} diff --git a/nvim/m-housh/lua/user/plugin-config/treesitter.lua b/nvim/m-housh/lua/user/plugin-config/treesitter.lua deleted file mode 100644 index e78824b..0000000 --- a/nvim/m-housh/lua/user/plugin-config/treesitter.lua +++ /dev/null @@ -1,75 +0,0 @@ -return { - "nvim-treesitter/nvim-treesitter", - dependencies = { - 'nvim-telescope/telescope-fzf-native.nvim', - 'nvim-treesitter/nvim-treesitter-textobjects', - }, - build = ':TSUpdate', - config = function() - require('nvim-treesitter.configs').setup { - ensure_installed = { - "bash", - "cmake", - "dockerfile", - "go", - "hcl", - "html", - "java", - "javascript", - "json", - "latex", - "ledger", - "llvm", - "lua", - "make", - "markdown", - "python", - "swift", - "toml", - "xml", - "yaml" - }, -- one of "all", "maintained" (parsers with maintainers), or a list of languages - ignore_install = {}, -- List of parsers to ignore installing - highlight = { - enable = true, -- false will disable the whole extension - disable = {} -- list of language that will be disabled - }, - incremental_selection = { - enable = true, - keymaps = { - init_selection = "", - scope_incremental = "", - node_incremental = "", - node_decremental = "" - } - }, - indent = {enable = true}, - autopairs = {{enable = true}}, - textobjects = { - select = { - enable = true, - -- Automatically jump forward to textobj, similar to targets.vim - lookahead = true, - keymaps = { - -- You can use the capture groups defined in textobjects.scm - ["af"] = "@function.outer", - ["if"] = "@function.inner", - ["ac"] = "@class.outer", - ["ic"] = "@class.inner", - ["al"] = "@loop.outer", - ["il"] = "@loop.inner", - ["ib"] = "@block.inner", - ["ab"] = "@block.outer", - ["ir"] = "@parameter.inner", - ["ar"] = "@parameter.outer" - } - } - }, - rainbow = { - enable = true, - extended_mode = true, -- Highlight also non-parentheses delimiters, boolean or table: lang -> boolean - max_file_lines = 2000 -- Do not enable for files with more than specified lines - } - } - end -} diff --git a/nvim/m-housh/lua/user/plugins.lua b/nvim/m-housh/lua/user/plugins.lua index 6353c1a..2dc4e6f 100644 --- a/nvim/m-housh/lua/user/plugins.lua +++ b/nvim/m-housh/lua/user/plugins.lua @@ -1,4 +1,4 @@ --- Plugins +-- Bootstrap Lazy. local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim" if not vim.loop.fs_stat(lazypath) then vim.fn.system({ @@ -12,15 +12,22 @@ if not vim.loop.fs_stat(lazypath) then end vim.opt.rtp:prepend(lazypath) -vim.g.mapleader = ' ' -vim.g.maplocalleader = ' ' - -require("lazy").setup( - 'user.plugin-config', - { - dev = { - path = '~/LocalProjects/plugins', - fallback = true - } - } -) +require("lazy").setup({ + dev = { + path = '~/LocalProjects/plugins', + fallback = true + }, + { import = 'user.plugin.cmp' }, + { import = 'user.plugin.diffview' }, + { import = 'user.plugin.lsp' }, + { import = 'user.plugin.lualine' }, + { import = 'user.plugin.neogit' }, + { import = 'user.plugin.neo-tree' }, + { import = 'user.plugin.swift' }, + { import = 'user.plugin.telescope' }, + { import = 'user.plugin.theme' }, + { import = 'user.plugin.toggleterm' }, + { import = 'user.plugin.treesitter' }, + { import = 'user.plugin.which-key' }, + { import = 'user.plugin.wrapping' }, +})