From 9a7cba596c2a9eb468fa05bd00bc8f2d2668e96b Mon Sep 17 00:00:00 2001 From: William Ball Date: Wed, 8 Apr 2026 10:33:36 -0400 Subject: [PATCH] cleanup a bunch of unused packages --- nvim/.config/nvim/after/ftplugin/c.lua | 2 + nvim/.config/nvim/after/ftplugin/haskell.lua | 13 --- nvim/.config/nvim/lua/plugins/colors.lua | 31 ++----- .../nvim/lua/plugins/languages/haskell.lua | 7 -- .../nvim/lua/plugins/languages/idris.lua | 80 ------------------- .../nvim/lua/plugins/languages/lean.lua | 16 ---- .../nvim/lua/plugins/languages/zig.lua | 28 ------- nvim/.config/nvim/lua/plugins/lsp.lua | 35 -------- nvim/.config/nvim/lua/plugins/ui.lua | 4 - nvim/.config/nvim/lua/plugins/utils.lua | 28 ------- 10 files changed, 10 insertions(+), 234 deletions(-) delete mode 100644 nvim/.config/nvim/after/ftplugin/haskell.lua delete mode 100644 nvim/.config/nvim/lua/plugins/languages/haskell.lua delete mode 100644 nvim/.config/nvim/lua/plugins/languages/idris.lua delete mode 100644 nvim/.config/nvim/lua/plugins/languages/lean.lua delete mode 100644 nvim/.config/nvim/lua/plugins/languages/zig.lua diff --git a/nvim/.config/nvim/after/ftplugin/c.lua b/nvim/.config/nvim/after/ftplugin/c.lua index ea8a831..181c5ae 100644 --- a/nvim/.config/nvim/after/ftplugin/c.lua +++ b/nvim/.config/nvim/after/ftplugin/c.lua @@ -1 +1,3 @@ vim.opt.expandtab = false +vim.opt.shiftwidth = 8 +vim.opt.tabstop = 8 diff --git a/nvim/.config/nvim/after/ftplugin/haskell.lua b/nvim/.config/nvim/after/ftplugin/haskell.lua deleted file mode 100644 index aac69d4..0000000 --- a/nvim/.config/nvim/after/ftplugin/haskell.lua +++ /dev/null @@ -1,13 +0,0 @@ -require('haskell-tools').lsp.start() - -local ht = require('haskell-tools') -local bufnr = vim.api.nvim_get_current_buf() -local opts = { noremap = true, silent = true, buffer = bufnr, } -vim.keymap.set('n', 'cl', vim.lsp.codelens.run, opts) -vim.keymap.set('n', 'hs', ht.hoogle.hoogle_signature, opts) -vim.keymap.set('n', 'ea', ht.lsp.buf_eval_all, opts) -vim.keymap.set('n', 'rr', ht.repl.toggle, opts) -vim.keymap.set('n', 'rf', function() - ht.repl.toggle(vim.api.nvim_buf_get_name(0)) -end, opts) -vim.keymap.set('n', 'rq', ht.repl.quit, opts) diff --git a/nvim/.config/nvim/lua/plugins/colors.lua b/nvim/.config/nvim/lua/plugins/colors.lua index d468041..f3e1c4e 100644 --- a/nvim/.config/nvim/lua/plugins/colors.lua +++ b/nvim/.config/nvim/lua/plugins/colors.lua @@ -1,30 +1,15 @@ return { { - 'norcalli/nvim-colorizer.lua', - config = true + 'catgoose/nvim-colorizer.lua', + event = 'BufReadPre', + opts = {}, }, { - 'catppuccin/nvim', - name = 'catppuccin', + 'ellisonleao/gruvbox.nvim', priority = 1000, config = function() - require('catppuccin').setup({ - transparent_background = true, - }) - vim.cmd.colorscheme([[catppuccin-mocha]]) - end - }, - -- { - -- "Mofiqul/adwaita.nvim", - -- lazy = false, - -- priority = 1000, - -- - -- -- configure and set on startup - -- config = function() - -- vim.g.adwaita_darker = true -- for darker version - -- -- vim.g.adwaita_disable_cursorline = true -- to disable cursorline - -- vim.g.adwaita_transparent = true -- makes the background transparent - -- vim.cmd('colorscheme adwaita') - -- end - -- } + vim.o.background = 'dark' + vim.cmd.colorscheme([[gruvbox]]) + end, + } } diff --git a/nvim/.config/nvim/lua/plugins/languages/haskell.lua b/nvim/.config/nvim/lua/plugins/languages/haskell.lua deleted file mode 100644 index f48044d..0000000 --- a/nvim/.config/nvim/lua/plugins/languages/haskell.lua +++ /dev/null @@ -1,7 +0,0 @@ -return { - { - 'mrcjkb/haskell-tools.nvim', - version = '^4', - lazy = false, - } -} diff --git a/nvim/.config/nvim/lua/plugins/languages/idris.lua b/nvim/.config/nvim/lua/plugins/languages/idris.lua deleted file mode 100644 index e9d5a24..0000000 --- a/nvim/.config/nvim/lua/plugins/languages/idris.lua +++ /dev/null @@ -1,80 +0,0 @@ -return { - { - 'idris-community/idris2-nvim', - event = { 'BufReadPre *.idr', 'BufNewFile *.idr' }, - dependencies = { - 'neovim/nvim-lspconfig', - 'MunifTanjim/nui.nvim', - 'folke/which-key.nvim' - }, - config = function() - local wk = require('which-key') - local action = require('idris2.code_action') - local hover = require('idris2.hover') - local meta = require('idris2.metavars') - local browse = require('idris2.browse') - local repl = require('idris2.repl') - - require('idris2').setup({ - client = { - hover = { - use_split = false, - split_size = '30%', - auto_resize_split = false, - split_position = 'bottom', - with_history = true, - }, - }, - -- autostart_semantic = true, - -- code_action_post_hook = save_hook, - -- use_default_semantic_hl_groups = true, - server = { - init_options = { - logFile = "~/.cache/idris2-lsp/server.log", - longActionTimeout = 2000, - }, - on_attach = function(...) - wk.add({ - { 'c', action.case_split, desc = 'Split case' }, - - { 'i', group = 'idris action' }, - { 'ic', action.make_case, desc = 'Make case' }, - { 'iw', action.make_with, desc = 'Make with' }, - { 'il', action.make_lemma, desc = 'Make lemma' }, - { 'ia', action.add_clause, desc = 'Add clause' }, - { 'io', action.expr_search, desc = 'Expr search' }, - { 'ig', action.generate_def, desc = 'Generate definition' }, - { 'ir', action.refine_hole, desc = 'Refine hole' }, - { 'ib', browse.browse, desc = 'Browse' }, - - { 's', group = 'idris split' }, - { 'so', hover.open_split, desc = 'Open' }, - { 'sc', hover.close_split, desc = 'Close' }, - - { 'm', group = 'idris metavariables' }, - { 'mm', meta.request_all, desc = 'Request all' }, - { 'mn', meta.goto_next, desc = 'Next' }, - { 'mp', meta.goto_prev, desc = 'Previous' }, - - { 'e', group = 'idris evaluate' }, - { 'ee', repl.evaluate, desc = 'Expression' }, - { - 'ev', - function() repl.evaluate({ visual = true}) end, - desc = 'Visual selection', - mode = 'v', - group = 'idris evaluate' - }, - { - 'er', - function() repl.evaluate({ visual = true, sub = true}) end, - desc = 'Replace selection', - mode = 'v' - }, - }) - end - } - }) - end - } -} diff --git a/nvim/.config/nvim/lua/plugins/languages/lean.lua b/nvim/.config/nvim/lua/plugins/languages/lean.lua deleted file mode 100644 index 245c0f7..0000000 --- a/nvim/.config/nvim/lua/plugins/languages/lean.lua +++ /dev/null @@ -1,16 +0,0 @@ -return { - { - 'Julian/lean.nvim', - event = { 'BufReadPre *.lean', 'BufNewFile *.lean' }, - - dependencies = { - 'neovim/nvim-lspconfig', - 'nvim-lua/plenary.nvim', - }, - - opts = { - lsp = {}, - mappings = true, - } - } -} diff --git a/nvim/.config/nvim/lua/plugins/languages/zig.lua b/nvim/.config/nvim/lua/plugins/languages/zig.lua deleted file mode 100644 index 9c87a62..0000000 --- a/nvim/.config/nvim/lua/plugins/languages/zig.lua +++ /dev/null @@ -1,28 +0,0 @@ -return {} --- return { --- { --- "jinzhongjia/zig-lamp", --- event = "VeryLazy", --- build = ":ZigLamp build sync", --- dependencies = { --- "neovim/nvim-lspconfig", --- "nvim-lua/plenary.nvim", --- }, --- init = function() --- -- Timeout in milliseconds for automatic ZLS installation --- -- Set to nil to disable auto-install --- vim.g.zig_lamp_zls_auto_install = nil --- --- -- Fallback to system ZLS if local version not found --- -- Set to any non-negative value to enable --- vim.g.zig_lamp_fall_back_sys_zls = nil --- --- -- LSP configuration options passed to lspconfig --- vim.g.zig_lamp_zls_lsp_opt = {} --- --- -- UI customization --- vim.g.zig_lamp_pkg_help_fg = "#CF5C00" --- vim.g.zig_lamp_zig_fetch_timeout = 5000 --- end, --- } --- } diff --git a/nvim/.config/nvim/lua/plugins/lsp.lua b/nvim/.config/nvim/lua/plugins/lsp.lua index 8a8b4d7..b3ba78b 100644 --- a/nvim/.config/nvim/lua/plugins/lsp.lua +++ b/nvim/.config/nvim/lua/plugins/lsp.lua @@ -5,29 +5,6 @@ return { local capabilities = require('cmp_nvim_lsp').default_capabilities() local wk = require('which-key') - vim.lsp.enable('ocamllsp') - vim.lsp.config('ocamllsp', { - capabilities = capabilities - }) - - vim.lsp.enable('tinymist') - vim.lsp.config('tinymist', { - settings = { - formatterMode = "typstyle", - exportPdf = "onType", - semanticTokens = "disable", - } - }) - - vim.lsp.enable('millet') - vim.lsp.config('millet', { - root_dir = function(fname) - local util = vim.lsp.config.util - return util.root_pattern(".cm", ".mlb")(fname) - or util.path.dirname(fname) - end - }) - vim.lsp.enable('clangd') vim.lsp.config('clangd', { capabilities = capabilities @@ -60,24 +37,12 @@ return { }) end, dependencies = { - 'ray-x/lsp_signature.nvim', 'hrsh7th/nvim-cmp', } }, - { - 'ray-x/lsp_signature.nvim', - event = 'VeryLazy', - opts = { - hind_prefix = 'λ ', - }, - }, { 'j-hui/fidget.nvim', config = true, event = 'VeryLazy', }, - { - 'onsails/lspkind.nvim', - event = 'VeryLazy', - } } diff --git a/nvim/.config/nvim/lua/plugins/ui.lua b/nvim/.config/nvim/lua/plugins/ui.lua index 7bb9f78..1be35a1 100644 --- a/nvim/.config/nvim/lua/plugins/ui.lua +++ b/nvim/.config/nvim/lua/plugins/ui.lua @@ -1,8 +1,4 @@ return { - { - 'stevearc/dressing.nvim', - opts = {}, - }, { "nvim-neo-tree/neo-tree.nvim", branch = "v3.x", diff --git a/nvim/.config/nvim/lua/plugins/utils.lua b/nvim/.config/nvim/lua/plugins/utils.lua index 56c6659..dde0a76 100644 --- a/nvim/.config/nvim/lua/plugins/utils.lua +++ b/nvim/.config/nvim/lua/plugins/utils.lua @@ -5,10 +5,6 @@ return { event = 'VeryLazy', config = true, }, - { - 'mateuszwieloch/automkdir.nvim', - event = 'VeryLazy', - }, { 'NeogitOrg/neogit', dependencies = { @@ -72,28 +68,4 @@ return { navigator.setup() end }, - { - 'echasnovski/mini.align', - version = false, - opts = { - -- modifiers = { - -- i = function(steps, _) - -- table.insert(steps.pre_split, align.gen_step.ignore_split({ '".-"', "'.-'", '(.-)' })) - -- end - -- } - } - }, - { - 'stevearc/conform.nvim', - opts = { - formatters_by_ft = { - rust = { 'rustfmt', lsp_format = 'fallback' }, - sml = { 'smlfmt' }, - }, - format_on_save = { - timeout_ms = 500, - lsp_format = 'fallback', - } - } - } }