diff --git a/.config/nvim/lazy-lock.json b/.config/nvim/lazy-lock.json
index ca9782f0..234ba23c 100644
--- a/.config/nvim/lazy-lock.json
+++ b/.config/nvim/lazy-lock.json
@@ -37,7 +37,6 @@
   "mini.files": { "branch": "main", "commit": "72cc9045c1011f2c158117bd5a0d339792b7f34a" },
   "mini.hipatterns": { "branch": "main", "commit": "f34975103a38b3f608219a1324cdfc58ea660b8b" },
   "mini.icons": { "branch": "main", "commit": "44c0160526f7ae17ca8e8eab9ab235d047fcf7a6" },
-  "mini.indentscope": { "branch": "main", "commit": "da9af64649e114aa79480c238fd23f6524bc0903" },
   "mini.move": { "branch": "main", "commit": "4caa1c212f5ca3d1633d21cfb184808090ed74b1" },
   "mini.pairs": { "branch": "main", "commit": "7e834c5937d95364cc1740e20d673afe2d034cdb" },
   "mini.surround": { "branch": "main", "commit": "aa5e245829dd12d8ff0c96ef11da28681d6049aa" },
diff --git a/.config/nvim/lua/plugins/blink.lua b/.config/nvim/lua/plugins/blink.lua
new file mode 100644
index 00000000..a32cad3b
--- /dev/null
+++ b/.config/nvim/lua/plugins/blink.lua
@@ -0,0 +1,59 @@
+local follow_main = false
+if follow_main then
+  vim.g.lazyvim_blink_main = true
+end
+
+return {
+  "saghen/blink.cmp",
+  ---@module 'blink.cmp'
+  ---@type blink.cmp.Config
+  opts = {
+    appearance = {
+      -- sets the fallback highlight groups to nvim-cmp's highlight groups
+      -- useful for when your theme doesn't support blink.cmp
+      -- will be removed in a future release, assuming themes add support
+      use_nvim_cmp_as_default = false,
+      -- set to 'mono' for 'Nerd Font Mono' or 'normal' for 'Nerd Font'
+      -- adjusts spacing to ensure icons are aligned
+      nerd_font_variant = "mono",
+    },
+    completion = {
+      accept = {
+        -- experimental auto-brackets support
+        auto_brackets = {
+          enabled = true,
+        },
+      },
+      menu = {
+        draw = {
+          treesitter = true,
+        },
+      },
+      documentation = {
+        auto_show = true,
+        auto_show_delay_ms = 200,
+      },
+      ghost_text = {
+        enabled = vim.g.ai_cmp,
+      },
+    },
+
+    -- experimental signature help support
+    -- signature = { enabled = true },
+
+    sources = {
+      -- adding any nvim-cmp sources here will enable them
+      -- with blink.compat
+      compat = {},
+      default = { "lsp", "path", "snippets", "buffer" },
+      cmdline = {},
+    },
+    keymap = {
+      preset = "default",
+      ["<Tab>"] = {
+        LazyVim.cmp.map({ "snippet_forward", "ai_accept" }),
+        "fallback",
+      },
+    },
+  },
+}
diff --git a/.config/nvim/lua/plugins/indent.lua b/.config/nvim/lua/plugins/indent.lua
new file mode 100644
index 00000000..ad429ced
--- /dev/null
+++ b/.config/nvim/lua/plugins/indent.lua
@@ -0,0 +1,9 @@
+return {
+  "folke/snacks.nvim",
+  opts = {
+    indent = {
+      enabled = true,
+      only_current = true,
+    },
+  },
+}
diff --git a/.config/nvim/lua/plugins/mini-indentscope.lua b/.config/nvim/lua/plugins/mini-indentscope.lua
deleted file mode 100644
index ba650d1f..00000000
--- a/.config/nvim/lua/plugins/mini-indentscope.lua
+++ /dev/null
@@ -1,39 +0,0 @@
-return {
-  -- "echasnovski/mini.indentscope",
-  -- version = false, -- wait till new 0.7.0 release to put it back on semver
-  -- event = "LazyFile",
-  -- opts = {
-  --   -- symbol = "▏",
-  --   symbol = "│",
-  --   options = {
-  --     try_as_border = true,
-  --     draw = {
-  --       animation = require("mini.indentscope").gen_animation.none(),
-  --     },
-  --   },
-  -- },
-  -- init = function()
-  --   vim.api.nvim_create_autocmd("FileType", {
-  --     pattern = {
-  --       "Trouble",
-  --       "alpha",
-  --       "dashboard",
-  --       "fzf",
-  --       "help",
-  --       "lazy",
-  --       "mason",
-  --       "neo-tree",
-  --       "notify",
-  --       "snacks_dashboard",
-  --       "snacks_notif",
-  --       "snacks_terminal",
-  --       "snacks_win",
-  --       "toggleterm",
-  --       "trouble",
-  --     },
-  --     callback = function()
-  --       vim.b.miniindentscope_disable = true
-  --     end,
-  --   })
-  -- end,
-}
diff --git a/.config/tmux/tmux.conf b/.config/tmux/tmux.conf
index 175c5b0e..bf8a6665 100644
--- a/.config/tmux/tmux.conf
+++ b/.config/tmux/tmux.conf
@@ -8,7 +8,6 @@ set -gq allow-passthrough on
 set -g visual-activity off
 
 set -g history-limit 10000
-
 unbind r
 bind r source-file ~/.config/tmux/tmux.conf
 unbind C-t