Backup

dotfiles/neovim/lua/my/plugins/init.lua

@@ -12,6 +12,8 @@ function M.setup()
 
   env.vscode.unless(function()
     env.firevim.unless(function()
+      require('my.plugins.neoconf').setup()
+
       require("presence"):setup({})
       require("my.plugins.nvim-tree").setup()
       require("my.plugins.lualine").setup()
@@ -23,6 +25,7 @@ function M.setup()
       -- require("my.plugins.noice").setup()
     end)
 
+    require("my.plugins.neodev").setup()
     require("my.plugins.dashboard").setup()
     require("my.plugins.treesitter").setup()
     require("my.plugins.cmp").setup()
@@ -30,7 +33,7 @@ function M.setup()
     require("my.plugins.lspconfig").setup()
     require("my.plugins.null-ls").setup()
     require("my.plugins.vimtex").setup()
-    require("my.plugins.lean").setup()
+    -- require("my.plugins.lean").setup()
     -- require("my.plugins.notify").setup()
   end)
 

dotfiles/neovim/lua/my/plugins/lspconfig.lua

@@ -36,6 +36,7 @@ function M.on_attach(client, bufnr)
 end
 
 -- General server config
+---@type lspconfig.options
 local servers = {
   tsserver = {
     on_attach = function(client, bufnr)
@@ -45,29 +46,6 @@ local servers = {
     end
   },
   dhall_lsp_server = {},
-  sumneko_lua = {
-    settings = {
-      Lua = {
-        runtime = {
-          -- Tell the language server which version of Lua you're using (most likely LuaJIT in the case of Neovim)
-          version = 'LuaJIT',
-          -- Setup your lua path
-          path = runtime_path
-        },
-        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 }
-      }
-    },
-    cmd = { "lua-language-server" }
-  },
   purescriptls = {
     settings = {
       purescript = {
@@ -84,22 +62,11 @@ local servers = {
   },
   rnix = {},
   cssls = {},
+  jsonls = {},
   rust_analyzer = {},
-  -- texlab = {
-  --   build = {
-  --     executable = "tectonic",
-  --     args = {
-  --       "-X",
-  --       "compile",
-  --       "%f",
-  --       "--synctex",
-  --       "--keep-logs",
-  --       "--keep-intermediates"
-  --     }
-  --   }
-  -- },
-  kotlin_language_server = {}
-  -- agda = {}, Haven't gotten this one to work yet
+  sumneko_lua = {
+    cmd = { "lua-language-server", "--logpath=/home/adrielus/.local/share/lua-language-server/log" }
+  }
 }
 
 M.capabilities = require('cmp_nvim_lsp').default_capabilities()

dotfiles/neovim/lua/my/plugins/neoconf.lua

@@ -0,0 +1,14 @@
+local M = {}
+
+function M.setup()
+  require("neoconf").setup({
+    -- import existing settinsg from other plugins
+    import = {
+      vscode = true, -- local .vscode/settings.json
+      coc = false, -- global/local coc-settings.json
+      nlsp = false -- global/local nlsp-settings.nvim json settings
+    },
+  })
+end
+
+return M

dotfiles/neovim/lua/my/plugins/neodev.lua

@@ -0,0 +1,7 @@
+local M = {}
+
+function M.setup()
+  require("neodev").setup()
+end
+
+return M

dotfiles/neovim/lua/my/plugins/treesitter.lua

@@ -14,6 +14,7 @@ function M.setup()
       "fish",
       "html",
       "json",
+      "jsonc",
       "latex",
       "python",
       "rust",
@@ -30,7 +31,7 @@ function M.setup()
     highlight = {
       enable = true,
 
-      disable = { "kotlin", "tex", "latex", "lean" },
+      disable = { "kotlin", "tex", "latex" },
 
       -- Setting this to true will run `:h syntax` and tree-sitter at the same time.
       -- Set this to `true` if you depend on 'syntax' being enabled (like for indentation).