more fixing of indentation and plugin order and completion

.config/nvim/init.lua

@@ -43,13 +43,13 @@ vim.g.colors_name = 'spacechalk'
 -- starting page for neovim
 require('user.dashboard')
 
+-- completion from nvim-cmp
+require('user.completion')
+
 -- Language Server configs and other syntax checking and highlight tools
 require('user.lsp-configs')
 require('user.tree-sitter')
 
--- completion from nvim-cmp
-require('user.completion')
-
 -- folding
 require('user.folding')
 

.config/nvim/lua/plugins.lua

@@ -67,29 +67,36 @@ return require('packer').startup(function(use)
     use {'airblade/vim-gitgutter'}
 
     -- ---------------- syntax highlighting installer ------------------------
+
     -- preferred colorscheme right now
     use {'space-chalk/spacechalk.vim'}
+    -- backup colorscheme in case everything is broken
+    -- use {'folke/tokyonight.nvim'}
 
     use {'nvim-treesitter/nvim-treesitter'}
     -- I have this mostly for the :TSHighlightCapturesUnderCursor command
     -- https://github.com/nvim-treesitter/playground/pull/9
     use {'nvim-treesitter/playground'}
 
+    -- because indenting is still broken in treesitter for python
+    -- ref: https://github.com/nvim-treesitter/nvim-treesitter/issues/1136
+    use({"yioneko/nvim-yati",
+         tag = "*",
+         requires = "nvim-treesitter/nvim-treesitter"
+         })
+
     -- This is helpful for markdown -- 'junegunn/limelight.config/vim'
     use {'junegunn/limelight.vim'}
 
     -- ---------------- Language Server Protocol Plugins ---------------------
-
-    -- this helps to configure the built-in language server protocol for nvim
-    use {'neovim/nvim-lspconfig'}
-    use {'williamboman/mason.nvim'}
-    use {'williamboman/mason-lspconfig.nvim'}
-
+    --
     -- --------- completion for the above language servers and more ----------
     use {'hrsh7th/cmp-nvim-lsp'}
     use {'hrsh7th/cmp-buffer'}
     use {'hrsh7th/cmp-path'}
     use {'hrsh7th/cmp-cmdline'}
+    -- automatically type the closing }]"
+    use {'windwp/nvim-autopairs'}
     -- emojis and nerfont icon completions
     use {'hrsh7th/cmp-emoji'}
     use {'chrisgrieser/cmp-nerdfont'}
@@ -98,17 +105,17 @@ return require('packer').startup(function(use)
     -- our preferred neovim autocompletion plugin
     use {'hrsh7th/nvim-cmp'}
 
+    -- this helps to configure the built-in language server protocol for nvim
+    use {'neovim/nvim-lspconfig'}
+    use {'williamboman/mason.nvim'}
+    use {'williamboman/mason-lspconfig.nvim'}
+
     -- ------------------- fuzzy completion for files ------------------------
     -- telescope: extendable fuzzy finder over lists
     use {'nvim-telescope/telescope.nvim', tag = '0.1.0',
          requires = { {'nvim-lua/plenary.nvim'} }
     }
 
-    -- ------------------------- general linter ------------------------------
-    -- will use common linters and highlight broken code
-    -- being replaced by native lsp 
-    -- use {'dense-analysis/ale'}
-
     -- --------------------- Language Specific Stuff -------------------------
 
     -- for highlighting hex colors (in vim, CSS, JS, HTML)

.config/nvim/lua/user/completion.lua

@@ -76,8 +76,8 @@ cmp.setup.cmdline(':', {
 })
 
 -- Set up lspconfig.
-local capabilities = require('cmp_nvim_lsp').default_capabilities()
+-- local capabilities = require('cmp_nvim_lsp').default_capabilities()
 
-require('lspconfig').jedi_language_server.setup {
-   capabilities = capabilities
-}
+-- require('lspconfig').jedi_language_server.setup {
+--     capabilities = capabilities
+-- }

.config/nvim/lua/user/lsp-configs.lua

@@ -7,60 +7,81 @@ require("mason-lspconfig").setup {
   automatic_installation = true
 }
 
+-- Set up lspconfig.
+local capabilities = require('cmp_nvim_lsp').default_capabilities()
+
 -- all of the below are referenced from the neovim nvim-lspconfig repo
 -- ref: github.com/neovim/nvim-lspconfig/blob/master/doc/server_configurations.md
 
+
 -- Setup the language servers so that they're available for our LSP client.
 local nvim_lsp = require('lspconfig')
 
 -- ansible (may require npm install -g @ansible/ansible-language-server)
-nvim_lsp.ansiblels.setup{}
+nvim_lsp.ansiblels.setup{
+   capabilities = capabilities
+}
 
 -- bash (may require npm i -g bash-language-server)
-nvim_lsp.bashls.setup{}
+nvim_lsp.bashls.setup{
+   capabilities = capabilities
+}
 
 -- lua (may require brew install lua-language-server)
 nvim_lsp.lua_ls.setup{
     settings = {
         Lua = {
             runtime = {
-    	-- version of Lua you're using (LuaJIT in the case of Neovim)
-    	version = 'LuaJIT',
-          },
-          diagnostics = {
-    	-- Get the language server to recognize the `vim` global
-    	globals = {'vim'},
-          },
-          workspace = {
-    	-- Make the server aware of Neovim runtime files
-    	library = vim.api.nvim_get_runtime_file("", true),
-          },
-          -- Do not send telemetry data containing a randomized but unique identifier
-          telemetry = {
-    	enable = false,
-          },
+                -- version of Lua you're using (LuaJIT in the case of Neovim)
+                version = 'LuaJIT',
+            },
+            diagnostics = {
+                -- Get the language server to recognize the `vim`
+                globals = {'vim'},
+            },
+            workspace = {
+                -- Make the server aware of Neovim runtime
+                library = vim.api.nvim_get_runtime_file("", true),
+            },
+            -- Do not send telemetry data containing a randomized but unique
+            telemetry = {
+                enable = false,
+            },
         },
-      },
+    },
 }
 
 -- docker (may require npm install -g dockerfile-language-server-nodejs)
-nvim_lsp.dockerls.setup{}
+nvim_lsp.dockerls.setup{
+   capabilities = capabilities
+}
 
 -- markdown (may require brew install marksman)
-nvim_lsp.marksman.setup{}
+nvim_lsp.marksman.setup{
+   capabilities = capabilities
+}
 
 -- python
-nvim_lsp.jedi_language_server.setup{}
+nvim_lsp.jedi_language_server.setup{
+   capabilities = capabilities
+}
+
+-- python - ruff linting
+nvim_lsp.ruff_lsp.setup{}
 
 -- terraform
-nvim_lsp.terraformls.setup{}
+nvim_lsp.terraformls.setup{
+   capabilities = capabilities
+}
 
 -- Terraform linter that can act as lsp server.
 -- Installation ref: https://github.com/terraform-linters/tflint#installation
 -- nvim_lsp.tflint.setup{}
 
 -- toml ( may require cargo install --features lsp --locked taplo-cli)
-nvim_lsp.taplo.setup{}
+nvim_lsp.taplo.setup{
+   capabilities = capabilities
+}
 
 -- yaml - not sure if this is worth it yet
 -- github.com/neovim/nvim-lspconfig/blob/master/doc/server_configurations.md#yamlls
@@ -69,7 +90,15 @@ nvim_lsp.yamlls.setup {
     yaml = {
       schemas = {
         ["https://raw.githubusercontent.com/yannh/kubernetes-json-schema/master/v1.23.0-standalone-strict/all.json"] = "/*.k8s.yaml",
-      },
-    },
-  }
+            },
+    }},
+    capabilities = capabilities
 }
+
+-- change the diagnostic signs to be nerdfonts
+local signs = { Error = "", Warn = "", Hint = "", Info = "" }
+
+for type, icon in pairs(signs) do
+  local hl = "DiagnosticSign" .. type
+  vim.fn.sign_define(hl, { text = icon, texthl = hl, numhl = hl })
+end

.config/nvim/lua/user/scrollbar.lua

@@ -14,7 +14,7 @@ require("scrollbar").setup({
     },
     marks = {
         Error = {
-            text = { "", "" },
+            text = { "!", "!" },
             priority = 2,
             gui=nil,
             color = nil,
@@ -23,7 +23,7 @@ require("scrollbar").setup({
             highlight = "DiagnosticVirtualTextError",
         },
         Warn = {
-            text = { "裂", "" },
+            text = { "", "" },
             priority = 3,
             gui=nil,
             color = nil,

.config/nvim/plugin/packer_compiled.lua

@@ -80,7 +80,7 @@ _G.packer_plugins = {
     url = "https://github.com/numToStr/FTerm.nvim"
   },
   ["barbecue.nvim"] = {
-    config = { "\27LJ\2\nf\0\0\3\0\4\0\a6\0\0\0'\2\1\0B\0\2\0029\0\2\0005\2\3\0B\0\2\1K\0\1\0\1\0\2\17show_dirname\1\30context_follow_icon_color\2\nsetup\rbarbecue\frequire\0" },
+    config = { "\27LJ\2\nf\0\0\3\0\4\0\a6\0\0\0'\2\1\0B\0\2\0029\0\2\0005\2\3\0B\0\2\1K\0\1\0\1\0\2\30context_follow_icon_color\2\17show_dirname\1\nsetup\rbarbecue\frequire\0" },
     loaded = true,
     path = "/Users/jhitch/.local/share/nvim/site/pack/packer/start/barbecue.nvim",
     url = "https://github.com/utilyre/barbecue.nvim"
@@ -153,6 +153,11 @@ _G.packer_plugins = {
     path = "/Users/jhitch/.local/share/nvim/site/pack/packer/start/nui.nvim",
     url = "https://github.com/MunifTanjim/nui.nvim"
   },
+  ["nvim-autopairs"] = {
+    loaded = true,
+    path = "/Users/jhitch/.local/share/nvim/site/pack/packer/start/nvim-autopairs",
+    url = "https://github.com/windwp/nvim-autopairs"
+  },
   ["nvim-cmp"] = {
     loaded = true,
     path = "/Users/jhitch/.local/share/nvim/site/pack/packer/start/nvim-cmp",
@@ -253,7 +258,7 @@ _G.packer_plugins = {
 time([[Defining packer_plugins]], false)
 -- Config for: barbecue.nvim
 time([[Config for barbecue.nvim]], true)
-try_loadstring("\27LJ\2\nf\0\0\3\0\4\0\a6\0\0\0'\2\1\0B\0\2\0029\0\2\0005\2\3\0B\0\2\1K\0\1\0\1\0\2\17show_dirname\1\30context_follow_icon_color\2\nsetup\rbarbecue\frequire\0", "config", "barbecue.nvim")
+try_loadstring("\27LJ\2\nf\0\0\3\0\4\0\a6\0\0\0'\2\1\0B\0\2\0029\0\2\0005\2\3\0B\0\2\1K\0\1\0\1\0\2\30context_follow_icon_color\2\17show_dirname\1\nsetup\rbarbecue\frequire\0", "config", "barbecue.nvim")
 time([[Config for barbecue.nvim]], false)
 vim.cmd [[augroup packer_load_aucmds]]
 vim.cmd [[au!]]