diff --git a/modules/config/theming/default.nix b/modules/config/theming/default.nix
index 9704874..6764501 100644
--- a/modules/config/theming/default.nix
+++ b/modules/config/theming/default.nix
@@ -35,9 +35,7 @@ in
       font-size = "20";
       font =
         let
-          fontBasePath = pkgs.nerdfonts.override {
-            fonts = [ "FiraCode" ];
-          };
+          fontBasePath = pkgs.nerd-fonts.fira-code;
         in
         "${fontBasePath}/share/fonts/truetype/NerdFonts/FiraCodeNerdFont-Regular.ttf";
       height = "360";
diff --git a/modules/profiles/base.nix b/modules/profiles/base.nix
index 2513511..cd2ef04 100644
--- a/modules/profiles/base.nix
+++ b/modules/profiles/base.nix
@@ -255,10 +255,8 @@ in
   fonts = {
     enableDefaultPackages = true;
     packages = [
-      (pkgs.nerdfonts.override {
-        fonts = [ "FiraCode" ];
-      })
-      pkgs.master.intel-one-mono
+      pkgs.nerd-fonts.fira-code
+      pkgs.nerd-fonts.intone-mono
     ];
   };
 
diff --git a/modules/programs/nvim/new_plugins/lazygit.nix b/modules/programs/nvim/new_plugins/lazygit.nix
deleted file mode 100644
index 9cb3060..0000000
--- a/modules/programs/nvim/new_plugins/lazygit.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-_:
-
-{
-  home-manager.users.moritz.programs.nixvim = {
-    keymaps = [
-      { key = "<leader>g"; action = "<cmd>LazyGit<cr>"; options.desc = "Lazygit"; }
-    ];
-
-    plugins.lazygit = {
-      enable = true;
-      settings = { };
-    };
-  };
-}
diff --git a/modules/programs/nvim/new_plugins/snacks.nix b/modules/programs/nvim/new_plugins/snacks.nix
new file mode 100644
index 0000000..8f2cddb
--- /dev/null
+++ b/modules/programs/nvim/new_plugins/snacks.nix
@@ -0,0 +1,25 @@
+_:
+
+{
+  home-manager.users.moritz.programs.nixvim = {
+    keymaps = [
+      {
+        key = "<leader>g";
+        action.__raw = ''
+          function()
+            require("snacks").lazygit()
+          end
+        '';
+        options.desc = "Lazygit";
+      }
+    ];
+
+    plugins.snacks = {
+      enable = true;
+      settings = {
+        bigfile.enable = true;
+        lazygit.enable = true;
+      };
+    };
+  };
+}