Merge fix

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

@@ -1,100 +1,113 @@
 {
-	"telemetry.telemetryLevel": "off",
-    "editor.insertSpaces": false,
-	"editor.detectIndentation": true,
-	"explorer.confirmDelete": false,
-	"git.openRepositoryInParentFolders": "never",
-	"workbench.editorAssociations": {
-		"*.sqlite": "default"
-	},
-	"workbench.startupEditor": "none",
-	"editor.minimap.enabled": false,
-	"breadcrumbs.enabled": false,
-	"editor.renderWhitespace": "none",
-	"window.menuBarVisibility": "toggle",
-	"editor.fontFamily": "Fira Code, 'Droid Sans Mono', 'monospace', monospace",
-	"window.zoomLevel": -1,
-	"jupyter.askForKernelRestart": false,
-	"vim.normalModeKeyBindingsNonRecursive": [
-        {
-            "before": ["u"],
-            "commands": ["undo"]
-        },
-        {
-            "before": ["c-r"],
-            "commands": ["redo"]
-        },
-        {
-            "before": ["<leader>", "t"],
-            "commands": ["workbench.action.toggleSidebarVisibility"]
-        },
-        {
-            "before": ["g", "s"],
-            "commands": ["workbench.action.showAllSymbols"]
-        },
-        {
-            "before": ["g", "a"],
-            "commands": ["references-view.findReferences"]
-        },
-        {
-            "before": ["g", "r"],
-            "commands": ["editor.action.rename"]
-        },
-        {
-            "before": ["g", "w"],
-            "commands": ["editor.emmet.action.wrapWithAbbreviation"]
-        }
-    ],
-    "vim.visualModeKeyBindingsNonRecursive": [
-        {
-            "before": ["g", "r"],
-            "commands": ["git.revertSelectedRanges"]
-        },
-        {
-            "before": ["g", "w"],
-            "commands": ["editor.emmet.action.wrapWithAbbreviation"]
-        },
-        {
-            "before": ["c-<leader>"],
-            "commands": ["editor.action.triggerSuggest"]
-        }
-	],
-	"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"
-	},
-	"workbench.colorCustomizations": {},
-	"[typescriptreact]": {
-		"editor.defaultFormatter": "esbenp.prettier-vscode"
-	},
-	"[typescript]": {
-		"editor.defaultFormatter": "esbenp.prettier-vscode"
-	},
-	"[json]": {
-		"editor.defaultFormatter": "esbenp.prettier-vscode"
-	},
-	"[jsonc]": {
-		"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
-	},
+  "telemetry.telemetryLevel": "off",
+  "editor.detectIndentation": true,
+  "explorer.confirmDelete": false,
+  "git.openRepositoryInParentFolders": "never",
+  "workbench.editorAssociations": {
+    "*.sqlite": "default"
+  },
+  "workbench.startupEditor": "none",
+  "editor.minimap.enabled": false,
+  "breadcrumbs.enabled": true,
+  "editor.renderWhitespace": "none",
+  "window.menuBarVisibility": "toggle",
+  "editor.fontFamily": "Fira Code, 'Droid Sans Mono', 'monospace', monospace",
+  "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"],
+      "commands": ["undo"]
+    },
+    {
+      "before": ["c-r"],
+      "commands": ["redo"]
+    },
+    {
+      "before": ["<leader>", "t"],
+      "commands": ["workbench.action.toggleSidebarVisibility"]
+    },
+    {
+      "before": ["g", "s"],
+      "commands": ["workbench.action.showAllSymbols"]
+    },
+    {
+      "before": ["g", "a"],
+      "commands": ["references-view.findReferences"]
+    },
+    {
+      "before": ["g", "r"],
+      "commands": ["editor.action.rename"]
+    },
+    {
+      "before": ["g", "w"],
+      "commands": ["editor.emmet.action.wrapWithAbbreviation"]
+    }
+  ],
+  "vim.visualModeKeyBindingsNonRecursive": [
+    {
+      "before": ["g", "r"],
+      "commands": ["git.revertSelectedRanges"]
+    },
+    {
+      "before": ["g", "w"],
+      "commands": ["editor.emmet.action.wrapWithAbbreviation"]
+    },
+    {
+      "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,
+  "[latex]": {
+    "editor.defaultFormatter": "mathematic.vscode-latex"
+  },
+  "C_Cpp.intelliSenseEngine": "disabled",
+  "workbench.colorCustomizations": {},
+  "[typescript]": {
+    "editor.defaultFormatter": "esbenp.prettier-vscode"
+  },
+  "[typescriptreact]": {
+    "editor.defaultFormatter": "esbenp.prettier-vscode"
+  },
+  "[c]": {
+    "editor.defaultFormatter": "llvm-vs-code-extensions.vscode-clangd"
+  },
+  "[cpp]": {
+    "editor.defaultFormatter": "xaver.clang-format"
+  },
+  "[css]": {
+    "editor.defaultFormatter": "esbenp.prettier-vscode"
+  },
+  "[json]": {
+    "editor.defaultFormatter": "esbenp.prettier-vscode"
+  },
+  "[javascript]": {
+    "editor.defaultFormatter": "esbenp.prettier-vscode"
+  },
+  "[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

@@ -3,49 +3,49 @@ local overrides = require("custom.configs.overrides")
 ---@type NvPluginSpec[]
 local plugins = {
 
-  -- Override plugin definition options
+	-- Override plugin definition options
 
-  {
-    "neovim/nvim-lspconfig",
-    config = function()
-      require "plugins.configs.lspconfig"
-      require "custom.configs.lspconfig"
-    end, -- Override to setup mason-lspconfig
-  },
+	{
+		"neovim/nvim-lspconfig",
+		config = function()
+			require("plugins.configs.lspconfig")
+			require("custom.configs.lspconfig")
+		end, -- Override to setup mason-lspconfig
+	},
 
-  -- override plugin configs
-  {
-    "williamboman/mason.nvim",
-    opts = overrides.mason
-  },
+	-- override plugin configs
+	{
+		"williamboman/mason.nvim",
+		opts = overrides.mason,
+	},
 
-  {
-    "nvim-treesitter/nvim-treesitter",
-    opts = overrides.treesitter,
-  },
+	{
+		"nvim-treesitter/nvim-treesitter",
+		opts = overrides.treesitter,
+	},
 
-  {
-    "nvim-tree/nvim-tree.lua",
-    opts = overrides.nvimtree,
-  },
+	{
+		"nvim-tree/nvim-tree.lua",
+		opts = overrides.nvimtree,
+	},
 
-  -- Install a plugin
-  {
-    "max397574/better-escape.nvim",
-    event = "InsertEnter",
-    config = function()
-      require("better_escape").setup()
-    end,
-  },
+	-- Install a plugin
+	{
+		"max397574/better-escape.nvim",
+		event = "InsertEnter",
+		config = function()
+			require("better_escape").setup()
+		end,
+	},
 
-  {
-    "stevearc/conform.nvim",
-    --  for users those who want auto-save conform + lazyloading!
-    -- event = "BufWritePre"
-    config = function()
-      require "custom.configs.conform"
-    end,
-  },
+	{
+		"stevearc/conform.nvim",
+		--  for users those who want auto-save conform + lazyloading!
+		-- event = "BufWritePre"
+		config = function()
+			require("custom.configs.conform")
+		end,
+	},
 
   {
     "github/copilot.vim",
@@ -60,19 +60,37 @@ local plugins = {
     end
   },
 
-  -- To make a plugin not be loaded
-  -- {
-  --   "NvChad/nvim-colorizer.lua",
-  --   enabled = false
-  -- },
+	{
+		"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",
+	--   enabled = false
+	-- },
 
-  -- All NvChad plugins are lazy-loaded by default
-  -- For a plugin to be loaded, you will need to set either `ft`, `cmd`, `keys`, `event`, or set `lazy = false`
-  -- If you want a plugin to load on startup, add `lazy = false` to a plugin spec, for example
-  -- {
-  --   "mg979/vim-visual-multi",
-  --   lazy = false,
-  -- }
+	-- All NvChad plugins are lazy-loaded by default
+	-- For a plugin to be loaded, you will need to set either `ft`, `cmd`, `keys`, `event`, or set `lazy = false`
+	-- If you want a plugin to load on startup, add `lazy = false` to a plugin spec, for example
+	-- {
+	--   "mg979/vim-visual-multi",
+	--   lazy = false,
+	-- }
 }
 
 return plugins

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/"