From 16606b79d327dd368e76ccfe58d901a9a7d09b20 Mon Sep 17 00:00:00 2001
From: Matt <matt@threlfall.dev>
Date: Sat, 8 Feb 2025 17:12:15 +0000
Subject: [PATCH] feat: Update nvim

---
 git-desk/.gitconfig                           |  5 ++++
 nvim/.config/nvim/lua/custom/chadrc.lua       |  6 +++++
 .../nvim/lua/custom/configs/lspconfig.lua     | 24 +++++++++++++++++++
 .../nvim/lua/custom/configs/mappings.lua      | 13 ++++++++++
 nvim/.config/nvim/lua/custom/plugins.lua      |  4 +++-
 ssh-desk/.ssh/config                          |  5 ++++
 sway/.config/sway/config                      |  3 ++-
 7 files changed, 58 insertions(+), 2 deletions(-)

diff --git a/git-desk/.gitconfig b/git-desk/.gitconfig
index 5ccdaff..05d44fa 100644
--- a/git-desk/.gitconfig
+++ b/git-desk/.gitconfig
@@ -12,3 +12,8 @@
 	gpgsign = true
 [tag]
 	gpgsign = true
+[filter "lfs"]
+	process = git-lfs filter-process
+	required = true
+	clean = git-lfs clean -- %f
+	smudge = git-lfs smudge -- %f
diff --git a/nvim/.config/nvim/lua/custom/chadrc.lua b/nvim/.config/nvim/lua/custom/chadrc.lua
index cb71add..fb4c22e 100644
--- a/nvim/.config/nvim/lua/custom/chadrc.lua
+++ b/nvim/.config/nvim/lua/custom/chadrc.lua
@@ -5,5 +5,11 @@ M.plugins = "custom.plugins"
 M.mappings = require "custom.configs.mappings"
 vim.opt.spelllang = 'en_gb'
 vim.opt.spell = true
+vim.keymap.set("n", "]g", function ()
+  vim.diagnostic.goto_next()
+end)
+vim.keymap.set("n", "[g", function ()
+  vim.diagnostic.goto_prev()
+end)
 
 return M
diff --git a/nvim/.config/nvim/lua/custom/configs/lspconfig.lua b/nvim/.config/nvim/lua/custom/configs/lspconfig.lua
index 1482111..0c360ec 100644
--- a/nvim/.config/nvim/lua/custom/configs/lspconfig.lua
+++ b/nvim/.config/nvim/lua/custom/configs/lspconfig.lua
@@ -29,8 +29,32 @@ lspconfig.tsserver.setup{
   }
 }
 
+lspconfig.tailwindcss.setup({
+  on_attach = on_attach,
+  capabilities = capabilities,
+})
+
 lspconfig.pyright.setup({
   on_attach = on_attach,
   capabilities = capabilities,
   filetypes= {"python"},
 })
+
+lspconfig.eslint.setup({
+  on_attach = on_attach,
+  capabilities = capabilities,
+})
+
+lspconfig.golangcilsp = {
+  default_config = {
+    cmd = {'golangci-lint-langserver'},
+    root_dir = lspconfig.util.root_pattern('.git', 'go.mod'),
+    init_options = {
+        command = { "golangci-lint", "run", "--out-format", "json", "--issues-exit-code=1" };
+    }
+  };
+}
+
+lspconfig.golangci_lint_ls.setup {
+	filetypes = {'go','gomod'}
+}
diff --git a/nvim/.config/nvim/lua/custom/configs/mappings.lua b/nvim/.config/nvim/lua/custom/configs/mappings.lua
index ce3d52c..158213a 100644
--- a/nvim/.config/nvim/lua/custom/configs/mappings.lua
+++ b/nvim/.config/nvim/lua/custom/configs/mappings.lua
@@ -17,6 +17,7 @@ M.dap = {
     }
   }
 }
+
 M.dap_go = {
   plugin=true,
   n = {
@@ -34,6 +35,7 @@ M.dap_go = {
     }
   }
 }
+
 M.dapui = {
   n = {
     ["<leader>dui"] = {
@@ -45,4 +47,15 @@ M.dapui = {
   }
 }
 
+M.lsp = {
+  n = {
+    ["<leader>ww"] = {
+      function()
+        vim.diagnostic.open_float()
+      end,
+      "What's wrong with this line?"
+    }
+  }
+}
+
 return M
diff --git a/nvim/.config/nvim/lua/custom/plugins.lua b/nvim/.config/nvim/lua/custom/plugins.lua
index 25665e0..71d704e 100644
--- a/nvim/.config/nvim/lua/custom/plugins.lua
+++ b/nvim/.config/nvim/lua/custom/plugins.lua
@@ -15,6 +15,8 @@ local plugins = {
         "debugpy",
         "rust-analyzer",
         "codelldb",
+        "tailwindcss-language-server",
+        "golangci-lint-langserver",
       }
     }
   },
@@ -48,7 +50,7 @@ local plugins = {
     "mfussenegger/nvim-dap-python",
     ft = "python",
     dependencies = "mfussenegger/nvim-dap",
-    config = function (_, opts)
+    config = function (_, _)
       local path = "~/.local/share/nvim/mason/packages/debugpy/venv/bin/python"
       require("dap-python").setup(path)
     end
diff --git a/ssh-desk/.ssh/config b/ssh-desk/.ssh/config
index 5931671..732b464 100644
--- a/ssh-desk/.ssh/config
+++ b/ssh-desk/.ssh/config
@@ -1,2 +1,7 @@
+Host gitea
+  IdentityFile /home/matt/.ssh/lightsail_rsa
+  User admin
+Host minecraft
+  IdentityFile /home/matt/.ssh/minecraft_private.pem
 Host *
   IdentityFile /home/matt/.ssh/id_ed25519_sk_desk
diff --git a/sway/.config/sway/config b/sway/.config/sway/config
index 97b2116..a645d8c 100644
--- a/sway/.config/sway/config
+++ b/sway/.config/sway/config
@@ -32,7 +32,8 @@ set $menu rofi -show drun
 #
 # Default wallpaper (more resolutions are available in /usr/share/backgrounds/sway/)
 set $background /home/matt/Photos/wallpaper.png
-output * bg $background fill
+output DP-1 bg /home/matt/Photos/Wallpapers/left.jpg fill
+output DP-3 bg /home/matt/Photos/Wallpapers/right.jpg fill
 #
 # Example configuration:
 #