summaryrefslogtreecommitdiff
path: root/plugins
diff options
context:
space:
mode:
authorseth <[email protected]>2023-11-01 06:42:48 -0400
committerseth <[email protected]>2023-11-01 06:42:48 -0400
commit09004f4517eba8f57d37897e34f6ba56ad3653f1 (patch)
tree6ae19b13a2694fe852caa6c77665af24ea59fe9e /plugins
parentca59ebcf3dd17153b90a0ceca86af14db941ac3c (diff)
stop using neovim.nix
i had small, but annoying issues here and i don't care for lazy loading much tbh
Diffstat (limited to 'plugins')
-rw-r--r--plugins/bufferline.lua20
-rw-r--r--plugins/catppuccin.lua28
-rw-r--r--plugins/cmp.lua38
-rw-r--r--plugins/default.nix182
-rw-r--r--plugins/dressing.lua11
-rw-r--r--plugins/lspconfig.lua49
-rw-r--r--plugins/lualine.lua8
-rw-r--r--plugins/neo-tree.lua7
-rw-r--r--plugins/noice.lua30
-rw-r--r--plugins/null-ls.lua50
10 files changed, 0 insertions, 423 deletions
diff --git a/plugins/bufferline.lua b/plugins/bufferline.lua
deleted file mode 100644
index 5ec89e5..0000000
--- a/plugins/bufferline.lua
+++ /dev/null
@@ -1,20 +0,0 @@
-return function()
- require("bufferline").setup({
- options = {
- always_show_bufferline = false,
- highlights = require("catppuccin.groups.integrations.bufferline").get(),
- diagnostics = "nvim_lsp",
- mode = "buffers",
- numbers = "ordinal",
- separator_style = "slant",
- offsets = {
- {
- filetype = "neo-tree",
- text = "neo-tree",
- highlight = "Directory",
- text_align = "left",
- },
- },
- },
- })
-end
diff --git a/plugins/catppuccin.lua b/plugins/catppuccin.lua
deleted file mode 100644
index 2679b48..0000000
--- a/plugins/catppuccin.lua
+++ /dev/null
@@ -1,28 +0,0 @@
-return function()
- require("catppuccin").setup({
- compile_path = compile_path,
- flavour = "mocha", -- mocha, macchiato, frappe, latte
- integrations = {
- cmp = true,
- flash = true,
- gitsigns = true,
- indent_blankline = {
- enabled = true,
- },
- lsp_trouble = true,
- native_lsp = {
- enabled = true,
- },
- neotree = true,
- notify = true,
- treesitter_context = true,
- treesitter = true,
- telescope = true,
- which_key = true,
- },
-
- no_italic = true,
- })
-
- vim.cmd.colorscheme("catppuccin")
-end
diff --git a/plugins/cmp.lua b/plugins/cmp.lua
deleted file mode 100644
index a61dc4a..0000000
--- a/plugins/cmp.lua
+++ /dev/null
@@ -1,38 +0,0 @@
-return function()
- local cmp = require("cmp")
- local luasnip = require("luasnip")
- local mapping = cmp.mapping
-
- return {
- completion = {
- completeopt = "menu,menuone,noinsert",
- },
-
- snippet = {
- expand = function(args)
- luasnip.lsp_expand(args.body)
- end,
- },
-
- mapping = mapping.preset.insert({
- ["<C-n>"] = mapping.select_next_item({ behavior = cmp.SelectBehavior.Insert }),
- ["<C-p>"] = mapping.select_prev_item({ behavior = cmp.SelectBehavior.Insert }),
- ["<C-b>"] = mapping.scroll_docs(-4),
- ["<C-f>"] = mapping.scroll_docs(4),
- ["<C-Space>"] = mapping.complete(),
- ["<C-e>"] = mapping.abort(),
- ["<CR>"] = mapping.confirm({ select = true }),
- ["<S-CR>"] = mapping.confirm({
- behavior = cmp.ConfirmBehavior.Replace,
- select = true,
- }),
- }),
-
- sources = cmp.config.sources({
- { name = "nvim_lsp" },
- { name = "luasnip" },
- { name = "async_path" },
- { name = "buffer" },
- }),
- }
-end
diff --git a/plugins/default.nix b/plugins/default.nix
deleted file mode 100644
index df6d348..0000000
--- a/plugins/default.nix
+++ /dev/null
@@ -1,182 +0,0 @@
-{pkgs, ...}: let
- inherit (pkgs) vimPlugins;
-in rec {
- config = {
- src = ../config;
- lazy = false;
- priority = 1000;
- };
-
- catppuccin-nvim = {
- package = vimPlugins.catppuccin-nvim;
-
- config = ./catppuccin.lua;
- };
-
- fidget-nvim = {
- package = vimPlugins.fidget-nvim.overrideAttrs (_: {
- src = pkgs.fetchFromGitHub {
- owner = "j-hui";
- repo = "fidget.nvim";
- rev = "41f327b53c7977d47aee56f05e0bdbb4b994c5eb";
- hash = "sha256-v9qARsW8Gozit4Z3+igiemjI467QgRhwM+crqwO9r6U=";
- };
- });
- };
-
- flash-nvim = {
- package = vimPlugins.flash-nvim;
- event = "VeryLazy";
- };
-
- gitsigns-nvim = {
- package = vimPlugins.gitsigns-nvim;
- event = ["BufReadPre" "BufNewFile"];
- };
-
- ibl = {
- package = vimPlugins.indent-blankline-nvim;
-
- event = ["BufReadPost" "BufNewFile"];
-
- config = {
- indent = {
- char = "│";
- tab_char = "│";
- };
-
- exclude.filetypes = [
- "help"
- "neo-tree"
- "Trouble"
- "lazy"
- "mason"
- "notify"
- "toggleterm"
- ];
-
- scope.enabled = false;
- };
- };
-
- lualine-nvim = {
- package = vimPlugins.lualine-nvim;
-
- event = "VeryLazy";
-
- dependencies = {
- nvim-web-devicons.package = vimPlugins.nvim-web-devicons;
- };
-
- config = ./lualine.lua;
- };
-
- neo-tree-nvim = {
- package = vimPlugins.neo-tree-nvim;
- dependencies = {
- plenary-nvim.package = vimPlugins.plenary-nvim;
- inherit (lualine-nvim.dependencies) nvim-web-devicons;
- inherit nui-nvim;
- };
-
- config = ./neo-tree.lua;
- };
-
- # TODO: configure mini.pairs, mini.indentscope, & mini.comment
- mini-nvim.package = vimPlugins.mini-nvim;
-
- nvim-cmp = {
- package = vimPlugins.nvim-cmp;
- dependencies = {
- cmp-nvim-lsp.package = vimPlugins.cmp-nvim-lsp;
- cmp-buffer.package = vimPlugins.cmp-buffer;
- cmp_luasnip.package = vimPlugins.cmp_luasnip;
- cmp-async-path.package = vimPlugins.cmp-async-path;
- luasnip.package = vimPlugins.luasnip;
- };
-
- event = "InsertEnter";
- config = ./cmp.lua;
- };
-
- dressing-nvim = {
- package = vimPlugins.dressing-nvim;
- lazy = true;
- init = ./dressing.lua;
- };
-
- noice-nvim = {
- package = vimPlugins.noice-nvim;
- event = "VeryLazy";
-
- config = ./noice.lua;
- };
-
- nui-nvim = {
- package = vimPlugins.nui-nvim;
- lazy = true;
- };
-
- nvim-lspconfig = {
- package = vimPlugins.nvim-lspconfig;
-
- event = ["BufReadPre" "BufNewFile"];
- config = ./lspconfig.lua;
- };
-
- nvim-treesitter = {
- package = vimPlugins.nvim-treesitter.withAllGrammars;
- dependencies = {
- nvim-ts-context-commentstring.package = vimPlugins.nvim-ts-context-commentstring;
- };
-
- event = ["BufReadPost" "BufNewFile"];
- config = {
- auto_install = false;
- highlight.enable = true;
- indent.enable = true;
- context_commentstring = {
- enable = true;
- enable_autocmd = false;
- };
- };
- };
-
- null-ls = {
- package = vimPlugins.null-ls-nvim;
- dependencies = {
- inherit (neo-tree-nvim.dependencies) plenary-nvim;
- };
-
- config = ./null-ls.lua;
- };
-
- bufferline-nvim = {
- package = vimPlugins.bufferline-nvim;
- dependencies = {
- inherit (lualine-nvim.dependencies) nvim-web-devicons;
- inherit catppuccin-nvim;
- };
-
- config = ./bufferline.lua;
- };
-
- telescope-nvim.package = vimPlugins.telescope-nvim;
-
- trouble-nvim = {
- package = vimPlugins.trouble-nvim;
- dependencies = {
- inherit (lualine-nvim.dependencies) nvim-web-devicons;
- };
- };
-
- which-key-nvim = {
- package = vimPlugins.which-key-nvim;
- event = "VeryLazy";
- config = {
- plugins = {
- spelling = true;
- };
- };
- };
-}
diff --git a/plugins/dressing.lua b/plugins/dressing.lua
deleted file mode 100644
index 1f0e70a..0000000
--- a/plugins/dressing.lua
+++ /dev/null
@@ -1,11 +0,0 @@
-return function()
- vim.ui.select = function(...)
- require("lazy").load({ plugins = { "dressing-nvim" } })
- return vim.ui.select(...)
- end
-
- vim.ui.input = function(...)
- require("lazy").load({ plugins = { "dressing-nvim" } })
- return vim.ui.input(...)
- end
-end
diff --git a/plugins/lspconfig.lua b/plugins/lspconfig.lua
deleted file mode 100644
index a17d5ab..0000000
--- a/plugins/lspconfig.lua
+++ /dev/null
@@ -1,49 +0,0 @@
-return function()
- local sources = {
- ["bashls"] = "bash-language-server",
- ["clangd"] = "clangd",
- ["eslint"] = "eslint",
- ["nil_ls"] = "nil",
- ["pyright"] = "pyright-langserver",
- ["rust_analyzer"] = "rust-analyzer",
- ["tsserver"] = "typescript-language-server",
- }
-
- local capabilities = vim.tbl_deep_extend(
- "force",
- require("cmp_nvim_lsp").default_capabilities(vim.lsp.protocol.make_client_capabilities()),
- { workspace = { didChangeWatchedFiles = { dynamicRegistration = true } } }
- )
-
- local all_config = {
- capabilities = capabilities,
- }
-
- local servers = {}
- for server, binary in pairs(sources) do
- if vim.fn.executable(binary) == 1 then
- servers[server] = all_config
- end
- end
-
- servers["lua_ls"] = {
- capabilities = capabilities,
- settings = {
- Lua = {
- runtime = {
- version = "LuaJIT",
- },
- diagnostics = {
- globals = { "vim" },
- },
- workspace = {
- library = vim.api.nvim_get_runtime_file("", true),
- },
- },
- },
- }
-
- for server, settings in pairs(servers) do
- require("lspconfig")[server].setup(settings)
- end
-end
diff --git a/plugins/lualine.lua b/plugins/lualine.lua
deleted file mode 100644
index dbf8602..0000000
--- a/plugins/lualine.lua
+++ /dev/null
@@ -1,8 +0,0 @@
-return function()
- require("lualine").setup({
- options = {
- theme = "catppuccin",
- },
- extensions = { "neo-tree", "trouble" },
- })
-end
diff --git a/plugins/neo-tree.lua b/plugins/neo-tree.lua
deleted file mode 100644
index 8d690d9..0000000
--- a/plugins/neo-tree.lua
+++ /dev/null
@@ -1,7 +0,0 @@
-return function()
- require("neo-tree").setup({
- filetype_exclude = { "help", "neo-tree", "Trouble", "lazy", "mason", "notify", "toggleterm" },
- show_current_context = false,
- show_trailing_blankline_indent = false,
- })
-end
diff --git a/plugins/noice.lua b/plugins/noice.lua
deleted file mode 100644
index ac8879e..0000000
--- a/plugins/noice.lua
+++ /dev/null
@@ -1,30 +0,0 @@
-return function()
- require("noice").setup({
- lsp = {
- override = {
- ["vim.lsp.util.convert_input_to_markdown_lines"] = true,
- ["vim.lsp.util.stylize_markdown"] = true,
- ["cmp.entry.get_documentation"] = true,
- },
- },
- routes = {
- {
- filter = {
- event = "msg_show",
- any = {
- { find = "%d+L, %d+B" },
- { find = "; after #%d+" },
- { find = "; before #%d+" },
- },
- },
- view = "mini",
- },
- },
- presets = {
- bottom_search = true,
- command_palette = true,
- long_message_to_split = true,
- inc_rename = true,
- },
- })
-end
diff --git a/plugins/null-ls.lua b/plugins/null-ls.lua
deleted file mode 100644
index a2a71f1..0000000
--- a/plugins/null-ls.lua
+++ /dev/null
@@ -1,50 +0,0 @@
-return function()
- local null_ls = require("null-ls")
- local diagnostics = null_ls.builtins.diagnostics
- local formatting = null_ls.builtins.formatting
-
- local lsp_formatting = function(bufnr)
- vim.lsp.buf.format({
- filter = function(client)
- return client.name == "null-ls"
- end,
- bufnr = bufnr,
- })
- end
-
- local augroup = vim.api.nvim_create_augroup("LspFormatting", {})
-
- null_ls.setup({
- on_attach = function(client, bufnr)
- if client.supports_method("textDocument/formatting") then
- vim.api.nvim_clear_autocmds({ group = augroup, buffer = bufnr })
- vim.api.nvim_create_autocmd("BufWritePre", {
- group = augroup,
- buffer = bufnr,
- callback = function()
- lsp_formatting(bufnr)
- end,
- })
- end
- end,
- sources = {
- diagnostics.actionlint,
- diagnostics.alex,
- diagnostics.codespell,
- diagnostics.deadnix,
- diagnostics.pylint,
- diagnostics.shellcheck,
- diagnostics.statix,
- formatting.alejandra,
- formatting.beautysh,
- formatting.codespell,
- formatting.just,
- formatting.nimpretty,
- formatting.prettier,
- formatting.rustfmt,
- formatting.shellharden,
- formatting.stylua,
- formatting.yapf,
- },
- })
-end