dotfiles

commit 8d112461b1d0be35db557bec64af8a814843a3fa
parent 9e21d1de727374f2860fd2ae4e4062732e6662f9
Author: Alex Balgavy <alexander.balgavy@spaceapplications.com>
Date:   Fri,  7 Mar 2025 17:25:21 +0100

nvim: settings

Diffstat:
M
nvim/lua/config/mason-lspconfig.lua
 | 
15
++++++---------
M
nvim/lua/plugins.lua
 | 
19
+++++++------------

2 files changed, 13 insertions(+), 21 deletions(-)
diff --git a/nvim/lua/config/mason-lspconfig.lua b/nvim/lua/config/mason-lspconfig.lua
@@ -35,7 +35,8 @@ local rust_clippy = {
     "-D", "rust_2018_idioms",
     "-D", "missing_docs",
     "-D", "warnings",
-    "-A", "clippy::too_many_lines"
+    "-A", "clippy::too_many_lines",
+    "-A", "clippy::arbitrary_source_item_ordering",
   },
 }
 local servers = {
@@ -67,17 +68,11 @@ local servers = {
   docker_compose_language_service = {},
   rust_analyzer = {
     ['rust-analyzer'] = {
-      cargo = {
-        features = "all",
-        -- extraEnv = {
-        --   RUSTFLAGS = "--cfg tokio_unstable",
-        -- },
-      },
-      -- Add clippy lints for Rust.
       check = rust_clippy,
     },
+    checkOnSave = { enable = false },
+    diagnostics = { enable = false },
   },
-  pyright = {},
   rubocop = {},
   -- solargraph = {},
   -- bashls = {},
@@ -148,3 +143,5 @@ mason_lspconfig.setup_handlers {
     }
   end,
 }
+require('lspconfig').bacon_ls.setup({})
+require('lspconfig').pyright.setup({})
diff --git a/nvim/lua/plugins.lua b/nvim/lua/plugins.lua
@@ -315,9 +315,12 @@ return {
   {
     "nvim-treesitter/nvim-treesitter-context",
     dependencies = { "nvim-treesitter/nvim-treesitter" },
-    config = function()
-      require("treesitter-context").setup()
-    end
+    opts = {
+      enable = false,
+    },
+    keys = {
+      { "<leader>^", function() require('treesitter-context').toggle() end, desc = "Context" },
+    },
   },
 
   -- diagnostics
@@ -411,15 +414,6 @@ return {
       vim.api.nvim_create_user_command("BaleiaLogs", vim.g.baleia.logger.show, { bang = true })
     end,
   },
-  {
-    "OXY2DEV/markview.nvim",
-    lazy = false, -- Not needed, already handled by plugin
-
-    dependencies = {
-      "nvim-treesitter/nvim-treesitter",
-      "nvim-tree/nvim-web-devicons"
-    }
-  },
   { -- Autoformat
     'stevearc/conform.nvim',
     event = { 'BufWritePre' },
@@ -456,6 +450,7 @@ return {
         rust = { "rustfmt", lsp_format = "fallback" },
         ruby = { "rubyfmt", lsp_format = "fallback" },
         python = { "ruff_format", "ruff_organize_imports", lsp_format = "fallback" },
+        lua = { "stylua" },
         -- python = { "black", lsp_format = "fallback" },
         --   -- lua = { 'stylua' },
         --   -- Conform can also run multiple formatters sequentially