diff --git a/.gitignore b/.gitignore
index 4dfc330..1ee5cfe 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,4 +4,6 @@ dwm/.dwm/util.o
 dwm/.dwm/dwm
 dwm/.dwm/drw.o
 ulauncher/.config/ulauncher/ext_preferences
-spicetify/.config/spicetify/Extracted
\ No newline at end of file
+spicetify/.config/spicetify/Extracted
+.zcompdump
+.zcompcache
diff --git a/gtk/.config/gtk-3.0/settings.ini b/gtk/.config/gtk-3.0/settings.ini
index 615f2f0..886b278 100644
--- a/gtk/.config/gtk-3.0/settings.ini
+++ b/gtk/.config/gtk-3.0/settings.ini
@@ -1,8 +1,8 @@
 [Settings]
 gtk-theme-name=gruvbox-dark-gtk
-gtk-icon-theme-name=oomox-gruvbox-dark
-gtk-font-name=Cantarell 11
-gtk-cursor-theme-name=Simp1e-Gruvbox-Dark
+gtk-icon-theme-name=gruvbox-dark-icons-gtk
+gtk-font-name=Sans 10
+gtk-cursor-theme-name=Catppuccin-Macchiato-Yellow-Cursors
 gtk-cursor-theme-size=0
 gtk-toolbar-style=GTK_TOOLBAR_BOTH
 gtk-toolbar-icon-size=GTK_ICON_SIZE_LARGE_TOOLBAR
diff --git a/nvim/.config/nvim/lua/custom/configs/lspconfig.lua b/nvim/.config/nvim/lua/custom/configs/lspconfig.lua
index 7c7faac..d83ddda 100644
--- a/nvim/.config/nvim/lua/custom/configs/lspconfig.lua
+++ b/nvim/.config/nvim/lua/custom/configs/lspconfig.lua
@@ -14,7 +14,15 @@ for _, lsp in ipairs(servers) do
   }
 end
 
-lspconfig.svelte.setup{}
+lspconfig.svelte.setup {}
+
+lspconfig.clangd.setup {
+  on_attach = function (client, bufnr)
+    client.server_capabilities.signatureHelpProvider = false
+    on_attach(client, bufnr)
+  end,
+  capabilities = capabilities,
+}
 
 lspconfig.rust_analyzer.setup({
   on_attach = on_attach,
diff --git a/nvim/.config/nvim/lua/custom/configs/null-ls.lua b/nvim/.config/nvim/lua/custom/configs/null-ls.lua
new file mode 100644
index 0000000..9b74bf5
--- /dev/null
+++ b/nvim/.config/nvim/lua/custom/configs/null-ls.lua
@@ -0,0 +1,25 @@
+local augroup = vim.api.nvim_create_augroup("LspFormatting", {})
+local null_ls = require("null-ls")
+
+local opts = {
+  sources = {
+    null_ls.builtins.formatting.clang_format,
+  },
+  on_attach = function (client, bufnr)
+    if client.supports_method("textDocument/formatting") then
+      vim.api.nvim_clear_autocmds({
+        group = augroup,
+        buffer = bufnr,
+      })
+      vim.api.nvim_create_autocmd("BufWritePre", {
+        group = augroup,
+        buffer = bufnr,
+        callback = function()
+          vim.lsp.buf.format({ bufnr = bufnr })
+        end,
+      })
+    end
+  end,
+}
+
+return opts
diff --git a/nvim/.config/nvim/lua/custom/mappings.lua b/nvim/.config/nvim/lua/custom/mappings.lua
index b9c8aa6..9f93f63 100644
--- a/nvim/.config/nvim/lua/custom/mappings.lua
+++ b/nvim/.config/nvim/lua/custom/mappings.lua
@@ -19,6 +19,20 @@ M.general = {
   },
 }
 
+M.dap = {
+  plugin = true,
+  n = {
+    ["<leader>db"] = {
+      "<cmd> DapToggleBreakpoint <CR>",
+      "Add breakpoint at line",
+    },
+    ["<leader>dr"] = {
+      "<cmd> DapContinue <CR>",
+      "Start or continue the debugger",
+    }
+  }
+}
+
 -- more keybinds!
 
 return M
diff --git a/nvim/.config/nvim/lua/custom/plugins.lua b/nvim/.config/nvim/lua/custom/plugins.lua
index ad03ad8..71034c3 100644
--- a/nvim/.config/nvim/lua/custom/plugins.lua
+++ b/nvim/.config/nvim/lua/custom/plugins.lua
@@ -16,6 +16,9 @@ local plugins = {
     opts = {
       ensure_installed = {
         "rust-analyzer",
+        "clangd",
+        "clang-format",
+        "codelldb",
       }
     },
   },
@@ -30,6 +33,53 @@ local plugins = {
     opts = overrides.nvimtree,
   },
 
+  {
+    "jose-elias-alvarez/null-ls.nvim",
+    event = "VeryLazy",
+    opts = function()
+      return require "custom.configs.null-ls"
+    end,
+  },
+
+  {
+    "rcarriga/nvim-dap-ui",
+    event = "VeryLazy",
+    dependencies = "mfussenegger/nvim-dap",
+    config = function()
+      local dap = require("dap")
+      local dapui = require("dapui")
+      dapui.setup()
+      dap.listeners.after.event_initialized["dapui_config"] = function()
+        dapui.open()
+      end
+      dap.listeners.after.event_terminated["dapui_config"] = function()
+        dapui.close()
+      end
+      dap.listeners.after.event_exited["dapui_config"] = function()
+        dapui.close()
+      end
+    end
+  },
+
+  {
+    "jay-babu/mason-nvim-dap.nvim",
+    event = "VeryLazy",
+    dependencies = {
+      "williamboman/mason.nvim",
+      "mfussenegger/nvim-dap",
+    },
+    opts = {
+      handlers = {}
+    },
+  },
+
+  {
+    "mfussenegger/nvim-dap",
+    config = function(_, _)
+      require("core.utils").load_mappings("dap")
+    end
+  },
+
   {
     "rust-lang/rust.vim",
     ft = "rust",
diff --git a/picom/.config/black_to_transparent.frag b/picom/.config/black_to_transparent.frag
index edee86e..7760876 100644
--- a/picom/.config/black_to_transparent.frag
+++ b/picom/.config/black_to_transparent.frag
@@ -17,6 +17,6 @@ vec4 window_shader() {
 	if (invert_color)
 		c = vec4(vec3(c.a, c.a, c.a) - vec3(c), c.a);
 	c *= opacity;
-	vec4 default_post_processing(vec4 c);
+	// vec4 default_post_processing(vec4 c);
 	return c;
-}
\ No newline at end of file
+}