From 2bfaa76ec541d8f1fdfa66425ba30ea071ec5b95 Mon Sep 17 00:00:00 2001
From: george <george@wens.org.uk>
Date: Tue, 11 Feb 2025 19:27:57 +0000
Subject: [PATCH] tidy slightly

---
 init.vim     | 17 ++++-------------
 lua/init.lua | 15 +++++++++------
 2 files changed, 13 insertions(+), 19 deletions(-)

diff --git a/init.vim b/init.vim
index f2b94ac..745b252 100644
--- a/init.vim
+++ b/init.vim
@@ -22,17 +22,17 @@ set scrolloff=8
 set hidden
 set signcolumn=yes
 set colorcolumn=110
-set list 
+set list
 
 autocmd BufWritePost *.tex !echo | pdflatex % >/dev/null
 
 call plug#begin("~/.nvim/plugged")
+
 Plug 'rust-lang/rust.vim'
 Plug 'nvim-treesitter/nvim-treesitter', {'do': ':TSUpdate'}
 Plug 'neovim/nvim-lspconfig'
 Plug 'mbbill/undotree'
 Plug 'sbdchd/neoformat'
-Plug 'gruvbox-community/gruvbox'
 Plug 'folke/tokyonight.nvim', { 'branch': 'main' }
 Plug 'nvim-lua/plenary.nvim'
 Plug 'nvim-telescope/telescope.nvim'
@@ -42,21 +42,17 @@ Plug 'darrikonn/vim-gofmt', { 'do': ':GoUpdateBinaries' }
 "Plug 'fatih/vim-go'
 Plug 'preservim/nerdtree'
 Plug 'udalov/kotlin-vim'
-
 Plug 'hrsh7th/cmp-nvim-lsp'
 Plug 'hrsh7th/cmp-buffer'
 Plug 'hrsh7th/nvim-cmp'
 Plug 'L3MON4D3/LuaSnip'
 Plug 'EdenEast/nightfox.nvim'
 Plug 'itchyny/lightline.vim'
-"EEEEEEEEEEEEEEEEEEEEEEEEEEEee
-Plug 'ThePrimeagen/vim-be-good'
 Plug 'tpope/vim-fugitive'
 Plug 'simrat39/rust-tools.nvim'
 
 call plug#end()
 
-"colorscheme gruvbox
 colorscheme tokyonight
 
 let mapleader = " "
@@ -65,15 +61,10 @@ nnoremap <C-p> :lua require ('telescope.builtin').git_files()<CR>
 nnoremap <C-f> :lua require ('telescope.builtin').find_files()<CR>
 nnoremap <leader>f :lua require('telescope.builtin').live_grep()<CR>
 nnoremap <leader><tab> :lua require('telescope.builtin').buffers()<CR>
-"nnoremap <leader><tab> :b<space>
 nnoremap <leader>y "+y
-
-lua require("init")
-
 nnoremap gd :lua vim.lsp.buf.definition()<CR>
 nnoremap K  :lua vim.lsp.buf.hover()<CR>
 nnoremap L  :lua vim.diagnostic.open_float()<CR>
-
-"autocmd BufWritePost *.go GoImports
-
 nnoremap <C-n> :NERDTreeToggle<CR>
+
+lua require("init")
diff --git a/lua/init.lua b/lua/init.lua
index 83f9a33..a6b5fc2 100644
--- a/lua/init.lua
+++ b/lua/init.lua
@@ -34,9 +34,10 @@ local cmp = require("cmp")
 
 local capabilities = require('cmp_nvim_lsp').default_capabilities(vim.lsp.protocol.make_client_capabilities())
 
-require("lspconfig").tsserver.setup({})
+require("lspconfig").ts_ls.setup({})
 
 require("lspconfig").clangd.setup({})
+
 require("lspconfig").gopls.setup({
 	cmd = { "gopls", "serve" },
 	settings = {
@@ -57,7 +58,6 @@ require("lspconfig").rust_analyzer.setup({
         ['rust-analyzer'] = { 
             checkOnSave = {
                 allFeatures = true,
-                
                 overrideCommand = {
                     'cargo', 'clippy', '--workspace', '--message-format=json',
                     '--all-targets', '--all-features'
@@ -67,7 +67,6 @@ require("lspconfig").rust_analyzer.setup({
     }
 })
 
-
 require('lspconfig').kotlin_language_server.setup({
     cmd = { "kotlin-language-server" },
     filetypes = { "kotlin"} ,
@@ -92,9 +91,13 @@ vim.lsp.handlers["textDocument/publishDiagnostics"] = vim.lsp.with(
       vim.lsp.diagnostic.on_publish_diagnostics, {
         update_in_insert = true,
       }
-    )
+)
 
+require'lspconfig'.cmake.setup{}
 
+local capabilities = vim.lsp.protocol.make_client_capabilities()
+capabilities.textDocument.completion.completionItem.snippetSupport = true
 
---require'lspconfig'.basedpyright.setup{}
-require'lspconfig'.cmake.setup{}
+require'lspconfig'.html.setup {
+  capabilities = capabilities,
+}