dot-config/nvim/lazy-lock.json

@@ -1,29 +1,28 @@
 {
-  "Comment.nvim": { "branch": "master", "commit": "e30b7f2008e52442154b66f7c519bfd2f1e32acb" },
-  "LuaSnip": { "branch": "master", "commit": "e808bee352d1a6fcf902ca1a71cee76e60e24071" },
-  "cmp-nvim-lsp": { "branch": "main", "commit": "39e2eda76828d88b773cc27a3f61d2ad782c922d" },
+  "Comment.nvim": { "branch": "master", "commit": "0236521ea582747b58869cb72f70ccfa967d2e89" },
+  "LuaSnip": { "branch": "master", "commit": "80a8528f084a97b624ae443a6f50ff8074ba486b" },
+  "cmp-nvim-lsp": { "branch": "main", "commit": "44b16d11215dce86f253ce0c30949813c0a90765" },
   "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" },
   "fidget.nvim": { "branch": "main", "commit": "0ba1e16d07627532b6cae915cc992ecac249fb97" },
-  "gitsigns.nvim": { "branch": "main", "commit": "863903631e676b33e8be2acb17512fdc1b80b4fb" },
-  "hererocks": { "branch": "master", "commit": "8bd2fcfdd65cfa7535ce39ea372a63b0bdb8e528" },
-  "lazy.nvim": { "branch": "main", "commit": "1159bdccd8910a0fd0914b24d6c3d186689023d9" },
-  "lualine.nvim": { "branch": "master", "commit": "b431d228b7bbcdaea818bdc3e25b8cdbe861f056" },
-  "neodev.nvim": { "branch": "main", "commit": "46aa467dca16cf3dfe27098042402066d2ae242d" },
-  "nvim-cmp": { "branch": "main", "commit": "ae644feb7b67bf1ce4260c231d1d4300b19c6f30" },
-  "nvim-lspconfig": { "branch": "master", "commit": "8868928d20b392e24dafaafff8c1d75167726fbe" },
+  "gitsigns.nvim": { "branch": "main", "commit": "af0f583cd35286dd6f0e3ed52622728703237e50" },
+  "lazy.nvim": { "branch": "main", "commit": "16603c6917435d8446f7357cb61095138a417085" },
+  "lualine.nvim": { "branch": "master", "commit": "2248ef254d0a1488a72041cfb45ca9caada6d994" },
+  "neodev.nvim": { "branch": "main", "commit": "f3f5d756f4043180523bb69072a104f7216b5f42" },
+  "nvim-cmp": { "branch": "main", "commit": "51260c02a8ffded8e16162dcf41a23ec90cfba62" },
+  "nvim-lspconfig": { "branch": "master", "commit": "d0467b9574b48429debf83f8248d8cee79562586" },
   "nvim-lua-gf": { "branch": "main", "commit": "ca712497b2bab6351518917be219e9bfd8d63e4f" },
-  "nvim-surround": { "branch": "main", "commit": "ec2dc7671067e0086cdf29c2f5df2dd909d5f71f" },
-  "nvim-treesitter": { "branch": "master", "commit": "98a33cc524c85a78a1ff5a707998629b24cbf8c2" },
-  "nvim-treesitter-textsubjects": { "branch": "master", "commit": "a8d2844bba925d9450ef7ab215f3b054028288ca" },
-  "nvim-web-devicons": { "branch": "master", "commit": "6b53401918a9033a41159d012160c5fb5eb249ae" },
-  "onedark.nvim": { "branch": "master", "commit": "fae34f7c635797f4bf62fb00e7d0516efa8abe37" },
-  "penlight": { "branch": "master", "commit": "e5e47e0aaaed07db9bbeabd9edb8fb2600759ea1" },
-  "plenary.nvim": { "branch": "master", "commit": "2d9b06177a975543726ce5c73fca176cedbffe9d" },
-  "telescope-fzf-native.nvim": { "branch": "main", "commit": "cf48d4dfce44e0b9a2e19a008d6ec6ea6f01a83b" },
-  "telescope.nvim": { "branch": "0.1.x", "commit": "a0bbec21143c7bc5f8bb02e0005fa0b982edc026" },
-  "unimpaired-which-key.nvim": { "branch": "main", "commit": "c35f413a631e2d2a29778cc390e4d2da28fc2727" },
-  "vim-fugitive": { "branch": "master", "commit": "d4877e54cef67f5af4f950935b1ade19ed6b7370" },
-  "vim-sleuth": { "branch": "master", "commit": "be69bff86754b1aa5adcbb527d7fcd1635a84080" },
+  "nvim-surround": { "branch": "main", "commit": "4f0e1f470595af067eca9b872778d83c7f52f134" },
+  "nvim-treesitter": { "branch": "master", "commit": "c36681bb496ebce2946867459ed08774cb61788c" },
+  "nvim-treesitter-textsubjects": { "branch": "master", "commit": "48b3bf54e32f23e2299c59ff76fa3b0599565b39" },
+  "nvim-web-devicons": { "branch": "master", "commit": "5de460ca7595806044eced31e3c36c159a493857" },
+  "onedark.nvim": { "branch": "master", "commit": "b9acd92ded2ba155867ca5af9d618e933d96e3b0" },
+  "penlight": { "branch": "master", "commit": "dc6d19c5c1e1b4ac55b14df17b7645af6b410140" },
+  "plenary.nvim": { "branch": "master", "commit": "50012918b2fc8357b87cff2a7f7f0446e47da174" },
+  "telescope-fzf-native.nvim": { "branch": "main", "commit": "6c921ca12321edaa773e324ef64ea301a1d0da62" },
+  "telescope.nvim": { "branch": "0.1.x", "commit": "7011eaae0ac1afe036e30c95cf80200b8dc3f21a" },
+  "unimpaired-which-key.nvim": { "branch": "main", "commit": "321a247ecbbb31a59a8580350eec044b88d82e81" },
+  "vim-fugitive": { "branch": "master", "commit": "46eaf8918b347906789df296143117774e827616" },
+  "vim-sleuth": { "branch": "master", "commit": "1cc4557420f215d02c4d2645a748a816c220e99b" },
   "vim-unimpaired": { "branch": "master", "commit": "6d44a6dc2ec34607c41ec78acf81657248580bf1" },
-  "which-key.nvim": { "branch": "main", "commit": "8badb359f7ab8711e2575ef75dfe6fbbd87e4821" }
+  "which-key.nvim": { "branch": "main", "commit": "4433e5ec9a507e5097571ed55c02ea9658fb268a" }
 }

dot-config/nvim/lua/dot_vim/lsp.lua

@@ -35,7 +35,7 @@ local servers = {
 	pylsp = {},
 	solargraph = {},
 	taplo = {},
-	ts_ls = {},
+	tsserver = {},
 	yamlls = {},
 }
 

dot-config/nvim/lua/dot_vim/plugins.lua

@@ -24,7 +24,9 @@ return {
 	-- Unimpaired's handy bracket mappings, but also which-key.nvim knows about them and can remind me of them.
 	{"afreakk/unimpaired-which-key.nvim", dependencies = {"tpope/vim-unimpaired"}, config = function()
 		local wk = require "which-key"
-		wk.add(require "unimpaired-which-key")
+		local uwk = require "unimpaired-which-key"
+		wk.register(uwk.normal_mode)
+		wk.register(uwk.normal_and_visual_mode, {mode = {"n", "v"}})
 	end},
 
 	-- Fuzzy finder for all sorts of things. Files, buffers, LSP references and definitions, the list goes on.

dot-config/vim/init.vim

@@ -107,8 +107,6 @@ g:GPGDefaultRecipients = [
 	'Danielle McLean <dani@00dani.me>',
 ]
 
-g:javascript_plugin_jsdoc = 1
-
 g:markdown_folding = 1
 g:markdown_fenced_languages = [
 	'bash', 'c', 'dockerfile',
@@ -123,11 +121,6 @@ g:markdown_fenced_languages = [
 set updatetime=100
 g:signify_number_highlight = 1
 
-g:ale_linters = {
-	javascript: ['eslint'],
-	javascriptreact: ['eslint'],
-	typescript: ['eslint'],
-}
 g:ale_fixers = {
 	python: ['ruff', 'ruff_format'],
 }

dot-config/vim/lsp/servers.vim

@@ -12,14 +12,6 @@ const lspServers = [
 		install: 'brew install clojure-lsp/brew/clojure-lsp-native',
 	},
 
-	{
-		name: 'cue-lsp',
-		filetype: 'cue',
-		path: '/usr/local/bin/cue',
-		args: ['lsp'],
-		install: 'brew install cue-lang/tap/cue',
-	},
-
 	{
 		name: 'dockerfile-langserver',
 		filetype: 'dockerfile',

dot-config/vim/plugins.vim

@@ -157,21 +157,6 @@ minpac#add('lambdalisue/fern-ssh')
 # vim-endwise for XML. Very nice to have when working on HTML documents.
 minpac#add('alvan/vim-closetag')
 
-# Support for the CUE data language. CUE also provides an LSP, which Vim's
-# configured to use, so this plugin is mostly relevant for syntax
-# highlighting.
-minpac#add('jjo/vim-cue')
-
-# Hurlfile syntax from its official repository.
-minpac#add('Orange-OpenSource/hurl', {subdir: 'contrib/vim'})
-
-# Lots of extra syntax support for JavaScript along with its relatives
-# (TypeScript, CoffeeScript) since Vim's built-in support is a bit dated.
-minpac#add('kchmck/vim-coffee-script')
-minpac#add('pangloss/vim-javascript')
-minpac#add('MaxMEllon/vim-jsx-pretty')
-minpac#add('HerringtonDarkholme/yats.vim')
-
 # Syntax and indent support for Jinja2 templates.
 minpac#add('lepture/vim-jinja')