Merge fix

code/.config/Code/User/settings.json

@@ -1,6 +1,5 @@
 {
   "telemetry.telemetryLevel": "off",
-    "editor.insertSpaces": false,
   "editor.detectIndentation": true,
   "explorer.confirmDelete": false,
   "git.openRepositoryInParentFolders": "never",
@@ -9,12 +8,21 @@
   },
   "workbench.startupEditor": "none",
   "editor.minimap.enabled": false,
-	"breadcrumbs.enabled": false,
+  "breadcrumbs.enabled": true,
   "editor.renderWhitespace": "none",
   "window.menuBarVisibility": "toggle",
   "editor.fontFamily": "Fira Code, 'Droid Sans Mono', 'monospace', monospace",
-	"window.zoomLevel": -1,
   "jupyter.askForKernelRestart": false,
+  "vim.handleKeys": {
+    "<C-j>": false,
+    "<C-l>": false,
+    "<C-k>": false,
+    "<C-d>": false,
+    "<C-p>": false,
+    "<C-i>": false,
+    "<C-b>": false,
+    "<C-o>": false,
+  },
   "vim.normalModeKeyBindingsNonRecursive": [
     {
       "before": ["u"],
@@ -57,44 +65,49 @@
     {
       "before": ["c-<leader>"],
       "commands": ["editor.action.triggerSuggest"]
+    },
+    {
+      "before": ["<leader>", "g"],
+      "commands": ["editor.action.showHover"]
     }
   ],
+  "vim.leader": "<Space>",
   "editor.mouseWheelScrollSensitivity": 2,
   "editor.smoothScrolling": true,
   "workbench.list.smoothScrolling": true,
   "terminal.integrated.smoothScrolling": true,
-	"editor.cursorSmoothCaretAnimation": "on",
   "[latex]": {
     "editor.defaultFormatter": "mathematic.vscode-latex"
   },
-	"cSpell.userWords": [
-		"pycocotools",
-		"torchvision"
-	],
-	"[python]": {
-		"editor.defaultFormatter": "ms-python.black-formatter"
-	},
+  "C_Cpp.intelliSenseEngine": "disabled",
   "workbench.colorCustomizations": {},
-	"[typescriptreact]": {
+  "[typescript]": {
     "editor.defaultFormatter": "esbenp.prettier-vscode"
   },
-	"[typescript]": {
+  "[typescriptreact]": {
     "editor.defaultFormatter": "esbenp.prettier-vscode"
   },
-	"[json]": {
+  "[c]": {
+    "editor.defaultFormatter": "llvm-vs-code-extensions.vscode-clangd"
+  },
+  "[cpp]": {
+    "editor.defaultFormatter": "xaver.clang-format"
+  },
+  "[css]": {
     "editor.defaultFormatter": "esbenp.prettier-vscode"
   },
-	"[jsonc]": {
+  "[json]": {
     "editor.defaultFormatter": "esbenp.prettier-vscode"
   },
   "[javascript]": {
     "editor.defaultFormatter": "esbenp.prettier-vscode"
   },
-	"workbench.activityBar.location": "hidden",
-	"github.copilot.enable": {
-		"*": false,
-		"plaintext": false,
-		"markdown": false,
-		"scminput": false
+  "[jsonc]": {
+    "editor.defaultFormatter": "esbenp.prettier-vscode"
   },
+  "cmake.showOptionsMovedNotification": false,
+  "window.autoDetectColorScheme": true,
+  "window.zoomLevel": -1,
+  "haskell.manageHLS": "GHCup",
+  "window.customTitleBarVisibility": "auto"
 }

nvchad/.config/nvim/lua/custom/chadrc.lua

@@ -5,8 +5,8 @@ local M = {}
 local highlights = require "custom.highlights"
 
 M.ui = {
-  theme = "yoru",
-  theme_toggle = { "yoru", "one_light" },
+  theme = "gruvchad",
+  theme_toggle = { "gruvchad", "gruvbox_light" },
 
   hl_override = highlights.override,
   hl_add = highlights.add,

nvchad/.config/nvim/lua/custom/plugins.lua

@@ -8,15 +8,15 @@ local plugins = {
 	{
 		"neovim/nvim-lspconfig",
 		config = function()
-      require "plugins.configs.lspconfig"
-      require "custom.configs.lspconfig"
+			require("plugins.configs.lspconfig")
+			require("custom.configs.lspconfig")
 		end, -- Override to setup mason-lspconfig
 	},
 
 	-- override plugin configs
 	{
 		"williamboman/mason.nvim",
-    opts = overrides.mason
+		opts = overrides.mason,
 	},
 
 	{
@@ -43,7 +43,7 @@ local plugins = {
 		--  for users those who want auto-save conform + lazyloading!
 		-- event = "BufWritePre"
 		config = function()
-      require "custom.configs.conform"
+			require("custom.configs.conform")
 		end,
 	},
 
@@ -60,6 +60,24 @@ local plugins = {
     end
   },
 
+	{
+		"nvim-treesitter/nvim-treesitter",
+		dependencies = {
+			"JoosepAlviste/nvim-ts-context-commentstring",
+		},
+		opts = overrides.treesitter,
+	},
+
+	{
+		"numToStr/Comment.nvim",
+		dependencies = "JoosepAlviste/nvim-ts-context-commentstring",
+		config = function()
+			require("Comment").setup({
+				pre_hook = require("ts_context_commentstring.integrations.comment_nvim").create_pre_hook(),
+			})
+		end,
+	},
+
 	-- To make a plugin not be loaded
 	-- {
 	--   "NvChad/nvim-colorizer.lua",

oh-my-zsh/.oh-my-zsh/aliases.sh

@@ -38,3 +38,5 @@ alias cr="cd_gitroot"
 alias dev="cd $HOME/Projects/almtech/ingenuity/"
 
 alias dc="docker-compose"
+
+alias dots="cd $HOME/.dotfiles/"