upgrade nvim and nvchad

danwetherald · Jul 27, 2023 · 6497654 · 6497654
1 parent 29bb24a
commit 6497654
Show file tree

Hide file tree

Showing 9 changed files with 157 additions and 168 deletions.
diff --git a/kitty/kitty.conf b/kitty/kitty.conf
@@ -6,11 +6,11 @@
 
 # Fonts {{{
 
-    font_family      Operator Mono Lig Book
-    bold_font        Operator Mono Medium
-    italic_font      Operator Mono Lig Book Italic
-    bold_italic_font Operator Mono Medium Italic
-    font_size 14.0
+    # font_family      Operator Mono Lig Book
+    # bold_font        Operator Mono Medium
+    # italic_font      Operator Mono Lig Book Italic
+    # bold_italic_font Operator Mono Medium Italic
+    # font_size 14.0
 
     # font_family      Victor Mono
     # bold_font        Victor Mono Bold
@@ -24,6 +24,12 @@
     # bold_italic_font auto
     # font_size 16.0
 
+    font_family      JetBrainsMono Nerd Font Mono Regular
+    bold_font        JetBrainsMono Nerd Font Mono Bold
+    italic_font      JetBrainsMono Nerd Font Mono Italic
+    bold_italic_font JetBrainsMono Nerd Font Mono Bold Italic
+    font_size 14.0
+
     disable_ligatures never
     # Use the 3270 Medium Nerd Font for these symbols,
     # allowing for nerd fonts to be used with whatever font without

diff --git a/nvim_custom/chadrc.lua b/nvim_custom/chadrc.lua
@@ -3,12 +3,42 @@ local M = {}
 -- Custom UI / Theme
 M.ui = {
   theme = "nightfox",
-}
 
--- Custom plugins
-M.plugins = require "custom.plugins"
+  tabufline = {
+    enabled = false,
+  },
+
+  nvdash = {
+    load_on_startup = false,
+    header = {
+      "⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⣀⣠⣤⣤⣶⣶⣶⣶⣶⣦⣤⣤⣀⡀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀",
+      "⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⣀⣤⣶⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣷⣦⣄⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀",
+      "⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⢀⣠⣾⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣦⡀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀",
+      "⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⣠⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣦⡀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀",
+      "⠀⠀⠀⠀⠀⠀⠀⠀⢀⣾⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣄⠀⠀⠀⠀⠀⠀⠀⠀⠀",
+      "⠀⠀⠀⠀⠀⠀⠀⢀⣾⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣆⠀⠀⠀⠀⠀⠀⠀⠀",
+      "⠀⠀⠀⠀⠀⠀⠀⣼⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⡄⠀⠀⠀⠀⠀⠀⠀",
+      "⠀⠀⠀⠀⠀⠀⢰⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣧⠀⠀⠀⠀⠀⠀⠀",
+      "⠀⠀⠀⠀⠀⠀⢸⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⠀⠀⠀⠀⠀⠀⠀",
+      "⠀⠀⠀⠀⠀⠀⢸⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⠀⠀⠀⠀⠀⠀⠀",
+      "⠀⠀⠀⠀⠀⠀⠸⣿⣿⣿⣿⠿⠿⠿⢿⣿⣿⣿⠿⠿⠿⣿⣿⣿⣿⣿⣿⣿⡿⠿⠿⢿⣿⣿⣿⡿⠿⠿⢿⣿⣿⣿⡿⠀⠀⠀⠀⠀⠀⠀",
+      "⠀⠀⠀⠀⠀⠀⠀⢿⣿⣿⣿⡄⠀⠀⠸⢿⣿⠟⠀⠀⢠⣿⣿⣿⣿⣿⣿⣿⣧⠀⠀⠘⢿⣿⡿⠁⠀⠀⣾⣿⣿⣿⠇⠀⠀⠀⠀⠀⠀⠀",
+      "⠀⠀⠀⠀⠀⠀⠀⠘⣿⣿⣿⣿⣦⡀⠀⠀⠀⠀⢀⣴⣿⣿⣿⣿⣿⣿⣿⣿⣿⣷⣄⠀⠀⠀⠀⢀⣠⣾⣿⣿⣿⡟⠀⠀⠀⠀⠀⠀⠀⠀",
+      "⠀⠀⠀⠀⠀⠀⠀⠀⣿⣿⣿⣿⣿⣿⣿⣷⣾⣿⣿⣿⣿⣿⣿⠟⢹⠛⢿⣿⣿⣿⣿⣿⣿⣶⣿⣿⣿⣿⣿⣿⣿⡆⠀⠀⠀⠀⠀⠀⠀⠀",
+      "⠀⠀⠀⠀⠀⠀⠀⠀⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⠃⠀⣸⡀⠀⢻⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⡇⠀⠀⠀⠀⠀⠀⠀⠀",
+      "⠀⠀⠀⠀⠀⠀⠀⠀⠹⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣠⣼⣿⣷⣤⣸⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⡿⠁⠀⠀⠀⠀⠀⠀⠀⠀",
+      "⠀⠀⠀⠀⠀⠀⠀⠀⠀⠈⠻⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⡿⠋⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀",
+      "⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠉⠉⠉⠉⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⡏⠉⠉⠉⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀",
+      "⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⢻⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⠃⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀",
+      "⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠉⠉⠈⠉⠁⠈⠉⠁⠉⠉⠀⠉⠉⠈⠉⠁⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀",
+    },
+  }
+}
 
 -- Custom mappings
 M.mappings = require "custom.mappings"
 
+-- Custom plugins
+M.plugins = "custom.plugins"
+
 return M
diff --git a/nvim_custom/plugins/lspconfig.lua → nvim_custom/configs/lspconfig.lua b/nvim_custom/plugins/lspconfig.lua → nvim_custom/configs/lspconfig.lua
@@ -1,7 +1,8 @@
-local on_attach = require("plugins.configs.lspconfig").on_attach
-local capabilities = require("plugins.configs.lspconfig").capabilities
-local lspconfig = require "lspconfig"
+local configs = require("plugins.configs.lspconfig")
+local on_attach = configs.on_attach
+local capabilities = configs.capabilities
 
+local lspconfig = require "lspconfig"
 local servers = { "html", "cssls", "clangd", "solargraph", "tailwindcss" }
 
 for _, lsp in ipairs(servers) do

diff --git a/nvim_custom/plugins/null-ls.lua → nvim_custom/configs/null-ls.lua b/nvim_custom/plugins/null-ls.lua → nvim_custom/configs/null-ls.lua
diff --git a/nvim_custom/init.lua b/nvim_custom/init.lua
@@ -13,6 +13,6 @@ vim.opt.relativenumber = true
 vim.opt.backup = false
 vim.opt.writebackup = false
 vim.opt.swapfile = false
-vim.opt.updatecount = false
+-- vim.opt.updatecount = false
 
 vim.opt.backspace = { "indent", "eol,start" }
diff --git a/nvim_custom/plugins.lua b/nvim_custom/plugins.lua
@@ -0,0 +1,101 @@
+local plugins = {
+  {
+    "neovim/nvim-lspconfig",
+     config = function()
+        require "plugins.configs.lspconfig"
+        require "custom.configs.lspconfig"
+     end,
+  },
+
+  {
+    "jose-elias-alvarez/null-ls.nvim",
+    after = "nvim-lspconfig",
+    config = function()
+      require "custom.configs.null-ls"
+    end,
+  },
+
+  {
+    "williamboman/mason.nvim",
+    opts = {
+      ensure_installed = {
+        -- lua
+        "lua-language-server",
+        "stylua",
+
+        -- web
+        "css-lsp",
+        "html-lsp",
+        "tailwindcss-language-server",
+
+        -- misc
+        "yaml-language-server",
+
+        -- rails
+        "solargraph",
+      }
+    }
+  },
+
+  {
+    "nvim-treesitter/nvim-treesitter",
+    opts = {
+      ensure_installed = {
+        "vim",
+        "html",
+        "css",
+        "javascript",
+        "json",
+        "toml",
+        "lua",
+        "ruby",
+        "dockerfile",
+        "typescript",
+        "tsx",
+        "yaml",
+      }
+    }
+  },
+
+  {
+    "nvim-tree/nvim-tree.lua",
+    opts = {
+      diagnostics = {
+        enable = true,
+      },
+      git = {
+        enable = true,
+        ignore = false,
+      },
+      actions = {
+        open_file = {
+          quit_on_open = true,
+          window_picker = {
+            enable = false
+          }
+        }
+      }
+    }
+  },
+
+  {
+    "lukas-reineke/indent-blankline.nvim",
+    opts = {
+      filetype_exclude = {
+        "help",
+        "terminal",
+        "alpha",
+        "packer",
+        "lspinfo",
+        "TelescopePrompt",
+        "TelescopeResults",
+        "nvchad_cheatsheet",
+        "lsp-installer",
+        "norg",
+        "",
+      },
+    }
+  }
+}
+
+return plugins
diff --git a/nvim_custom/plugins/init.lua b/nvim_custom/plugins/init.lua
diff --git a/nvim_custom/plugins/overrides.lua b/nvim_custom/plugins/overrides.lua
diff --git a/zsh/.zshrc b/zsh/.zshrc
@@ -135,4 +135,11 @@ alias rest="timer 10m && terminal-notifier -message 'Pomodoro'\
         -title 'Break is over! Get back to work 😬'\
         -appIcon '~/Pictures/pumpkin.png'\
         -sound Crystal"
+
+alias gtbc="cd ~/Developer/better-cart/v3/better_cart"
+
 export PATH="/opt/homebrew/opt/libpq/bin:$PATH"
+
+export NVM_DIR="$HOME/.nvm"
+[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"  # This loads nvm
+[ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion"  # This loads nvm bash_completion