diff --git a/home/neovim.nix b/home/neovim.nix
index b1231cf..04663d7 100644
--- a/home/neovim.nix
+++ b/home/neovim.nix
@@ -16,11 +16,25 @@
         dropbar.enable = true;
         lspconfig.enable = true;
         guess-indent.enable = true;
+        gitsigns = {
+          enable = true;
+          settings = {
+            sign_priority = 15;
+          };
+        };
         oil.enable = true;
-        mini-statusline.enable = true;
+        trouble.enable = true;
+        web-devicons.enable = true;
+        lualine.enable = true;
         mini-pairs.enable = true;
-        mini-pick.enable = true;
-        mini-diff.enable = true;
+        snacks = {
+          enable = true;
+          settings = {
+            picker = {
+              ui_select = true;
+            };
+          };
+        };
         mini-indentscope.enable = true;
         mini-surround.enable = true;
         ts-autotag.enable = true;
@@ -116,19 +130,19 @@
           key = "<leader>o";
         }
         {
-          action = "<cmd>lua require('mini.pick').builtin.files()<CR>";
+          action = "<cmd>lua require('snacks').picker.files()<CR>";
           key = "<leader>f";
         }
         {
-          action = "<cmd>lua require('mini.pick').builtin.grep_live()<CR>";
-          key = "<leader>g";
+          action = "<cmd>lua require('snacks').picker.grep()<CR>";
+          key = "<leader>l";
         }
         {
-          action = "<cmd>lua require('mini.pick').builtin.help()<CR>";
+          action = "<cmd>lua require('snacks').picker.help()<CR>";
           key = "<leader>h";
         }
         {
-          action = "<cmd>lua require('mini.pick').builtin.resume()<CR>";
+          action = "<cmd>lua require('snacks').picker.resume()<CR>";
           key = "<leader>r";
         }
         {
@@ -148,7 +162,7 @@
           key = "]d";
         }
         {
-          action = "<cmd>lua vim.diagnostic.setqflist()<CR>";
+          action = "<cmd>Trouble diagnostics<CR>";
           key = "<leader>q";
         }
         {
@@ -181,7 +195,15 @@
         }
         {
           action = "<cmd>Neogit<CR>";
-          key = "<leader>i";
+          key = "<leader>go";
+        }
+        {
+          action = "<cmd>Gitsigns blame<CR>";
+          key = "<leader>gb";
+        }
+        {
+          action = "<cmd>Gitsigns diffthis<CR>";
+          key = "<leader>gd";
         }
       ];
       globals.mapleader = " ";
@@ -193,7 +215,20 @@
         swapfile = false;
         exrc = true;
       };
-      colorschemes.catppuccin.enable = true;
+      colorschemes.catppuccin = {
+        enable = true;
+        settings = {
+          custom_highlights = {
+            __raw = ''
+              function(colors)
+                return {
+                  LineNr = { fg = colors.subtext0 },
+                }
+              end
+            '';
+          };
+        };
+      };
       clipboard.register = "unnamedplus";
       userCommands = {
         CopyRelativePath = {