From 471b66f372c1cd0f29885c3686d71dbd3c108843 Mon Sep 17 00:00:00 2001
From: John Costa <johncosta027@gmail.com>
Date: Sun, 2 Apr 2023 20:56:55 +0100
Subject: [PATCH] tmux navigation

---
 .tmux.conf                           | 17 +++++++++++++++++
 nvchad/custom/chadrc.lua             |  2 +-
 nvchad/custom/plugins/init.lua       |  1 +
 nvchad/custom/plugins/lspconfig.lua  |  8 +++++++-
 nvchad/plugins/configs/lspconfig.lua | 21 +++++++++++++++++++++
 nvchad/plugins/configs/telescope.lua |  2 +-
 nvchad/plugins/init.lua              |  5 ++++-
 7 files changed, 52 insertions(+), 4 deletions(-)

diff --git a/.tmux.conf b/.tmux.conf
index 7aaeb350..bf783b6b 100644
--- a/.tmux.conf
+++ b/.tmux.conf
@@ -18,3 +18,20 @@ bind - split-window -v
 
 unbind r
 bind r source-file ~/.tmux.conf
+
+bind -r j resize-pane -D 5
+bind -r k resize-pane -U 5
+bind -r l resize-pane -R 5
+bind -r h resize-pane -L 5
+
+bind -r m resize-pane -Z
+
+set -g mouse on
+
+set -g @plugin 'tmux-plugins/tpm'
+
+# Tmux Plugins
+
+set -g @plugin 'christoomey/vim-tmux-navigator'
+
+run '~/.tmux/plugins/tpm/tpm'
diff --git a/nvchad/custom/chadrc.lua b/nvchad/custom/chadrc.lua
index 8f1e7d41..4713535b 100644
--- a/nvchad/custom/chadrc.lua
+++ b/nvchad/custom/chadrc.lua
@@ -38,7 +38,7 @@ M.options = {
    end
 }
 M.ui = {
-  theme = "everforest",
+  theme = "kanagawa",
   theme_toggle = {"everforest", "everforest_light"},
   lazyload = false,
 }
diff --git a/nvchad/custom/plugins/init.lua b/nvchad/custom/plugins/init.lua
index 2dd5cb99..85440ff1 100644
--- a/nvchad/custom/plugins/init.lua
+++ b/nvchad/custom/plugins/init.lua
@@ -23,4 +23,5 @@ return {
   ["sindrets/diffview.nvim"] = {},
   ["ThePrimeagen/refactoring.nvim"] = {},
   ["ThePrimeagen/harpoon"] = {},
+  ["christoomey/vim-tmux-navigator"] = {},
 }
diff --git a/nvchad/custom/plugins/lspconfig.lua b/nvchad/custom/plugins/lspconfig.lua
index f57b385f..77c1ba13 100644
--- a/nvchad/custom/plugins/lspconfig.lua
+++ b/nvchad/custom/plugins/lspconfig.lua
@@ -2,7 +2,7 @@ local on_attach = require("plugins.configs.lspconfig").on_attach
 local capabilities = require("plugins.configs.lspconfig").capabilities
 
 local lspconfig = require("lspconfig")
-local servers = {"tailwindcss", "eslint", "cssls", "prismals", "gopls", "dockerls", "yamlls", "hls"}
+local servers = {"tailwindcss", "eslint", "cssls", "prismals", "gopls", "dockerls", "yamlls", "hls", "dafny"}
 
 for _, lsp in ipairs(servers) do
   lspconfig[lsp].setup({
@@ -11,6 +11,12 @@ for _, lsp in ipairs(servers) do
   })
 end
 
+
+lspconfig.dafny.setup {
+  on_attach = on_attach,
+  root_dir = lspconfig.util.root_pattern("*.dfy"),
+}
+
 lspconfig.denols.setup {
   on_attach = on_attach,
   root_dir = lspconfig.util.root_pattern("deno.json", "deno.jsonc"),
diff --git a/nvchad/plugins/configs/lspconfig.lua b/nvchad/plugins/configs/lspconfig.lua
index c6006966..aa002749 100644
--- a/nvchad/plugins/configs/lspconfig.lua
+++ b/nvchad/plugins/configs/lspconfig.lua
@@ -43,4 +43,25 @@ M.capabilities.textDocument.completion.completionItem = {
   },
 }
 
+lspconfig.lua_ls.setup {
+  on_attach = M.on_attach,
+  capabilities = M.capabilities,
+
+  settings = {
+    Lua = {
+      diagnostics = {
+        globals = { "vim" },
+      },
+      workspace = {
+        library = {
+          [vim.fn.expand "$VIMRUNTIME/lua"] = true,
+          [vim.fn.expand "$VIMRUNTIME/lua/vim/lsp"] = true,
+        },
+        maxPreload = 100000,
+        preloadFileSize = 10000,
+      },
+    },
+  },
+}
+
 return M
diff --git a/nvchad/plugins/configs/telescope.lua b/nvchad/plugins/configs/telescope.lua
index 5b4b1024..b01abc06 100644
--- a/nvchad/plugins/configs/telescope.lua
+++ b/nvchad/plugins/configs/telescope.lua
@@ -59,7 +59,7 @@ local options = {
     },
   },
 
-  extensions_list = { "themes", "terms", "harpoon" },
+  extensions_list = { "themes", "terms" },
 }
 
 -- check for any override
diff --git a/nvchad/plugins/init.lua b/nvchad/plugins/init.lua
index 079b7bcc..e380eeaa 100644
--- a/nvchad/plugins/init.lua
+++ b/nvchad/plugins/init.lua
@@ -11,9 +11,10 @@ local plugins = {
     end,
   },
 
-  ["NvChad/extensions"] = { module = { "telescope", "nvchad" } },
+  ["NvChad/extensions"] = { branch = "main", module = { "telescope", "nvchad" } },
 
   ["NvChad/base46"] = {
+    branch = "master",
     config = function()
       local ok, base46 = pcall(require, "base46")
 
@@ -24,6 +25,7 @@ local plugins = {
   },
 
   ["NvChad/ui"] = {
+    branch = "main",
     after = "base46",
     config = function()
       local present, nvchad_ui = pcall(require, "nvchad_ui")
@@ -47,6 +49,7 @@ local plugins = {
   ["nvim-tree/nvim-web-devicons"] = {
     after = "ui",
     module = "nvim-web-devicons",
+    commit = "dd468f6991a4e447607097dfc89d47ae97d14dea",
     config = function()
       require("plugins.configs.others").devicons()
     end,