diff --git a/home/programs/nvf/default.nix b/home/programs/nvf/default.nix
index 2e73b78..0fa3ce0 100644
--- a/home/programs/nvf/default.nix
+++ b/home/programs/nvf/default.nix
@@ -4,15 +4,6 @@
   ...
 }: {
   imports = [inputs.nvf.homeManagerModules.default];
-  # Packages needed by snacks image preview
-  home.packages = with pkgs; [
-    imagemagick
-    tree-sitter
-    ghostscript
-    tectonic
-    mermaid-cli
-  ];
-
   programs.nvf = {
     enable = true;
     settings = {
diff --git a/home/programs/nvf/keymaps.nix b/home/programs/nvf/keymaps.nix
index 6a67d27..8e9c067 100644
--- a/home/programs/nvf/keymaps.nix
+++ b/home/programs/nvf/keymaps.nix
@@ -1,20 +1,13 @@
 {
   vim = {
     globals.mapleader = " ";
-    binds = {
-      whichKey = {
-        enable = true;
-        register = {};
-      };
-    };
     keymaps = [
-      # General Mappings
       {
         key = "s";
         mode = "n";
         silent = true;
-        action = "<cmd>lua require('flash').jump()<cr>";
-        desc = "Flash";
+        action = "<cmd>lua MiniJump2d.start(MiniJump2d.builtin_opts.single_character)<cr>";
+        desc = "Jump2d";
       }
       {
         key = "K";
@@ -31,6 +24,177 @@
         desc = "Next Buffer";
       }
 
+      # Format
+      {
+        key = "<leader>lf";
+        mode = "n";
+        silent = true;
+        action = "<cmd>lua require('conform').format({ async = true, lsp_format = 'fallback' })<cr>";
+        desc = "Format file";
+      }
+
+      # Terminal
+      {
+        key = "<leader>tt";
+        mode = "n";
+        silent = true;
+        action = "<cmd>lua Snacks.terminal.toggle()<cr>";
+        desc = "Toggle terminal";
+      }
+      {
+        key = "<leader>tf";
+        mode = "n";
+        silent = true;
+        action = "<cmd>lua Snacks.terminal.toggle(nil, { style = 'float' })<cr>";
+        desc = "Toggle terminal (float)";
+      }
+      {
+        key = "<leader>tg";
+        mode = "n";
+        silent = true;
+        action = "<cmd>lua Snacks.lazygit()<cr>";
+        desc = "Lazygit";
+      }
+
+      # UI
+      {
+        key = "<leader>uw";
+        mode = "n";
+        silent = true;
+        action = "<cmd>set wrap!<cr>";
+        desc = "Toggle word wrapping";
+      }
+      {
+        key = "<leader>ul";
+        mode = "n";
+        silent = true;
+        action = "<cmd>set linebreak!<cr>";
+        desc = "Toggle linebreak";
+      }
+      {
+        key = "<leader>us";
+        mode = "n";
+        silent = true;
+        action = "<cmd>set spell!<cr>";
+        desc = "Toggle spellLazyGitcheck";
+      }
+      {
+        key = "<leader>uc";
+        mode = "n";
+        silent = true;
+        action = "<cmd>set cursorline!<cr>";
+        desc = "Toggle cursorline";
+      }
+      {
+        key = "<leader>un";
+        mode = "n";
+        silent = true;
+        action = "<cmd>set number!<cr>";
+        desc = "Toggle line numbers";
+      }
+      {
+        key = "<leader>ur";
+        mode = "n";
+        silent = true;
+        action = "<cmd>set relativenumber!<cr>";
+        desc = "Toggle relative line numbers";
+      }
+      {
+        key = "<leader>ut";
+        mode = "n";
+        silent = true;
+        action = "<cmd>set showtabline=2<cr>";
+        desc = "Show tabline";
+      }
+      {
+        key = "<leader>uT";
+        mode = "n";
+        silent = true;
+        action = "<cmd>set showtabline=0<cr>";
+        desc = "Hide tabline";
+      }
+
+      # Todos
+      {
+        key = "<leader>xt";
+        mode = "n";
+        silent = true;
+        action = "<cmd>TodoTrouble<cr>";
+        desc = "Todo (Trouble)";
+      }
+
+      # QOL
+      {
+        key = ">";
+        mode = "v";
+        silent = true;
+        action = ">gv";
+        desc = "Indent and keep selection";
+      }
+      {
+        key = "<";
+        mode = "v";
+        silent = true;
+        action = "<gv";
+        desc = "Dedent and keep selection";
+      }
+
+      # Move
+      {
+        key = "<C-h>";
+        mode = "n";
+        silent = true;
+        action = "<C-w>h";
+        desc = "Move to left window";
+      }
+      {
+        key = "<C-j>";
+        mode = "n";
+        silent = true;
+        action = "<C-w>j";
+        desc = "Move to bottom window";
+      }
+      {
+        key = "<C-k>";
+        mode = "n";
+        silent = true;
+        action = "<C-w>k";
+        desc = "Move to top window";
+      }
+      {
+        key = "<C-l>";
+        mode = "n";
+        silent = true;
+        action = "<C-w>l";
+        desc = "Move to right window";
+      }
+
+      # Save
+      {
+        key = "<C-s>";
+        mode = [
+          "n"
+          "i"
+          "v"
+        ];
+        silent = true;
+        action = "<cmd>w<cr>";
+        desc = "Save file";
+      }
+
+      # Deactivate "esc"
+      {
+        key = "<Esc>";
+        mode = [
+          "n"
+          "i"
+          "v"
+        ];
+        silent = true;
+        action = "<Nop>";
+        desc = "Disable Escape";
+      }
+
       # Disable Arrow Keys in Normal Mode and Middle click
       {
         key = "<Up>";
@@ -90,168 +254,6 @@
         action = "<nop>";
         silent = true;
       }
-
-      # UI
-      {
-        key = "<leader>uw";
-        mode = "n";
-        silent = true;
-        action = "<cmd>set wrap!<cr>";
-        desc = "Toggle word wrapping";
-      }
-      {
-        key = "<leader>ul";
-        mode = "n";
-        silent = true;
-        action = "<cmd>set linebreak!<cr>";
-        desc = "Toggle linebreak";
-      }
-      {
-        key = "<leader>us";
-        mode = "n";
-        silent = true;
-        action = "<cmd>set spell!<cr>";
-        desc = "Toggle spellLazyGitcheck";
-      }
-      {
-        key = "<leader>uc";
-        mode = "n";
-        silent = true;
-        action = "<cmd>set cursorline!<cr>";
-        desc = "Toggle cursorline";
-      }
-      {
-        key = "<leader>un";
-        mode = "n";
-        silent = true;
-        action = "<cmd>set number!<cr>";
-        desc = "Toggle line numbers";
-      }
-      {
-        key = "<leader>ur";
-        mode = "n";
-        silent = true;
-        action = "<cmd>set relativenumber!<cr>";
-        desc = "Toggle relative line numbers";
-      }
-      {
-        key = "<leader>ut";
-        mode = "n";
-        silent = true;
-        action = "<cmd>set showtabline=2<cr>";
-        desc = "Show tabline";
-      }
-      {
-        key = "<leader>uT";
-        mode = "n";
-        silent = true;
-        action = "<cmd>set showtabline=0<cr>";
-        desc = "Hide tabline";
-      }
-
-      # Windows
-      {
-        key = "<leader>ws";
-        mode = "n";
-        silent = true;
-        action = "<cmd>split<cr>";
-        desc = "Split";
-      }
-      {
-        key = "<leader>wv";
-        mode = "n";
-        silent = true;
-        action = "<cmd>vsplit<cr>";
-        desc = "VSplit";
-      }
-      {
-        key = "<leader>wd";
-        mode = "n";
-        silent = true;
-        action = "<cmd>close<cr>";
-        desc = "Close";
-      }
-
-      # QOL
-      {
-        key = ">";
-        mode = "v";
-        silent = true;
-        action = ">gv";
-        desc = "Indent and keep selection";
-      }
-      {
-        key = "<";
-        mode = "v";
-        silent = true;
-        action = "<gv";
-        desc = "Dedent and keep selection";
-      }
-
-      # Move
-      {
-        key = "<C-h>";
-        mode = "n";
-        silent = true;
-        action = "<C-w>h";
-        desc = "Move to left window";
-      }
-      {
-        key = "<C-j>";
-        mode = "n";
-        silent = true;
-        action = "<C-w>j";
-        desc = "Move to bottom window";
-      }
-      {
-        key = "<C-k>";
-        mode = "n";
-        silent = true;
-        action = "<C-w>k";
-        desc = "Move to top window";
-      }
-      {
-        key = "<C-l>";
-        mode = "n";
-        silent = true;
-        action = "<C-w>l";
-        desc = "Move to right window";
-      }
-
-      # Format
-      {
-        key = "<leader>lf";
-        mode = "n";
-        silent = true;
-        action = "<cmd>lua require('conform').format({ async = true, lsp_format = 'fallback' })<cr>";
-        desc = "Format file";
-      }
-
-      # Save
-      {
-        key = "<C-s>";
-        mode = [
-          "n"
-          "i"
-          "v"
-        ];
-        silent = true;
-        action = "<cmd>w<cr>";
-        desc = "Save file";
-      }
-
-      # Deactivate "esc"
-      {
-        key = "<Esc>";
-        mode = [
-          "n"
-          "i"
-          "v"
-        ];
-        silent = true;
-        action = "<Nop>";
-        desc = "Disable Escape";
-      }
     ];
   };
 }
diff --git a/home/programs/nvf/languages.nix b/home/programs/nvf/languages.nix
index fc570de..e447641 100644
--- a/home/programs/nvf/languages.nix
+++ b/home/programs/nvf/languages.nix
@@ -1,8 +1,4 @@
-{
-  lib,
-  pkgs,
-  ...
-}: {
+{...}: {
   vim = {
     diagnostics = {
       enable = true;
@@ -17,18 +13,7 @@
         };
         underline = true;
         update_in_insert = true;
-        virtual_text = {
-          format =
-            lib.generators.mkLuaInline
-            /*
-            lua
-            */
-            ''
-              function(diagnostic)
-                return string.format("%s", diagnostic.message)
-              end
-            '';
-        };
+        virtual_text = true;
       };
       nvim-lint = {
         enable = true;
@@ -39,9 +24,6 @@
       autotagHtml = true;
       context.enable = true;
       highlight.enable = true;
-      grammars = with pkgs.vimPlugins.nvim-treesitter.builtGrammars; [
-        typescript
-      ];
     };
     lsp = {
       enable = true;
@@ -53,11 +35,10 @@
       trouble.enable = true;
       lspSignature.enable = true;
       lspconfig.enable = true;
-      formatOnSave = true;
+      formatOnSave = false;
       mappings.format = null;
       inlayHints.enable = true;
-      null-ls.enable = true;
-      servers.nixd.settings.nil.nix.autoArchive = true;
+      servers.nil.settings.nix.autoArchive = true;
       otter-nvim = {
         enable = true;
         setupOpts = {
@@ -81,12 +62,11 @@
             sign = false;
             virtual_text = true;
           };
-          breadcrumbs.enable = false;
+          symbol_in_winbar.enable = false;
         };
       };
     };
     languages = {
-      enableDAP = true;
       enableExtraDiagnostics = true;
       enableFormat = true;
       enableTreesitter = true;
@@ -106,19 +86,18 @@
         extensions = {
           markview-nvim = {
             enable = true;
+            setupOpts = {
+              preview = {
+                hybrid_modes = ["n"];
+              };
+            };
           };
         };
         extraDiagnostics.enable = true;
       };
-      typescript = {
-        enable = true;
-        extensions.ts-error-translator.enable = true;
-      };
+      typescript.enable = true;
       css.enable = true;
-      svelte = {
-        enable = true;
-        format.enable = false;
-      };
+      svelte.enable = true;
       html.enable = true;
       bash.enable = true;
       nix.enable = true;
@@ -127,7 +106,9 @@
     formatter = {
       conform-nvim = {
         enable = true;
-        setupOpts.format_after_save = null;
+        setupOpts.format_on_save = {
+          lsp_format = "fallback";
+        };
       };
     };
   };
diff --git a/home/programs/nvf/mini.nix b/home/programs/nvf/mini.nix
index 7d3c42d..ac4d075 100644
--- a/home/programs/nvf/mini.nix
+++ b/home/programs/nvf/mini.nix
@@ -1,12 +1,48 @@
 {
+  vim.luaConfigRC.mini-clue = ''
+    local miniclue = require('mini.clue')
+    miniclue.setup({
+      triggers = {
+        { mode = 'n', keys = '<Leader>' },
+        { mode = 'x', keys = '<Leader>' },
+        { mode = 'n', keys = 'g' },
+        { mode = 'x', keys = 'g' },
+        { mode = 'n', keys = "'" },
+        { mode = 'n', keys = '`' },
+        { mode = 'n', keys = '"' },
+        { mode = 'i', keys = '<C-r>' },
+        { mode = 'c', keys = '<C-r>' },
+        { mode = 'n', keys = '<C-w>' },
+        { mode = 'n', keys = 'z' },
+      },
+      clues = {
+        miniclue.gen_clues.g(),
+        miniclue.gen_clues.marks(),
+        miniclue.gen_clues.registers(),
+        miniclue.gen_clues.windows({ submode_resize = true }),
+        miniclue.gen_clues.z(),
+        { mode = 'n', keys = '<Leader>f', desc = '+find' },
+        { mode = 'n', keys = '<Leader>s', desc = '+search' },
+        { mode = 'n', keys = '<Leader>t', desc = '+terminal' },
+        { mode = 'n', keys = '<Leader>u', desc = '+ui' },
+        { mode = 'n', keys = '<Leader>l', desc = '+lsp' },
+        { mode = 'n', keys = '<Leader>x', desc = '+trouble' },
+      },
+      window = { delay = 300 },
+    })
+  '';
+
   vim.mini = {
+    ai.enable = true;
     starter.enable = true;
     comment.enable = true;
     icons.enable = true;
     indentscope.enable = true;
-    notify.enable = true;
     pairs.enable = true;
     diff.enable = true;
     git.enable = true;
+    jump2d.enable = true;
+    statusline.enable = true;
+    clue.enable = true;
   };
 }
diff --git a/home/programs/nvf/options.nix b/home/programs/nvf/options.nix
index 8ff0bcb..28fd9e7 100644
--- a/home/programs/nvf/options.nix
+++ b/home/programs/nvf/options.nix
@@ -17,17 +17,10 @@
       softtabstop = 2;
       wrap = false;
     };
-    globals = {
-      navic_silence = true;
-      suda_smart_edit = 1;
-      neovide_scale_factor = 0.7;
-      neovide_cursor_animation_length = 0.1;
-      neovide_cursor_short_animation_length = 0;
-    };
+    globals.navic_silence = true;
     clipboard = {
       enable = true;
       registers = "unnamedplus";
-      providers.wl-copy.enable = true;
     };
     luaConfigRC.osc52-clipboard = ''
       vim.g.clipboard = {
diff --git a/home/programs/nvf/picker.nix b/home/programs/nvf/picker.nix
index f7225e3..8ef37d6 100644
--- a/home/programs/nvf/picker.nix
+++ b/home/programs/nvf/picker.nix
@@ -1,7 +1,6 @@
 {
   vim = {
     utility = {
-      oil-nvim.enable = true;
       snacks-nvim = {
         setupOpts = {
           picker.enabled = true;
@@ -18,27 +17,6 @@
         action = "<cmd>lua Snacks.picker.smart()<cr>";
         desc = "Smart Find Files";
       }
-      {
-        key = "<leader>,";
-        mode = "n";
-        silent = true;
-        action = "<cmd>lua Snacks.picker.buffers()<cr>";
-        desc = "Buffers";
-      }
-      {
-        key = "<leader>/";
-        mode = "n";
-        silent = true;
-        action = "<cmd>lua Snacks.picker.grep()<cr>";
-        desc = "Grep";
-      }
-      {
-        key = "<leader>:";
-        mode = "n";
-        silent = true;
-        action = "<cmd>lua Snacks.picker.command_history()<cr>";
-        desc = "Command History";
-      }
       {
         key = "<leader>e";
         mode = "n";
@@ -47,11 +25,11 @@
         desc = "File Explorer";
       }
       {
-        key = "-";
+        key = "<leader>/";
         mode = "n";
         silent = true;
-        action = "<cmd>Oil<cr>";
-        desc = "Oil";
+        action = "<cmd>lua Snacks.picker.lines()<cr>";
+        desc = "Buffer Lines";
       }
 
       # Find
@@ -62,13 +40,6 @@
         action = "<cmd>lua Snacks.picker.buffers()<cr>";
         desc = "Buffers";
       }
-      {
-        key = "<leader>fc";
-        mode = "n";
-        silent = true;
-        action = ''<cmd>lua Snacks.picker.files({ cwd = vim.fn.stdpath("config") })<cr>'';
-        desc = "Find Config File";
-      }
       {
         key = "<leader>ff";
         mode = "n";
@@ -76,13 +47,6 @@
         action = "<cmd>lua Snacks.picker.files()<cr>";
         desc = "Find Files";
       }
-      {
-        key = "<leader>fg";
-        mode = "n";
-        silent = true;
-        action = "<cmd>lua Snacks.picker.git_files()<cr>";
-        desc = "Find Git Files";
-      }
       {
         key = "<leader>fp";
         mode = "n";
@@ -97,6 +61,13 @@
         action = "<cmd>lua Snacks.picker.recent()<cr>";
         desc = "Recent";
       }
+      {
+        key = "<leader>f:";
+        mode = "n";
+        silent = true;
+        action = "<cmd>lua Snacks.picker.command_history()<cr>";
+        desc = "Command History";
+      }
       {
         key = "<leader>fn";
         mode = "n";
@@ -104,65 +75,14 @@
         action = "<cmd>lua Snacks.picker.notifications()<cr>";
         desc = "Notification History";
       }
-      {
-        key = "<leader>fe";
-        mode = "n";
-        silent = true;
-        action = "<cmd>lua Snacks.picker.icons()<cr>";
-        desc = "Emoji";
-      }
-
-      # Git
-      {
-        key = "<leader>gb";
-        mode = "n";
-        silent = true;
-        action = "<cmd>lua Snacks.picker.git_branches()<cr>";
-        desc = "Git Branches";
-      }
-      {
-        key = "<leader>gL";
-        mode = "n";
-        silent = true;
-        action = "<cmd>lua Snacks.picker.git_log()<cr>";
-        desc = "Git Log Line";
-      }
-      {
-        key = "<leader>gs";
-        mode = "n";
-        silent = true;
-        action = "<cmd>lua Snacks.picker.git_status()<cr>";
-        desc = "Git Status";
-      }
-      {
-        key = "<leader>gS";
-        mode = "n";
-        silent = true;
-        action = "<cmd>lua Snacks.picker.git_stash()<cr>";
-        desc = "Git Stash";
-      }
-      {
-        key = "<leader>gd";
-        mode = "n";
-        silent = true;
-        action = "<cmd>lua Snacks.picker.git_diff()<cr>";
-        desc = "Git Diff (Hunks)";
-      }
-      {
-        key = "<leader>gf";
-        mode = "n";
-        silent = true;
-        action = "<cmd>lua Snacks.picker.git_log_file()<cr>";
-        desc = "Git Log File";
-      }
 
       # Grep
       {
-        key = "<leader>sb";
+        key = "<leader>sg";
         mode = "n";
         silent = true;
-        action = "<cmd>lua Snacks.picker.lines()<cr>";
-        desc = "Buffer Lines";
+        action = "<cmd>lua Snacks.picker.grep()<cr>";
+        desc = "Grep";
       }
       {
         key = "<leader>st";
@@ -171,20 +91,6 @@
         action = "<cmd>lua Snacks.picker.todo_comments()<cr>";
         desc = "Todos";
       }
-      {
-        key = "<leader>sB";
-        mode = "n";
-        silent = true;
-        action = "<cmd>lua Snacks.picker.grep_buffers()<cr>";
-        desc = "Grep Open Buffers";
-      }
-      {
-        key = "<leader>sg";
-        mode = "n";
-        silent = true;
-        action = "<cmd>lua Snacks.picker.grep()<cr>";
-        desc = "Grep";
-      }
       {
         key = "<leader>sw";
         mode = "n";
diff --git a/home/programs/nvf/snacks.nix b/home/programs/nvf/snacks.nix
index 2b00dbe..85a25e0 100644
--- a/home/programs/nvf/snacks.nix
+++ b/home/programs/nvf/snacks.nix
@@ -2,18 +2,17 @@
   vim.utility.snacks-nvim = {
     enable = true;
     setupOpts = {
-      image = {
-        enabled = true;
-        doc = {
-          inline = false;
-          float = true;
-        };
-      };
       quickfile.enabled = true;
       statuscolumn.enabled = true;
       zen.enabled = true;
       bufdelete.enabled = true;
       gitsigns.enabled = true;
+      animate.enabled = true;
+      lazygit = {
+        enabled = true;
+        configure = false;
+      };
+      terminal.enabled = true;
     };
   };
 }
diff --git a/home/programs/nvf/utils.nix b/home/programs/nvf/utils.nix
index 7a1356d..7982176 100644
--- a/home/programs/nvf/utils.nix
+++ b/home/programs/nvf/utils.nix
@@ -1,17 +1,15 @@
 {pkgs, ...}: {
   vim = {
+    luaConfigRC.remove-todo-keymaps = ''
+      vim.keymap.del("n", "<leader>tdq")
+      vim.keymap.del("n", "<leader>tdt")
+    '';
     undoFile.enable = true;
-    utility = {
-      motion.flash-nvim.enable = true;
-      outline.aerial-nvim.enable = true;
-    };
-    tabline.nvimBufferline.enable = true;
     notes.todo-comments.enable = true;
     assistant.copilot = {
       enable = true;
       cmp.enable = true;
     };
-    statusline.lualine.enable = true;
 
     autocomplete = {
       nvim-cmp = {
@@ -31,22 +29,9 @@
       noice.enable = true;
       colorizer.enable = true;
     };
-    git = {
-      enable = true;
-      gitsigns.enable = true;
-    };
-    terminal.toggleterm = {
-      enable = true;
-      lazygit = {
-        enable = true;
-        mappings.open = "<leader>gl";
-      };
-    };
+
     visuals = {
       rainbow-delimiters.enable = true;
-      nvim-scrollbar = {
-        enable = false;
-      };
     };
   };
 }