Add a modified nix-init :)

This reverts commit dc701e7cec.
Testing source for `error: nose-1.3.7 not supported for interpreter python3.12`

flake.lock

@@ -34,11 +34,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1718371084,
+        "lastModified": 1720546205,
-        "narHash": "sha256-abpBi61mg0g+lFFU0zY4C6oP6fBwPzbHPKBGw676xsA=",
+        "narHash": "sha256-boCXsjYVxDviyzoEyAk624600f3ZBo/DKtUdvMTpbGY=",
         "owner": "ryantm",
         "repo": "agenix",
-        "rev": "3a56735779db467538fb2e577eda28a9daacaca6",
+        "rev": "de96bd907d5fbc3b14fc33ad37d1b9a3cb15edc6",
         "type": "github"
       },
       "original": {
@@ -105,11 +105,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1720289319,
+        "lastModified": 1720734513,
-        "narHash": "sha256-E3CjSsXNDWYqoNjrKQLPdEZDLR+mVI9HMa+jY//FjBY=",
+        "narHash": "sha256-neWQ8eNtLTd+YMesb7WjKl1SVCbDyCm46LUgP/g/hdo=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "10486e6b311b3c5ae1c3477fee058704cea7cb4a",
+        "rev": "90ae324e2c56af10f20549ab72014804a3064c7f",
         "type": "github"
       },
       "original": {
@@ -121,11 +121,11 @@
     "lix": {
       "flake": false,
       "locked": {
-        "lastModified": 1720218496,
+        "lastModified": 1720825173,
-        "narHash": "sha256-qVJAfz9PbtvroM0I8Ckbtxn7L8RHe6xic13iP3axQFg=",
+        "narHash": "sha256-YZ7043PFS6LalHAyGeO7qRLeZIevwjHRbbMkpixjwhM=",
         "ref": "refs/heads/main",
-        "rev": "b6a08a2fed8a48d3759ea67e958c9f9ec5f44d94",
+        "rev": "a8f443d96011c11ad726c2a28a37752bd56c12cc",
-        "revCount": 15930,
+        "revCount": 15954,
         "type": "git",
         "url": "https://git@git.lix.systems/lix-project/lix"
       },
@@ -148,11 +148,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1719353937,
+        "lastModified": 1720695775,
-        "narHash": "sha256-86NBqDxAP20ET/UoKX0WvSItblNQ97czXb2q7lkMrwk=",
+        "narHash": "sha256-8Oqzl9QPjEe/n8y0R2tC6+2v/H6xBgABHXOJwxmnBg0=",
         "ref": "refs/heads/main",
-        "rev": "5d9d94089fb1ca96222a34bfe245ef5c5ebefd37",
+        "rev": "d70318fb946a0e720dfdd1fb10b0645c14e2a02a",
-        "revCount": 92,
+        "revCount": 94,
         "type": "git",
         "url": "https://git.lix.systems/lix-project/nixos-module"
       },
@@ -168,11 +168,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1719832725,
+        "lastModified": 1720334033,
-        "narHash": "sha256-dr8DkeS74KVNTgi8BE0BiUKALb+EKlMIV86G2xPYO64=",
+        "narHash": "sha256-X9pEvvHTVWJphhbUYqXvlLedOndNqGB7rvhSvL2CIgU=",
         "owner": "nix-community",
         "repo": "nix-index-database",
-        "rev": "2917972ed34ce292309b3a4976286f8b5c08db27",
+        "rev": "685e40e1348007d2cf76747a201bab43d86b38cb",
         "type": "github"
       },
       "original": {
@@ -207,11 +207,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1720188460,
+        "lastModified": 1720787015,
-        "narHash": "sha256-ydD3UPIPlOkEDStwNxzGwFhAi5vGcobn2EofOmUvKDA=",
+        "narHash": "sha256-U3IqoGmIzBKEJ0ihRQ10GRRtdoDBI6Oxl6aiGbUA59A=",
         "owner": "nix-community",
         "repo": "NixOS-WSL",
-        "rev": "7051b909b9b5e74f19791795bd769de12c5acb3d",
+        "rev": "371b5076d718f7f637d3959d0203061f06af1263",
         "type": "github"
       },
       "original": {
@@ -223,11 +223,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1720031269,
+        "lastModified": 1720768451,
-        "narHash": "sha256-rwz8NJZV+387rnWpTYcXaRNvzUSnnF9aHONoJIYmiUQ=",
+        "narHash": "sha256-EYekUHJE2gxeo2pM/zM9Wlqw1Uw2XTJXOSAO79ksc4Y=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "9f4128e00b0ae8ec65918efeba59db998750ead6",
+        "rev": "7e7c39ea35c5cdd002cd4588b03a3fb9ece6fad9",
         "type": "github"
       },
       "original": {

home/aliases.nix

@@ -12,5 +12,8 @@
   # From Nix environment
     "7z" = "7zz";
       # "7zz" is from "nixpkgs#_7zz"
+    "termbin" = "nc termbin.com 9999";
+      # Alias that lets me upload text to https://termbin.com/
+      # Mainly so I can lazily upload build logs.
   };
 }

home/packages/nix-init/default_to_package.diff

@@ -0,0 +1,22 @@
+diff --git a/src/main.rs b/src/main.rs
+index 27e20ec..c76417d 100644
+--- a/src/main.rs
++++ b/src/main.rs
+@@ -439,7 +439,7 @@ async fn run() -> Result<()> {
+ 
+     let (out_dir, out_path) = if let Ok(metadata) = metadata(&output) {
+         if metadata.is_dir() {
+-            let out_path = output.join("default.nix");
++            let out_path = output.join("package.nix");
+             if out_path.exists() && ask_overwrite(&mut editor, &out_path)? {
+                 return Ok(());
+             }
+@@ -453,7 +453,7 @@ async fn run() -> Result<()> {
+         .map_or(false, |out_path| out_path.ends_with_str(b"/"))
+     {
+         let _ = create_dir_all(&output);
+-        (Some(output.as_ref()), output.join("default.nix"))
++        (Some(output.as_ref()), output.join("package.nix"))
+     } else {
+         let out_dir = output.parent();
+         if let Some(out_dir) = out_dir {

home/packages/rom-properties/package.nix

@@ -41,8 +41,8 @@ stdenv.mkDerivation {
   src = fetchFromGitHub {
     owner = "GerbilSoft";
     repo = "rom-properties";
-    rev = "10c20ccc3b5550e7950e036a56b0a34714edb263";
+    rev = "eba71880c1f36bb059be662c70a4eefba2b88226";
-    hash = "sha256-uoyD2xuPkdoKidyG1Dlckk5ImKnGw/rk8G27IS1cTes=";
+    hash = "sha256-K8Tn2z8GwJkjLVPOjIBvj1M63+ivMwqfydSFVAMVtI0=";
   };
 
   nativeBuildInputs = [

home/pkgs_and_programs.nix

@@ -25,6 +25,10 @@ let
         patches = [ ./packages/new_rclone/patches/rclone_8ffe3e462cbf5688c37c54009db09d8dcb486860.diff ];
       }
     );
+    nix-init_packagenix = pkgs.nix-init.overrideAttrs (oldAttrs: rec {
+        patches = [ ./packages/nix-init/default_to_package.diff ];
+      }
+    );
     unnix_script = pkgs.writeShellApplication {
       name = "unnix";
       /* runtimeInputs = [ sed ]; */
@@ -136,6 +140,7 @@ in
     my_packages.ird_tools
     my_packages.irdkit
     my_packages.new_rclone
+    my_packages.nix-init_packagenix # Yay for patched apps :)
     my_packages.nxtik
     my_packages.ps3dec
     my_packages.rom-properties