default.nix

@@ -13,33 +13,19 @@ let
   storePathLength = builtins.stringLength (builtins.toString builtins.storeDir);
   evaluatingInStore = (builtins.substring 0 storePathLength currentFilePath) == builtins.storeDir;
 
-  gitlessSelfInStore = {
+  selfInStore = builtins.path {
-    outPath = builtins.path {
+    path = ./.;
-      path = ./.;
+    name = "source";
-      name = "source";
+    filter = path: type:
-      filter = path: type:
+      let
-        let
+        selfPath = builtins.dirOf currentFilePath;
-          selfPath = builtins.dirOf currentFilePath;
+        gitIgnoreFilters = lib.parseGitignore selfPath path;
-          gitIgnoreFilters = lib.parseGitignore selfPath path;
+        result = type != "unknown"
-          result = type != "unknown"
+          && type != "symlink"
-            && type != "symlink"
+          && builtins.baseNameOf path != ".git"
-            && builtins.baseNameOf path != ".git"
+          && lib.runGitignoreFilter gitIgnoreFilters path type;
-            && lib.runGitignoreFilter gitIgnoreFilters path type;
+      in result;
-        in result;
-    };
-    selfMode = "path";
   };
-  gitfullSelfInStore = builtins.fetchGit "file://${builtins.toString ./.}" // {
-    selfMode = "git";
-  };
-
-  selfInStore' = builtins.tryEval gitfullSelfInStore;
-  selfInStore = if selfInStore'.success then selfInStore'.value else gitlessSelfInStore;
 in
-if !(evaluatingInStore) then { ... }@args: import selfInStore ({
+if !(evaluatingInStore) then { ... }@args: import selfInStore ({ selfPath = selfInStore; } // args )
-  selfPath = {
-    outPath = builtins.toString ./.;
-    selfMode = "store";
-  };
-} // args )
 else { ... }@args: import ./outputs.nix ({ selfPath = selfInStore; } // args)

nix-os/nix.nix

@@ -54,7 +54,6 @@ in {
     nix.package = wrappedNixExecutables false;
     environment.systemPackages = [
       pkgs.nix-output-monitor
-      pkgs.nix-diff
     ] ++ lib.map (lib.hiPrio) [
       (wrappedNixExecutables true)
       wrappedNixosExecutables

outputs.nix

@@ -1,10 +1,7 @@
 {
   inputsPath ? ./inputs.nix,
   inputs ? import inputsPath {},
-  selfPath ? {
+  selfPath ? builtins.toString ./.,
-    outPath = builtins.toString ./.;
-    selfMode = "impure";
-  },
 }:
 
 let