changes

src/user/modules/git/default.nix

@@ -19,8 +19,12 @@ in
             vimdiff = {
               trustExitCode = true;
             };
+            keepBackup = false;
+          };
+          merge = { 
+            tool = "vimdiff"; 
+
           };
-          merge = { tool = "vimdiff"; };
           safe = { 
             directory = [
               "/etc/nixos"

src/user/modules/gui/wm/hyprland/config/waybar/config

@@ -2,7 +2,7 @@
   "layer": "top",
   "position": "top",
   "output": "HDMI-A-1",
-  "modules-left": [ "custom/logo", "clock",  "custom/weather", "custom/blockheight", "custom/price", "memory", "cpu" ],
+  "modules-left": [ "custom/logo", "clock", "custom/blockheight", "custom/price", "memory", "cpu" ],
   "modules-center": [ "hyprland/workspaces" ],
   "modules-right": [ "tray", "pulseaudio", "network" ],
   "reload_style_on_change":true,

src/user/modules/utils/modules/neovim/config/nvim/lua/plugins/colorscheme.lua

@@ -29,6 +29,14 @@ return {
 
         hi LazyH1 ctermbg=Green ctermfg=Black guibg=Black guifg=Green
         hi IblScope guibg=NONE guifg=Yellow ctermbg=NONE ctermfg=Yellow
+        
+        hi ConflictMarker ctermfg=red guifg=red
+        match ConflictMarker /<<<<<<< HEAD\|=======\|>>>>>>> .\+/
+
+        hi DiffAdd ctermbg=none guibg=none
+        hi DiffChange ctermbg=none guibg=none
+        hi DiffDelete ctermbg=none guibg=none
+        hi DiffText ctermbg=none guibg=none
 			]])
 
       vim.api.nvim_create_autocmd("TextYankPost", {

src/user/modules/utils/modules/neovim/config/nvim/lua/plugins/disabled.lua

@@ -2,6 +2,4 @@ return {
 	{ "williamboman/mason.nvim", enabled = false },
 	{ "williamboman/mason-lspconfig.nvim", enabled = false },
 	{ "jay-babu/mason-nvim-dap.nvim", enabled = false },
-	{ "catppuccin/nvim", enabled = false },
-	{ "folke/flash.nvim", enabled = false },
 }

src/user/modules/utils/modules/neovim/config/nvim/lua/plugins/lsp.lua

@@ -73,7 +73,7 @@ return {
   --      mode = "cursor",      -- Line used to calculate context. Choices: 'cursor', 'topline'
   --      -- Separator between context and content. Should be a single character string, like '-'.
   --      -- When separator is set, the context will only show up when there are at least 2 lines above cursorline.
-	--			separator = "=",
+  --      separator = "x",
   --      zindex = 20, -- The Z-index of the context window
   --      on_attach = nil, -- (fun(buf: integer): boolean) rurn false to disable attaching
   --    })
@@ -127,7 +127,6 @@ return {
         snippet = {
           expand = function(args)
             require('luasnip').lsp_expand(args.body)
-
           end
         },
 
@@ -162,6 +161,8 @@ return {
 
       for _, server in ipairs(servers) do
         lsp[server].setup {
+          -- Prevent LSP from autostarting
+          autostart = false,
           capabilities = capabilities,
           on_attach = function(client, bufnr)
             if client.server_capabilities.documentSymbolProvider then
@@ -180,7 +181,13 @@ return {
         }
       }
       require("which-key").add({
-        { "<leader>cl", ":LspInfo<CR>", desc = "LSP Info" },
+        { "<leader>cs",  group = "LSP Commands" },
+        { "<leader>cf",  ":LspFormat<CR>",      desc = "Code Format" },
+        { "<leader>csi", ":LspInfo<CR>",        desc = "LSP Info" },
+        { "<leader>csl", ":LspLog<CR>",         desc = "LSP Log" },
+        { "<leader>csr", ":LspRestart<CR>",     desc = "LSP Restart" },
+        { "<leader>css", ":LspStart<CR>",       desc = "LSP Start" },
+        { "<leader>csx", ":LspStop<CR>",        desc = "LSP Stop" },
       })
     end
   },