diff --git a/lua/plugins/blink.lua b/lua/plugins/blink.lua
index 5b4c3b6..8d67ae3 100644
--- a/lua/plugins/blink.lua
+++ b/lua/plugins/blink.lua
@@ -17,7 +17,12 @@ return {
       list = { selection = { preselect = false, auto_insert = false } },
     },
     sources = {
-      default = { "git", "dictionary", "calc" },
+      default = { "git", "calc" },
+      per_filetype = {
+        markdown = { inherit_defaults = true, "dictionary" },
+        gitcommit = { inherit_defaults = true, "dictionary" },
+        text = { inherit_defaults = true, "dictionary" },
+      },
       providers = {
         calc = {
           name = "Calc",
diff --git a/lua/plugins/catppuccin.lua b/lua/plugins/catppuccin.lua
index 286d1e8..b9ead98 100644
--- a/lua/plugins/catppuccin.lua
+++ b/lua/plugins/catppuccin.lua
@@ -8,14 +8,7 @@ return {
     opts = {
       flavour = "mocha",
       term_colors = true,
-      auto_integrations = false,
-      integrations = {
-        blink_cmp = true,
-        dadbod_ui = true,
-        dap = true,
-        dap_ui = true,
-        render_markdown = true,
-      },
+      auto_integrations = true,
     },
   },
   -- let LazyVim apply the colorscheme (and re-apply it after lazy loads)
diff --git a/lua/plugins/dadbod.lua b/lua/plugins/dadbod.lua
index 2fd5bfc..48a48f9 100644
--- a/lua/plugins/dadbod.lua
+++ b/lua/plugins/dadbod.lua
@@ -9,9 +9,9 @@ return {
     end,
     keys = {
       { "<leader>D", "<cmd>DBUIToggle<cr>", desc = "Toggle DB UI" },
-      { "<leader>S", "<Plug>(DBUI_ExecuteQuery)", mode = { "n", "v" }, desc = "Execute SQL query" },
-      { "<leader>E", "<Plug>(DBUI_EditBindParameters)", desc = "Edit SQL bind parameters" },
-      { "<leader>W", "<Plug>(DBUI_SaveQuery)", desc = "Save SQL query" },
+      { "<leader>S", "<Plug>(DBUI_ExecuteQuery)", mode = { "n", "v" }, desc = "Execute SQL query", ft = { "sql", "mysql", "plsql" } },
+      { "<leader>E", "<Plug>(DBUI_EditBindParameters)", desc = "Edit SQL bind parameters", ft = { "sql", "mysql", "plsql" } },
+      { "<leader>W", "<Plug>(DBUI_SaveQuery)", desc = "Save SQL query", ft = { "sql", "mysql", "plsql" } },
     },
   },
 }
diff --git a/lua/plugins/lspconfig.lua b/lua/plugins/lspconfig.lua
index 8df910e..948bb04 100644
--- a/lua/plugins/lspconfig.lua
+++ b/lua/plugins/lspconfig.lua
@@ -46,9 +46,16 @@ return {
 
     opts.setup = opts.setup or {}
 
-    -- Setup function to prevent harper_ls from autostarting
-    opts.setup.harper_ls = function(_, server_opts)
-      -- Don't setup harper_ls automatically
+    opts.setup.harper_ls = function()
+      Snacks.toggle({
+        name = "Harper",
+        get = function()
+          return vim.lsp.is_enabled("harper_ls")
+        end,
+        set = function(state)
+          vim.lsp.enable("harper_ls", state)
+        end,
+      }):map("<leader>uH")
       return true
     end
   end,
diff --git a/lua/plugins/mason.lua b/lua/plugins/mason.lua
index e343299..27c40ac 100644
--- a/lua/plugins/mason.lua
+++ b/lua/plugins/mason.lua
@@ -13,27 +13,4 @@ return {
       "ty", -- Python LSP
     },
   },
-  config = function(_, opts)
-    require("mason").setup(opts)
-    local mr = require("mason-registry")
-    mr:on("package:install:success", function()
-      vim.defer_fn(function()
-        require("lazy.core.handler.event").trigger({
-          event = "FileType",
-          buf = vim.api.nvim_get_current_buf(),
-        })
-      end, 100)
-    end)
-
-    vim.defer_fn(function()
-      mr.refresh(function()
-        for _, tool in ipairs(opts.ensure_installed) do
-          local p = mr.get_package(tool)
-          if not p:is_installed() then
-            p:install()
-          end
-        end
-      end)
-    end, 500)
-  end,
 }
diff --git a/lua/plugins/obsidian.lua b/lua/plugins/obsidian.lua
index cf708f1..8a1c610 100644
--- a/lua/plugins/obsidian.lua
+++ b/lua/plugins/obsidian.lua
@@ -494,7 +494,7 @@ return {
       desc = "Search notes from vault",
     },
     { "<leader>zW", "<cmd>Obsidian workspace<cr>", desc = "Select active workspace" },
-    { "<C-c>", "<cmd>Obsidian toggle_checkbox<cr>", desc = "Toggle checkbox states" },
-    { "gf", "<cmd>Obsidian follow_link<CR>", desc = "Follow Obsidian link" },
+    { "<C-c>", "<cmd>Obsidian toggle_checkbox<cr>", desc = "Toggle checkbox states", ft = "markdown" },
+    { "gf", "<cmd>Obsidian follow_link<CR>", desc = "Follow Obsidian link", ft = "markdown" },
   },
 }
diff --git a/lua/plugins/snacks.lua b/lua/plugins/snacks.lua
index afb2d72..83eca7d 100644
--- a/lua/plugins/snacks.lua
+++ b/lua/plugins/snacks.lua
@@ -143,7 +143,7 @@ return {
     {
       "<C-p>",
       function()
-        Snacks.picker.files({ hidden = true })
+        Snacks.picker.files()
       end,
       desc = "Find Files (Root Dir)",
     },