flake-modules/overlays.nix

@@ -1,23 +1,10 @@
 { inputs, ... }:
 {
   # Add unstable packages to overlay
-  flake.overlays.unstable =
-    final: prev:
-    let
-      unstablePkgs = inputs.unstable.legacyPackages.${prev.stdenv.hostPlatform.system};
-    in
-    {
-      # Get unstable packages
-      unstable = unstablePkgs;
+  flake.overlays.unstable = final: prev: {
+    unstable = inputs.unstable.legacyPackages.${prev.stdenv.hostPlatform.system};
 
-      # 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;
   };
-
 }

home/default.nix

@@ -118,7 +118,7 @@ in
         packages = [
           pkgs.gopass
           pkgs.sshfs
-          pkgs.gitoxide
+          pkgs.unstable.gitoxide
         ];
         # Extra variables
         sessionVariables = {
@@ -196,6 +196,7 @@ 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,6 +9,7 @@ in
     (import ./standalone.nix)
     (lib.mkIf cfg.enable {
       enable = true;
+      nixpkgs.useGlobalPackages = true;
       defaultEditor = lib.mkDefault true;
       jhome.nvim = cfg;
     })