diff --git a/etc/atuin/config.toml b/etc/atuin/config.toml
index fd64fe39..d703c1a6 100644
--- a/etc/atuin/config.toml
+++ b/etc/atuin/config.toml
@@ -27,7 +27,7 @@ search_mode = "skim"
 
 ## which filter mode to use
 ## possible values: global, host, session, directory
-filter_mode = "global"
+filter_mode = "host"
 
 ## With workspace filtering enabled, Atuin will filter for commands executed
 ## in any directory within a git repository tree (default: false)
diff --git a/lua/_lazy.lua b/lua/_lazy.lua
index 59156afb..ab120cf1 100644
--- a/lua/_lazy.lua
+++ b/lua/_lazy.lua
@@ -18,6 +18,7 @@ local plugins = {
     { import = "plugins.colorscheme" },
     { import = "plugins.suda" },
     { import = "plugins.mini" },
+    { import = "plugins.snacks" },
     { import = "plugins.misc" },
 
     -- editor {{{
@@ -48,7 +49,7 @@ local plugins = {
     { "fcying/vim-plugin-AnsiEsc", cmd = { "AnsiEsc", "AnsiEscClear" } },
     { "stevearc/dressing.nvim", opts = {} },
     -- { import = "plugins.noice" },
-    { import = "plugins.nvim_notify" },
+    -- { import = "plugins.nvim_notify" },
     -- { import = "plugins.ZFVimIM" },
     -- { import = "plugins.ZFVimDirDiff" },
     { import = "plugins.fugitive" },
diff --git a/lua/keymap.lua b/lua/keymap.lua
index d7dd4fbb..b450efc5 100644
--- a/lua/keymap.lua
+++ b/lua/keymap.lua
@@ -21,7 +21,7 @@ map("", "<esc>", function()
     if vim.v.hlsearch == 1 then
         vim.cmd("noh")
     end
-    require("notify").dismiss({})
+    -- require("notify").dismiss({})
 end)
 
 -- cmd-line window dd {{{
@@ -152,12 +152,6 @@ noremap <silent><leader>9 :tabn 9<cr>
 noremap <silent><leader>0 :tabn 10<cr>
 ]])
 
-
-map("n", "<F2>", ":set number! number?<CR>")
-map("n", "<F3>", ":set list! list?<CR>")
-map("n", "<F4>", ":set wrap! wrap?<CR>")
-map("n", "<F6>", ":exec exists('syntax_on') ? 'syn off' : 'syn on'<CR>")
-
 -- quickfix {{{
 map("n", "]q", ":cnext<CR>")
 map("n", "[q", ":cprev<CR>")
diff --git a/lua/lsp.lua b/lua/lsp.lua
index 57128560..f6900598 100644
--- a/lua/lsp.lua
+++ b/lua/lsp.lua
@@ -25,18 +25,6 @@ Formats = {
     },
 }
 
-local diagnostics_on = true
-function M.diagnostic_toggle()
-    if diagnostics_on then
-        vim.notify("disable diagnostics")
-        vim.diagnostic.enable(false)
-    else
-        vim.notify("enable diagnostics")
-        vim.diagnostic.enable(true)
-    end
-    diagnostics_on = not diagnostics_on
-end
-
 ---@diagnostic disable-next-line unused-local
 local function diagnostics_config(enable)
     if enable == nil then
@@ -306,7 +294,6 @@ function M.setup()
         map("n", "<leader>la", function() require("actions-preview").code_actions() end, opts)
         map("n", "<leader>ld", "<cmd>Telescope diagnostics bufnr=0<cr>", opts)
         map("n", "<leader>ls", "<cmd>Telescope lsp_workspace_symbols<cr>", opts)
-        map("n", "<leader>ltd", '<cmd>lua require("lsp").diagnostic_toggle()<CR>', opts)
         map("n", "<leader>lr", "<cmd>LspRestart<CR>", opts)
         map("n", "<leader>lf", "<cmd>lua require('lsp').format()<CR>", opts)
         map("v", "<leader>lf", "<cmd>lua require('lsp').format()<CR><ESC>", opts)
diff --git a/lua/option.lua b/lua/option.lua
index 75a9de4e..85e4eeaf 100644
--- a/lua/option.lua
+++ b/lua/option.lua
@@ -240,17 +240,3 @@ else
         }
     -- end
 end
-
--- large file {{{
-vim.cmd([[
-let g:LargeFile = 1024 * 1024 * 10
-autocmd myau BufReadPre * let f=getfsize(expand("<afile>")) | if f > g:LargeFile || f == -2 | call LargeFile() | endif
-function! LargeFile()
-  "set binary
-  setlocal eventignore+=FileType    "no syntax highlighting etc
-  setlocal bufhidden=unload         "save memory when other file is viewed
-  setlocal undolevels=-1            "no undo possible
-  " display message
-  autocmd myau VimEnter *  echo "The file is larger than " . (g:LargeFile / 1024 / 1024) . " MB, so some options are changed (see vim config for details)."
-endfunction
-]])
diff --git a/lua/plugins/mini.lua b/lua/plugins/mini.lua
index 05c836a9..55de9254 100644
--- a/lua/plugins/mini.lua
+++ b/lua/plugins/mini.lua
@@ -1,11 +1,4 @@
 return {
-    {
-        "echasnovski/mini.bufremove",
-        keys = { { "<leader>q", function() require("mini.bufremove").delete() end, desc = "Quit Buffer" } },
-        config = function()
-            require("mini.bufremove").setup()
-        end
-    },
     {
         "echasnovski/mini.surround",
         keys = { "<leader>s" },
diff --git a/lua/plugins/misc.lua b/lua/plugins/misc.lua
index 64c43539..4fa599b4 100644
--- a/lua/plugins/misc.lua
+++ b/lua/plugins/misc.lua
@@ -1,6 +1,5 @@
 return {
     { "wsdjeg/vim-fetch", lazy = false },
-    -- { "ojroques/nvim-osc52", opts = { silent = true, trim = false } },
     {
         "mbbill/fencview",
         cmd = { "FencView", "FencAutoDetect" },
@@ -10,21 +9,12 @@ return {
         end,
     },
     {
-        "ethanholz/nvim-lastplace",
-        lazy = false,
-        config = function()
-            require("nvim-lastplace").setup {
-                lastplace_ignore_buftype = { "quickfix", "nofile", "help" },
-                lastplace_ignore_filetype = { "gitcommit", "gitrebase", "svn", "hgcommit" },
-                lastplace_open_folds = true
-            }
+        "farmergreg/vim-lastplace",
+        init = function ()
+            vim.g.lastplace_ignore = "gitcommit,gitrebase,hgcommit,svn,xxd"
+            vim.g.lastplace_ignore_buftype = "help,nofile,quickfix"
+            vim.g.lastplace_open_folds = 0
         end
     },
-    -- {
-    --     "karb94/neoscroll.nvim",
-    --     config = function()
-    --         require("neoscroll").setup({})
-    --     end
-    -- },
     --{ 'simnalamburt/vim-mundo', event = 'VimEnter' },
 }
diff --git a/lua/plugins/multicursor.lua b/lua/plugins/multicursor.lua
index b1048299..03188b54 100644
--- a/lua/plugins/multicursor.lua
+++ b/lua/plugins/multicursor.lua
@@ -22,7 +22,7 @@ return {
                 if vim.v.hlsearch == 1 then
                     vim.cmd("noh")
                 end
-                require("notify").dismiss({})
+                -- require("notify").dismiss({})
             end
         end)
 
diff --git a/lua/plugins/snacks.lua b/lua/plugins/snacks.lua
new file mode 100644
index 00000000..5e0b043e
--- /dev/null
+++ b/lua/plugins/snacks.lua
@@ -0,0 +1,81 @@
+return {
+    "folke/snacks.nvim",
+    priority = 1000,
+    lazy = false,
+    keys = {
+        { "<leader>un", function() Snacks.notifier.hide() end, desc = "Dismiss All Notifications" },
+        { "<leader>q", function() Snacks.bufdelete() end, desc = "Delete Buffer" },
+        { "<leader>gg", function() Snacks.lazygit() end, desc = "Lazygit" },
+        { "<leader>gb", function() Snacks.git.blame_line() end, desc = "Git Blame Line" },
+        { "<leader>gB", function() Snacks.gitbrowse() end, desc = "Git Browse" },
+        { "<leader>gf", function() Snacks.lazygit.log_file() end, desc = "Lazygit Current File History" },
+        { "<leader>gl", function() Snacks.lazygit.log() end, desc = "Lazygit Log (cwd)" },
+        {
+            "<leader>N",
+            desc = "Neovim News",
+            function()
+                Snacks.win({
+                    file = vim.api.nvim_get_runtime_file("doc/news.txt", false)[1],
+                    width = 0.6,
+                    height = 0.6,
+                    wo = { spell = false, wrap = false, signcolumn = "yes", statuscolumn = " ", conceallevel = 3, },
+                })
+            end,
+        }
+    },
+    ---@module 'snacks'
+    ---@type snacks.Config
+    opts = {
+        bigfile = {
+            notify = true,
+            size = 1.5 * 1024 * 1024,
+            ---@param ctx {buf: number, ft:string}
+            setup = function(ctx)
+                vim.b.minianimate_disable = true
+                vim.schedule(function()
+                    vim.bo[ctx.buf].syntax = ctx.ft
+                end)
+            end,
+        },
+        notifier = {
+            enabled = true,
+            timeout = 3000,
+        },
+        quickfile = { enabled = true },
+        statuscolumn = { enabled = true },
+        words = { enabled = false },
+        styles = {
+            notification = {
+                wo = { wrap = true } -- Wrap notifications
+            }
+        }
+    },
+    init = function()
+        vim.api.nvim_create_autocmd("User", {
+            pattern = "VeryLazy",
+            callback = function()
+                -- Setup some globals for debugging (lazy-loaded)
+                _G.dd = function(...)
+                    Snacks.debug.inspect(...)
+                end
+                _G.bt = function()
+                    Snacks.debug.backtrace()
+                end
+                vim.print = _G.dd -- Override print to use snacks for `:=` command
+
+                -- Create some toggle mappings
+                Snacks.toggle.option("spell", { name = "Spelling" }):map("<leader>us")
+                Snacks.toggle.option("wrap", { name = "Wrap" }):map("<leader>uw")
+                Snacks.toggle.option("relativenumber", { name = "Relative Number" }):map("<leader>uL")
+                Snacks.toggle.diagnostics():map("<leader>ud")
+                Snacks.toggle.line_number():map("<leader>ul")
+                Snacks.toggle.option("conceallevel", { off = 0, on = vim.o.conceallevel > 0 and vim.o.conceallevel or 2 })
+                    :map("<leader>uc")
+                Snacks.toggle.treesitter():map("<leader>uT")
+                Snacks.toggle.option("background", { off = "light", on = "dark", name = "Dark Background" }):map(
+                    "<leader>ub")
+                Snacks.toggle.inlay_hints():map("<leader>uh")
+            end,
+        })
+    end,
+}
diff --git a/lua/plugins/telescope.lua b/lua/plugins/telescope.lua
index 129e54f4..04177c69 100644
--- a/lua/plugins/telescope.lua
+++ b/lua/plugins/telescope.lua
@@ -149,7 +149,7 @@ M.setup = { --{{{
         { "fl", "<cmd>Telescope current_buffer_fuzzy_find<cr>",     desc = "line" },
         { "fo", "<cmd>Telescope oldfiles<cr>",                      desc = "mru" },
         { "fm", "<cmd>Telescope marks<cr>",                         desc = "marks" },
-        { "fn", "<cmd>Telescope notify<cr>",                        desc = "notify" },
+        { "fn", "<cmd>lua Snacks.notifier.show_history({})<cr>",    desc = "notify" },
         { "fr", "<cmd>Telescope resume<cr>",                        desc = "resume" },
         { "ft", "<cmd>Telescope tags<cr>",                          desc = "tag" },
         { "f/", function() require("util").live_grep() end, mode = {"n", "x"},      desc = "live grep" },
@@ -218,7 +218,7 @@ M.setup = { --{{{
                 },
             },
         })
-        require("telescope").load_extension("notify")
+        -- require("telescope").load_extension("notify")
         require("telescope").load_extension("fzf")
         require("telescope").load_extension("ctags_outline")
         require("telescope").load_extension("live_grep_args")
diff --git a/lua/plugins/toggleterm.lua b/lua/plugins/toggleterm.lua
index f3066f07..b5a9c3d0 100644
--- a/lua/plugins/toggleterm.lua
+++ b/lua/plugins/toggleterm.lua
@@ -13,16 +13,6 @@ return {
             float_opts = float_opts,
             clear_env = true,
         })
-        local lazygit = require("toggleterm.terminal").Terminal:new {
-            cmd = "lazygit",
-            hidden = true,
-            direction = "float",
-            float_opts = float_opts,
-            on_create = function(t)
-                local bufnr = t.bufnr
-                vim.keymap.set("t", "<Esc>", "<Esc>", { buffer = bufnr })
-            end,
-        }
         local toggle = function()
             if vim.bo.filetype == "toggleterm" then
                 vim.cmd("ToggleTerm direction=float")
@@ -43,7 +33,6 @@ return {
             { "<leader>tt", "<cmd>ToggleTerm<CR>", desc = "ToggleTerm" },
             { "<leader>tf", "<cmd>ToggleTerm direction=float<CR>", desc = "ToggleTerm float" },
             { "<leader>gt", function() tig:toggle() end, desc = "tig" },
-            { "<leader>gl", function() lazygit:toggle() end, desc = "lazygit" },
         }
     end,
     config = function()