flake-modules/overlays.nix

@@ -1,10 +1,23 @@
 { inputs, ... }:
 {
   # Add unstable packages to overlay
-  flake.overlays.unstable = final: prev: {
-    unstable = inputs.unstable.legacyPackages.${prev.stdenv.hostPlatform.system};
+  flake.overlays.unstable =
+    final: prev:
+    let
+      unstablePkgs = inputs.unstable.legacyPackages.${prev.stdenv.hostPlatform.system};
+    in
+    {
+      # Get unstable packages
+      unstable = unstablePkgs;
+
+      # Update vim plugins with the versions from unstable
+      vimPlugins = prev.vimPlugins // unstablePkgs.vimPlugins;
+
+      # Get specific packages from unstable
+      inherit (unstablePkgs)
+        gitoxide
+        jujutsu
+        ;
+    };
 
-    # use unstable vimPlugins
-    vimPlugins = prev.vimPlugins // final.unstable.vimPlugins;
-  };
 }

flake.lock

@@ -281,11 +281,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1737885640,
-        "narHash": "sha256-GFzPxJzTd1rPIVD4IW+GwJlyGwBDV1Tj5FLYwDQQ9sM=",
+        "lastModified": 1737672001,
+        "narHash": "sha256-YnHJJ19wqmibLQdUeq9xzE6CjrMA568KN/lFPuSVs4I=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "4e96537f163fad24ed9eb317798a79afc85b51b7",
+        "rev": "035f8c0853c2977b24ffc4d0a42c74f00b182cd8",
         "type": "github"
       },
       "original": {
@@ -316,11 +316,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1737995534,
-        "narHash": "sha256-in2EtlH84FJ5+7l2vBWhUiknmDFAHTuHIPSBiMhICyw=",
+        "lastModified": 1737914312,
+        "narHash": "sha256-PBF4R+yQt5Sls7CsA9Miwx28XtOP/yqaqejZ3RKSes0=",
         "owner": "nix-community",
         "repo": "nixvim",
-        "rev": "af4483c025ecf02ba36b2013eed0062ccd629809",
+        "rev": "8e5422bf3e76f410b97d2da640d0829e87657de9",
         "type": "github"
       },
       "original": {

home/default.nix

@@ -118,7 +118,7 @@ in
         packages = [
           pkgs.gopass
           pkgs.sshfs
-          pkgs.unstable.gitoxide
+          pkgs.gitoxide
         ];
         # Extra variables
         sessionVariables = {
@@ -196,7 +196,6 @@ in
         # Jujutsu (alternative DVCS (git-compatible))
         jujutsu = {
           enable = true;
-          package = pkgs.unstable.jujutsu;
           settings = {
             ui.pager = "bat";
             # mimic git commit --verbose by adding a diff

nvim/default.nix

@@ -9,7 +9,6 @@ in
     (import ./standalone.nix)
     (lib.mkIf cfg.enable {
       enable = true;
-      nixpkgs.useGlobalPackages = true;
       defaultEditor = lib.mkDefault true;
       jhome.nvim = cfg;
     })