From 310fdf8de53d98ddd3a56936c131186e25814f0f Mon Sep 17 00:00:00 2001 From: seth Date: Tue, 29 Oct 2024 22:37:49 -0400 Subject: use lz.n (#69) * remove bufferline & some cmp sources * factor things out of after/ folder This is bad practice or something * make sure ftdetect plugins aren't loaded multiple times * use lz.n * mini.pairs -> mini.surround * flake: cleanup checks * ftplugin: enforce spaces in nix files --- plugin/bufferline.lua | 16 ------ plugin/catppuccin.lua | 33 ------------ plugin/cmp.lua | 47 ----------------- plugin/crates.lua | 6 --- plugin/fidget.lua | 6 --- plugin/flash.lua | 6 --- plugin/gitsigns.lua | 6 --- plugin/glow.lua | 6 --- plugin/ibl.lua | 24 --------- plugin/lint.lua | 20 -------- plugin/lsp-format.lua | 6 --- plugin/lsp.lua | 137 -------------------------------------------------- plugin/lualine.lua | 11 ---- plugin/mini.lua | 29 ----------- plugin/telescope.lua | 6 --- plugin/treesitter.lua | 11 ---- plugin/trouble.lua | 6 --- 17 files changed, 376 deletions(-) delete mode 100644 plugin/bufferline.lua delete mode 100644 plugin/catppuccin.lua delete mode 100644 plugin/cmp.lua delete mode 100644 plugin/crates.lua delete mode 100644 plugin/fidget.lua delete mode 100644 plugin/flash.lua delete mode 100644 plugin/gitsigns.lua delete mode 100644 plugin/glow.lua delete mode 100644 plugin/ibl.lua delete mode 100644 plugin/lint.lua delete mode 100644 plugin/lsp-format.lua delete mode 100644 plugin/lsp.lua delete mode 100644 plugin/lualine.lua delete mode 100644 plugin/mini.lua delete mode 100644 plugin/telescope.lua delete mode 100644 plugin/treesitter.lua delete mode 100644 plugin/trouble.lua (limited to 'plugin') diff --git a/plugin/bufferline.lua b/plugin/bufferline.lua deleted file mode 100644 index b03ddff..0000000 --- a/plugin/bufferline.lua +++ /dev/null @@ -1,16 +0,0 @@ -if vim.g.did_load_bufferline_plugin then - return -end -vim.g.did_load_bufferline_plugin = true - -require("bufferline").setup({ - options = { - always_show_bufferline = false, - - diagnostics = "nvim_lsp", - - mode = "buffers", - numbers = "ordinal", - separator_style = "slant", - }, -}) diff --git a/plugin/catppuccin.lua b/plugin/catppuccin.lua deleted file mode 100644 index 79b84ec..0000000 --- a/plugin/catppuccin.lua +++ /dev/null @@ -1,33 +0,0 @@ -if vim.g.did_load_catppuccin_plugin then - return -end -vim.g.did_load_catppuccin_plugin = true - -local compile_path = vim.fn.stdpath("cache") .. "/catppuccin-nvim" -vim.fn.mkdir(compile_path, "p") -vim.opt.runtimepath:append(compile_path) - -require("catppuccin").setup({ - compile_path = compile_path, - flavour = "mocha", - integrations = { - cmp = true, - flash = true, - gitsigns = true, - indent_blankline = { - enabled = true, - }, - lsp_trouble = true, - native_lsp = { - enabled = true, - }, - neotree = true, - treesitter = true, - telescope = true, - which_key = true, - }, - - no_italic = true, -}) - -vim.cmd.colorscheme("catppuccin") diff --git a/plugin/cmp.lua b/plugin/cmp.lua deleted file mode 100644 index 10c750f..0000000 --- a/plugin/cmp.lua +++ /dev/null @@ -1,47 +0,0 @@ -if vim.g.did_load_cmp_plugin then - return -end -vim.g.did_load_cmp_plugin = true - -local cmp = require("cmp") - -cmp.setup({ - completion = { - compleopt = "menu,menuone,insert", - }, - - snippet = { - expand = function(args) - require("luasnip").lsp_expand(args.body) - end, - }, - - mapping = { - [""] = cmp.mapping.select_next_item({ behavior = cmp.SelectBehavior.Insert }), - [""] = cmp.mapping.select_prev_item({ behavior = cmp.SelectBehavior.Insert }), - [""] = cmp.mapping.scroll_docs(-4), - [""] = cmp.mapping.scroll_docs(4), - [""] = cmp.mapping.complete(), - [""] = cmp.mapping.abort(), - [""] = cmp.mapping({ - i = function(fallback) - if cmp.visible() and cmp.get_active_entry() then - cmp.confirm({ behavior = cmp.ConfirmBehavior.Replace, select = false }) - else - fallback() - end - end, - - s = cmp.mapping.confirm({ select = true }), - c = cmp.mapping.confirm({ behavior = cmp.ConfirmBehavior.Replace, select = true }), - }), - }, - - sources = cmp.config.sources({ - { name = "nvim_lsp" }, - { name = "luasnip" }, - { name = "async_path" }, - { name = "buffer" }, - { name = "rg" }, - }), -}) diff --git a/plugin/crates.lua b/plugin/crates.lua deleted file mode 100644 index a954320..0000000 --- a/plugin/crates.lua +++ /dev/null @@ -1,6 +0,0 @@ -if vim.g.did_load_crates_plugin then - return -end -vim.g.did_load_crates_plugin = true - -require("crates").setup() diff --git a/plugin/fidget.lua b/plugin/fidget.lua deleted file mode 100644 index 59fbb0c..0000000 --- a/plugin/fidget.lua +++ /dev/null @@ -1,6 +0,0 @@ -if vim.g.did_load_fidget_plugin then - return -end -vim.g.did_load_fidget_plugin = true - -require("fidget").setup() diff --git a/plugin/flash.lua b/plugin/flash.lua deleted file mode 100644 index f3e1c15..0000000 --- a/plugin/flash.lua +++ /dev/null @@ -1,6 +0,0 @@ -if vim.g.did_load_flash_plugin then - return -end -vim.g.did_load_flash_plugin = true - -require("flash").setup() diff --git a/plugin/gitsigns.lua b/plugin/gitsigns.lua deleted file mode 100644 index 7f6f457..0000000 --- a/plugin/gitsigns.lua +++ /dev/null @@ -1,6 +0,0 @@ -if vim.g.did_load_gitsigns_plugin then - return -end -vim.g.did_load_gitsigns_plugin = true - -require("gitsigns").setup() diff --git a/plugin/glow.lua b/plugin/glow.lua deleted file mode 100644 index 4e7f2d9..0000000 --- a/plugin/glow.lua +++ /dev/null @@ -1,6 +0,0 @@ -if vim.g.did_load_glow_plugin then - return -end -vim.g.did_load_glow_plugin = true - -require("glow").setup() diff --git a/plugin/ibl.lua b/plugin/ibl.lua deleted file mode 100644 index 0d42c04..0000000 --- a/plugin/ibl.lua +++ /dev/null @@ -1,24 +0,0 @@ -if vim.g.did_load_ibl_plugin then - return -end -vim.g.did_load_ibl_plugin = true - -require("ibl").setup({ - exclude = { - filetypes = { - "help", - "Trouble", - "toggleterm", - }, - }, - - indent = { - char = "│", - tab_char = "│", - }, - - scope = { - -- Let mini.nvim handle this - enabled = false, - }, -}) diff --git a/plugin/lint.lua b/plugin/lint.lua deleted file mode 100644 index b7dba21..0000000 --- a/plugin/lint.lua +++ /dev/null @@ -1,20 +0,0 @@ -if vim.g.did_load_lint_plugin then - return -end -vim.g.did_load_lint_plugin = true - -require("lint").linters_by_ft = { - githubaction = { "actionlint" }, - lua = { "selene" }, - nix = { "statix" }, -} - -vim.api.nvim_create_autocmd({ "BufWritePost" }, { - callback = function() - -- Run linters declared in linters_by_ft - require("lint").try_lint() - - -- Run these linters regardless of filetype - require("lint").try_lint("alex") - end, -}) diff --git a/plugin/lsp-format.lua b/plugin/lsp-format.lua deleted file mode 100644 index e21bdfd..0000000 --- a/plugin/lsp-format.lua +++ /dev/null @@ -1,6 +0,0 @@ -if vim.g.did_load_lsp_format_plugin then - return -end -vim.g.did_load_lsp_format_plugin = true - -require("lsp-format").setup() diff --git a/plugin/lsp.lua b/plugin/lsp.lua deleted file mode 100644 index 5815574..0000000 --- a/plugin/lsp.lua +++ /dev/null @@ -1,137 +0,0 @@ -if vim.g.did_load_lsp_plugin then - return -end -vim.g.did_load_lsp_plugin = true - -local lsp_servers = { - astro = { - binary = "astro-ls", - }, - - bashls = { - binary = "bash-language-server", - }, - - cssls = { - binary = "vscode-css-language-server", - }, - - clangd = {}, - - denols = { - binary = "deno", - }, - - dprint = {}, - - eslint = { - binary = "vscode-eslint-language-server", - }, - - html = { - binary = "vscode-html-language-server", - }, - - jsonls = { - binary = "vscode-json-language-server" - }, - - -- TODO: I WANT STYLUA BACK!! - lua_ls = { - binary = "lua-language-server", - extraOptions = { - settings = { - Lua = { - runtime = { version = "LuaJIT" }, - diagnostics = { globals = "vim" }, - workspace = { checkThirdPaty = false, library = { vim.env.VIMRUNTIME } }, - }, - }, - }, - }, - - nil_ls = { - binary = "nil", - extraOptions = { - settings = { - ["nil"] = { - formatting = { command = { "nixfmt" } }, - }, - }, - }, - }, - - nim_langserver = { - binary = "nimlangserver", - }, - - pyright = { - extraOptions = { - settings = { - -- ruff is used instead - pyright = { disableOrganizeImports = true }, - python = { ignore = { "*" } }, - }, - }, - }, - - ruff_lsp = { - binary = "ruff-lsp", - extraOptions = { - on_attach = function(client, _) - require("lsp-format").on_attach(client) - -- pyright should handle this - client.server_capabilities.hoverProvider = false - end, - }, - }, - - rust_analyzer = { - binary = "rust-analyzer", - extraOptions = { - settings = { - ["rust-analyzer"] = { - check = { command = "clippy" }, - }, - }, - }, - }, - - ts_ls = { - binary = "typescript-language-server", - }, - - typos_lsp = { - binary = "typos-lsp", - }, - - typst_lsp = { - binary = "typst-lsp", - }, -} - -local caps = vim.tbl_deep_extend( - "force", - vim.lsp.protocol.make_client_capabilities(), - require("cmp_nvim_lsp").default_capabilities(), - -- for nil_ls - { workspace = { didChangeWatchedFiles = { dynamicRegistration = true } } } -) - -local setup = { - on_attach = function(client, _) - require("lsp-format").on_attach(client) - end, - - capabilities = caps, -} - -for server, config in pairs(lsp_servers) do - local binary = config.binary or server - - local options = (config.extraOptions == nil) and setup or vim.tbl_extend("keep", config.extraOptions, setup) - - if vim.fn.executable(binary) == 1 then - require("lspconfig")[server].setup(options) - end -end diff --git a/plugin/lualine.lua b/plugin/lualine.lua deleted file mode 100644 index 603693d..0000000 --- a/plugin/lualine.lua +++ /dev/null @@ -1,11 +0,0 @@ -if vim.g.did_load_lualine_plugin then - return -end -vim.g.did_load_lualine_plugin = true - -require("lualine").setup({ - options = { - theme = "catppuccin", - }, - extensions = { "trouble" }, -}) diff --git a/plugin/mini.lua b/plugin/mini.lua deleted file mode 100644 index ebcbf78..0000000 --- a/plugin/mini.lua +++ /dev/null @@ -1,29 +0,0 @@ -if vim.g.did_load_mini_plugin then - return -end -vim.g.did_load_mini_plugin = true - -local hipatterns = require("mini.hipatterns") - -require("mini.files").setup() -hipatterns.setup({ - highlighters = { - hex_color = hipatterns.gen_highlighter.hex_color(), - }, -}) -require("mini.indentscope").setup({ - options = { try_as_border = true }, -}) -require("mini.pairs").setup() - -vim.api.nvim_create_autocmd("FileType", { - pattern = { - "help", - "Trouble", - "toggleterm", - }, - - callback = function() - vim.b.miniindentscope_disable = true - end, -}) diff --git a/plugin/telescope.lua b/plugin/telescope.lua deleted file mode 100644 index d50d742..0000000 --- a/plugin/telescope.lua +++ /dev/null @@ -1,6 +0,0 @@ -if vim.g.did_load_telescope_plugin then - return -end -vim.g.did_load_telescope_plugin = true - -require("telescope").setup() diff --git a/plugin/treesitter.lua b/plugin/treesitter.lua deleted file mode 100644 index 4668fe8..0000000 --- a/plugin/treesitter.lua +++ /dev/null @@ -1,11 +0,0 @@ -if vim.g.did_load_treesitter_plugin then - return -end -vim.g.did_load_treesitter_plugin = true - -require("nvim-treesitter.configs").setup({ - auto_install = false, - - highlight = { enable = true }, - indent = { enable = true }, -}) diff --git a/plugin/trouble.lua b/plugin/trouble.lua deleted file mode 100644 index e1e7768..0000000 --- a/plugin/trouble.lua +++ /dev/null @@ -1,6 +0,0 @@ -if vim.g.did_load_trouble_plugin then - return -end -vim.g.did_load_trouble_plugin = true - -require("trouble").setup() -- cgit v1.2.3