Merge branch 'main' of github.com:JohnCosta27/dotfiles

CopyNvchad.bash

@@ -0,0 +1,4 @@
+#!/bin/bash
+
+rm -r nvchad
+cp -r ~/.config/nvim/lua/custom ./nvchad

README.md

@@ -0,0 +1,8 @@
+# Nvim config
+
+I use [NvChad](https://nvchad.com/) as the base of my config, with some custom plugins and key mappings, as well as language servers. I haven't tested this config on other machines except my own so your experience may vary.
+
+* NvChad switched to Mason to manage Lsps so you will need to install the ones you want.
+* TreeSitter for syntax highlighting, doesn't automatically install new languages, so you have to do this yourself.
+
+To use my NvChad config, take the files inside `nvchad`, and copy them inside `~/.config/nvim/lua/custom`, a folder NvChad uses for custom configurations.

nvchad/mappings.lua

@@ -8,4 +8,26 @@ M.formatter = {
   }
 }
 
+M.nvimtree = {
+  n = {
+    -- focus
+    ["<leader>e"] = { "<cmd> NvimTreeFocus <CR>", "focus nvimtree" },
+    ["<leader>co"] = {"<cmd> NvimTreeCollapse <CR>", "Collapse nvimtree"},
+  },
+}
+
+M.diffview = {
+  n = {
+    ["<leader>df"] = {"<cmd> DiffviewOpen <CR>", "Open git view"},
+    ["<leader>dr"] = {"<cmd> DiffviewRefresh <CR>", "Open git view"},
+  }
+}
+
+M.custom = {
+  n = {
+    ["<leader>nt"] = {"<cmd> tabnew <CR>", "New tab"},
+    ["<leader>ct"] = {"<cmd> tabclose <CR>", "Close tab"},
+  }
+}
+
 return M

nvchad/plugins/init.lua

@@ -20,4 +20,5 @@ return {
     end
   },
   ["lervag/vimtex"] = {},
+  ["sindrets/diffview.nvim"] = {},
 }

nvchad/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 = {"tsserver", "tailwindcss", "eslint", "cssls", "prismals", "gopls" }
+local servers = {"tsserver", "tailwindcss", "eslint", "cssls", "prismals", "gopls", "dockerls", "yamlls", "hls" }
 
 for _, lsp in ipairs(servers) do
   lspconfig[lsp].setup({