From 60716fe535d2a5c4839fbb2d0050a9520fa3a594 Mon Sep 17 00:00:00 2001
From: sinanmohd <sinan@sinanmohd.com>
Date: Thu, 11 Dec 2025 14:17:25 +0530
Subject: chore(common/nix): drop upstreamed changes

---
 os/common/modules/nix/default.nix | 49 ------------------------------------
 os/common/modules/nix/nix.patch   | 53 ---------------------------------------
 2 files changed, 102 deletions(-)
 delete mode 100644 os/common/modules/nix/default.nix
 delete mode 100644 os/common/modules/nix/nix.patch

(limited to 'os/common/modules/nix')

diff --git a/os/common/modules/nix/default.nix b/os/common/modules/nix/default.nix
deleted file mode 100644
index e7c5bfb..0000000
--- a/os/common/modules/nix/default.nix
+++ /dev/null
@@ -1,49 +0,0 @@
-{
-  config,
-  pkgs,
-  determinate,
-  lib,
-  ...
-}:
-let
-  user = config.global.userdata.name;
-
-  nixWithFix = determinate.inputs.nix.packages.${pkgs.stdenv.system}.nix-everything.override {
-    nix-cli = determinate.inputs.nix.packages.${pkgs.stdenv.system}.nix-cli.overrideAttrs (oldAttrs: {
-      patches = (oldAttrs.patches or [ ]) ++ [
-        ./nix.patch
-      ];
-    });
-  };
-in
-{
-  nix = {
-    package = lib.mkForce nixWithFix;
-
-    gc = {
-      automatic = true;
-      dates = "weekly";
-      options = "--delete-older-than 30d";
-    };
-
-    settings = {
-      auto-optimise-store = true;
-      use-xdg-base-directories = true;
-      trusted-users = [ user ];
-
-      experimental-features = [
-        "flakes"
-        "nix-command"
-      ];
-
-      substituters = [
-        "https://nixbin.sinanmohd.com"
-        "https://nix-community.cachix.org"
-      ];
-      trusted-public-keys = [
-        "nixbin.sinanmohd.com:dXV3KDPVrm+cGJ2M1ZmTeQJqFGaEapqiVoWHgYDh03k="
-        "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
-      ];
-    };
-  };
-}
diff --git a/os/common/modules/nix/nix.patch b/os/common/modules/nix/nix.patch
deleted file mode 100644
index 606e61d..0000000
--- a/os/common/modules/nix/nix.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-diff --git a/develop.cc b/develop.cc
-index c27c254fb..e914d5f6c 100644
---- a/develop.cc
-+++ b/develop.cc
-@@ -629,13 +629,12 @@ struct CmdDevelop : Common, MixEnvironment
-                     fmt("[ -n \"$PS1\" ] && PS1+=%s;\n", escapeShellArgAlways(developSettings.bashPromptSuffix.get()));
-         }
- 
--        writeFull(rcFileFd.get(), script);
--
-         setEnviron();
-         // prevent garbage collection until shell exits
-         setEnv("NIX_GCROOT", store->printStorePath(gcroot).c_str());
- 
-         Path shell = "bash";
-+        bool foundInteractive = false;
- 
-         try {
-             auto state = getEvalState();
-@@ -658,19 +657,17 @@ struct CmdDevelop : Common, MixEnvironment
-                 Strings{"legacyPackages." + settings.thisSystem.get() + "."},
-                 nixpkgsLockFlags);
- 
--            bool found = false;
--
-             for (auto & path : Installable::toStorePathSet(
-                      getEvalStore(), store, Realise::Outputs, OperateOn::Output, {bashInstallable})) {
-                 auto s = store->printStorePath(path) + "/bin/bash";
-                 if (pathExists(s)) {
-                     shell = s;
--                    found = true;
-+                    foundInteractive = true;
-                     break;
-                 }
-             }
- 
--            if (!found)
-+            if (!foundInteractive)
-                 throw Error("package 'nixpkgs#bashInteractive' does not provide a 'bin/bash'");
- 
-         } catch (Error &) {
-@@ -680,6 +677,11 @@ struct CmdDevelop : Common, MixEnvironment
-         // Override SHELL with the one chosen for this environment.
-         // This is to make sure the system shell doesn't leak into the build environment.
-         setEnv("SHELL", shell.c_str());
-+        // https://github.com/NixOS/nix/issues/5873
-+        script += fmt("SHELL=\"%s\"\n", shell);
-+        if (foundInteractive)
-+            script += fmt("PATH=\"%s${PATH:+:$PATH}\"\n", std::filesystem::path(shell).parent_path());
-+        writeFull(rcFileFd.get(), script);
- 
- #ifdef _WIN32 // TODO re-enable on Windows
-         throw UnimplementedError("Cannot yet spawn processes on Windows");
-- 
cgit v1.2.3