From 5faf58e79c5d526045690219cc2b6a59fc2af325 Mon Sep 17 00:00:00 2001 From: Ben Kreeger Date: Mon, 1 Sep 2025 20:29:00 -0500 Subject: [PATCH] Tighten up LSP and JSDoc settings for JS files --- nvim/lazy-lock.json | 24 ++++++++++---------- nvim/lua/config/settings.lua | 38 ++++++++++++++++---------------- nvim/lua/plugins/40-lsp.lua | 1 + nvim/lua/plugins/60-comments.lua | 22 ++++++++++++++---- 4 files changed, 50 insertions(+), 35 deletions(-) diff --git a/nvim/lazy-lock.json b/nvim/lazy-lock.json index 8d67ac4..15c2b7a 100644 --- a/nvim/lazy-lock.json +++ b/nvim/lazy-lock.json @@ -1,28 +1,29 @@ { - "avante.nvim": { "branch": "main", "commit": "fed6902c9a9a3c4473238e924cddc1ba19f3195b" }, + "avante.nvim": { "branch": "main", "commit": "8794356cf4af90b6677696e3f772ac18c51face4" }, "barbar.nvim": { "branch": "master", "commit": "53b5a2f34b68875898f0531032fbf090e3952ad7" }, "blink.cmp": { "branch": "main", "commit": "bae4bae0eedd1fa55f34b685862e94a222d5c6f8" }, - "catppuccin": { "branch": "main", "commit": "9a9a875e979fe9d2b42423d056f944dd286d0280" }, - "conform.nvim": { "branch": "master", "commit": "973f3cb73887d510321653044791d7937c7ec0fa" }, - "dropbar.nvim": { "branch": "master", "commit": "418897fe7828b2749ca78056ec8d8ad43136b695" }, - "fidget.nvim": { "branch": "main", "commit": "2cb5edb2dd6700a958a446b20bb2be04d318da9d" }, + "catppuccin": { "branch": "main", "commit": "30fa4d122d9b22ad8b2e0ab1b533c8c26c4dde86" }, + "conform.nvim": { "branch": "master", "commit": "b4aab989db276993ea5dcb78872be494ce546521" }, + "dropbar.nvim": { "branch": "master", "commit": "a0ad7e24e9dfde6f0b11f6a436f56aeceaf58e9b" }, + "fidget.nvim": { "branch": "main", "commit": "4d5858bd4c471c895060e1b9f3575f1551184dc5" }, "gitsigns.nvim": { "branch": "main", "commit": "6e3c66548035e50db7bd8e360a29aec6620c3641" }, "lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" }, "lazydev.nvim": { "branch": "main", "commit": "2367a6c0a01eb9edb0464731cc0fb61ed9ab9d2c" }, "lualine.nvim": { "branch": "master", "commit": "b8c23159c0161f4b89196f74ee3a6d02cdc3a955" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "1ec4da522fa49dcecee8d190efda273464dd2192" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "5e085efe67fccb13372d54331d849219662a7e93" }, "mason-tool-installer.nvim": { "branch": "main", "commit": "517ef5994ef9d6b738322664d5fdd948f0fdeb46" }, "mason.nvim": { "branch": "main", "commit": "7dc4facca9702f95353d5a1f87daf23d78e31c2a" }, - "mini.nvim": { "branch": "main", "commit": "5d938b3a078a7eeae23ba9f04f180066ab8bd9ef" }, - "neo-tree.nvim": { "branch": "main", "commit": "bbeda076c8a2e7d16614287cd70239f577e5bf55" }, + "mini.nvim": { "branch": "main", "commit": "ddb70da6ec6aa896cfde87350d1e8dffb57ddef0" }, + "neo-tree.nvim": { "branch": "main", "commit": "5bb90268c45010842a12821ba34af650b8f97bfc" }, + "neogen": { "branch": "main", "commit": "d7f9461727751fb07f82011051338a9aba07581d" }, "nui.nvim": { "branch": "main", "commit": "de740991c12411b663994b2860f1a4fd0937c130" }, "nvim-autopairs": { "branch": "master", "commit": "23320e75953ac82e559c610bec5a90d9c6dfa743" }, - "nvim-lspconfig": { "branch": "master", "commit": "34c9ecfdcc19d579f51c072300a71445fbec9da8" }, + "nvim-lspconfig": { "branch": "master", "commit": "cb4765526f7201ce4ff0c49888f80c18da614e68" }, "nvim-notify": { "branch": "master", "commit": "397c7c1184745fca649e5104de659e6392ef5a4d" }, - "nvim-surround": { "branch": "main", "commit": "d56752df477ebd808cb82cea2fc68cf7455abb21" }, + "nvim-surround": { "branch": "main", "commit": "a868c256c861044beb9794b4dd126480dcdfbdad" }, "nvim-treesitter": { "branch": "master", "commit": "42fc28ba918343ebfd5565147a42a26580579482" }, "nvim-treesitter-textobjects": { "branch": "master", "commit": "71385f191ec06ffc60e80e6b0c9a9d5daed4824c" }, - "nvim-web-devicons": { "branch": "master", "commit": "c2599a81ecabaae07c49ff9b45dcd032a8d90f1a" }, + "nvim-web-devicons": { "branch": "master", "commit": "f66cdfef5e84112045b9ebc3119fee9bddb3c687" }, "plenary.nvim": { "branch": "master", "commit": "b9fd5226c2f76c951fc8ed5923d85e4de065e509" }, "project-cli-commands.nvim": { "branch": "main", "commit": "9a2a2fdfd38a3d71cc927e3a398ac0ddfa846b3d" }, "telescope-fzf-native.nvim": { "branch": "main", "commit": "1f08ed60cafc8f6168b72b80be2b2ea149813e55" }, @@ -30,7 +31,6 @@ "telescope.nvim": { "branch": "master", "commit": "b4da76be54691e854d3e0e02c36b0245f945c2c7" }, "todo-comments.nvim": { "branch": "main", "commit": "304a8d204ee787d2544d8bc23cd38d2f929e7cc5" }, "toggleterm.nvim": { "branch": "main", "commit": "9a88eae817ef395952e08650b3283726786fb5fb" }, - "trouble.nvim": { "branch": "main", "commit": "85bedb7eb7fa331a2ccbecb9202d8abba64d37b3" }, "vim-visual-multi": { "branch": "master", "commit": "a6975e7c1ee157615bbc80fc25e4392f71c344d4" }, "which-key.nvim": { "branch": "main", "commit": "370ec46f710e058c9c1646273e6b225acf47cbed" } } diff --git a/nvim/lua/config/settings.lua b/nvim/lua/config/settings.lua index 3f8d67e..41e0584 100644 --- a/nvim/lua/config/settings.lua +++ b/nvim/lua/config/settings.lua @@ -1,47 +1,47 @@ local opt = vim.opt -- Columns and gutters -opt.colorcolumn = "80" -- Highlight column 80 -opt.number = true -- Line numbers in the gutter +opt.colorcolumn = "80,100" -- Highlight column 80 +opt.number = true -- Line numbers in the gutter opt.relativenumber = true -- Relative line numbers in the gutter -opt.signcolumn = "yes:1" -- Sign column in the gutter always visible +opt.signcolumn = "yes:1" -- Sign column in the gutter always visible -- Indentation -opt.autoindent = true -- Enable auto-indentation +opt.autoindent = true -- Enable auto-indentation opt.breakindent = true -- ? -opt.expandtab = true -- Default to spaces instead of tabs -opt.shiftround = true -- Round indent to multiple of shift-width -opt.shiftwidth = 4 -- Number of spaces when auto-indenting -opt.softtabstop = 4 -- Number of spaces for a tab when editing -opt.tabstop = 4 -- Number of spaces for a tab +opt.expandtab = true -- Default to spaces instead of tabs +opt.shiftround = true -- Round indent to multiple of shift-width +opt.shiftwidth = 4 -- Number of spaces when auto-indenting +opt.softtabstop = 4 -- Number of spaces for a tab when editing +opt.tabstop = 4 -- Number of spaces for a tab -- Display and adornments -opt.cursorline = true -- Highlight current line +opt.cursorline = true -- Highlight current line opt.guifont = "Inconsolata Patched G:h12" -opt.list = true -- Show whitespace characters +opt.list = true -- Show whitespace characters opt.listchars = { tab = "» ", trail = "￮", nbsp = "␣", lead = "•" } -opt.scrolloff = 3 -- Show 3 lines above and below cursor -opt.showmode = false -- Don't show the mode since it's in our statusline -opt.termguicolors = true -- Use true terminal colors +opt.scrolloff = 3 -- Show 3 lines above and below cursor +opt.showmode = false -- Don't show the mode since it's in our statusline +opt.termguicolors = true -- Use true terminal colors opt.virtualedit = "block" opt.winborder = "rounded" -- Rounded borders for windows -- Behavior opt.confirm = true -opt.ignorecase = true -- Ignore case in search and commands +opt.ignorecase = true -- Ignore case in search and commands opt.inccommand = "split" -- Preview substitutions live -opt.mouse = "a" -- Turn on mouse support -opt.smartcase = true -- ? +opt.mouse = "a" -- Turn on mouse support +opt.smartcase = true -- ? opt.splitbelow = true opt.splitright = true opt.timeoutlen = 1000 -- Command timeout length opt.undofile = true -opt.updatetime = 250 -- ? +opt.updatetime = 250 -- ? -- Clipboard -- Sync clipboard between OS and Neovim. vim.schedule(function() - vim.opt.clipboard = "unnamedplus" + vim.opt.clipboard = "unnamedplus" end) -- Features diff --git a/nvim/lua/plugins/40-lsp.lua b/nvim/lua/plugins/40-lsp.lua index 158279f..695978f 100644 --- a/nvim/lua/plugins/40-lsp.lua +++ b/nvim/lua/plugins/40-lsp.lua @@ -6,6 +6,7 @@ local mason_lsps = { "rubocop", "rust_analyzer", "terraformls", + "ts_ls", -- Formatters "fixjson", "goimports", diff --git a/nvim/lua/plugins/60-comments.lua b/nvim/lua/plugins/60-comments.lua index b47cb51..6ea6430 100644 --- a/nvim/lua/plugins/60-comments.lua +++ b/nvim/lua/plugins/60-comments.lua @@ -1,6 +1,20 @@ return { - "folke/todo-comments.nvim", - event = "VimEnter", - dependencies = { "nvim-lua/plenary.nvim" }, - opts = { signs = false }, + { + "folke/todo-comments.nvim", + event = "VimEnter", + dependencies = { "nvim-lua/plenary.nvim" }, + opts = { signs = false }, + }, + { + "danymat/neogen", + config = true, + keys = { + { + "df", + "Neogen func", + mode = "n", + desc = "[d]ocs: for [f]unc", + }, + }, + }, }