flake.lock

@@ -7,11 +7,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1723761384,
+        "lastModified": 1722134598,
-        "narHash": "sha256-MSBNNd9U/nBt4f7aSwoTm+nYsfSc9EoOkZfgo5NAnTs=",
+        "narHash": "sha256-EObw0Zt4PNWsiPXM9R0BO6kjqOPOXICsNZL9z64bzSc=",
         "owner": "Whovian9369",
         "repo": "aaru-nix-flake",
-        "rev": "c45fa35a8b0d92f72ed0853c1cc2277ac7e581f9",
+        "rev": "05f6b81ac906ae93c363198bf25490c6c257e447",
         "type": "github"
       },
       "original": {
@@ -34,11 +34,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1723293904,
+        "lastModified": 1720546205,
-        "narHash": "sha256-b+uqzj+Wa6xgMS9aNbX4I+sXeb5biPDi39VgvSFqFvU=",
+        "narHash": "sha256-boCXsjYVxDviyzoEyAk624600f3ZBo/DKtUdvMTpbGY=",
         "owner": "ryantm",
         "repo": "agenix",
-        "rev": "f6291c5935fdc4e0bef208cfc0dcab7e3f7a1c41",
+        "rev": "de96bd907d5fbc3b14fc33ad37d1b9a3cb15edc6",
         "type": "github"
       },
       "original": {
@@ -105,11 +105,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1723399884,
+        "lastModified": 1722203588,
-        "narHash": "sha256-97wn0ihhGqfMb8WcUgzzkM/TuAxce2Gd20A8oiruju4=",
+        "narHash": "sha256-91V5FMSQ4z9bkhTCf0f86Zjw0bh367daSf0mzCIW0vU=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "086f619dd991a4d355c07837448244029fc2d9ab",
+        "rev": "792757f643cedc13f02098d8ed506d82e19ec1da",
         "type": "github"
       },
       "original": {
@@ -121,11 +121,11 @@
     "lix": {
       "flake": false,
       "locked": {
-        "lastModified": 1723818243,
+        "lastModified": 1721992157,
-        "narHash": "sha256-X3Tm82sqTIRW8r/2452l/Tc00vJ4XJvsZcsoL+lgrOk=",
+        "narHash": "sha256-D5bBsSKvYmVn8U4lhrvMemko7m2I/sicjyAYEWDfW9A=",
         "ref": "refs/heads/main",
-        "rev": "41a0b08e646b54b27ae49fb4c23e0c45c60369ca",
+        "rev": "6abad7cb238c5c7bf59a83bed55e7590c544fc2e",
-        "revCount": 16135,
+        "revCount": 16027,
         "type": "git",
         "url": "https://git@git.lix.systems/lix-project/lix"
       },
@@ -148,11 +148,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1723511483,
+        "lastModified": 1720695775,
-        "narHash": "sha256-rT/OkVXKkns2YvyF1nFvl+8Gc3sld1c1sXPtGkbqaDY=",
+        "narHash": "sha256-8Oqzl9QPjEe/n8y0R2tC6+2v/H6xBgABHXOJwxmnBg0=",
         "ref": "refs/heads/main",
-        "rev": "cecf70b77539c1a593f60ec9d0305b5e537ab6a9",
+        "rev": "d70318fb946a0e720dfdd1fb10b0645c14e2a02a",
-        "revCount": 106,
+        "revCount": 94,
         "type": "git",
         "url": "https://git.lix.systems/lix-project/nixos-module"
       },
@@ -168,11 +168,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1723352546,
+        "lastModified": 1722136042,
-        "narHash": "sha256-WTIrvp0yV8ODd6lxAq4F7EbrPQv0gscBnyfn559c3k8=",
+        "narHash": "sha256-x3FmT4QSyK28itMiR5zfYhUrG5nY+2dv+AIcKfmSp5A=",
         "owner": "nix-community",
         "repo": "nix-index-database",
-        "rev": "ec78079a904d7d55e81a0468d764d0fffb50ac06",
+        "rev": "c0ca47e8523b578464014961059999d8eddd4aae",
         "type": "github"
       },
       "original": {
@@ -207,11 +207,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1723124175,
+        "lastModified": 1722253092,
-        "narHash": "sha256-w+rlZdbj4kn70uPJl4WrPDFoGEy0A9oJqw684nvZ9dY=",
+        "narHash": "sha256-37vyqHPx57deHhwvi4jwyNQLYkhm/rlVTYKOG1iahsc=",
         "owner": "nix-community",
         "repo": "NixOS-WSL",
-        "rev": "be1a6b2e4ddc34b9b6a297e7df2f2a2ecee24690",
+        "rev": "f373ad59ae5866f0f98216bd5c71526b373450d2",
         "type": "github"
       },
       "original": {
@@ -223,11 +223,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1723637854,
+        "lastModified": 1722062969,
-        "narHash": "sha256-med8+5DSWa2UnOqtdICndjDAEjxr5D7zaIiK4pn0Q7c=",
+        "narHash": "sha256-QOS0ykELUmPbrrUGmegAUlpmUFznDQeR4q7rFhl8eQg=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "c3aa7b8938b17aebd2deecf7be0636000d62a2b9",
+        "rev": "b73c2221a46c13557b1b3be9c2070cc42cf01eb3",
         "type": "github"
       },
       "original": {

flake.nix

@@ -116,7 +116,7 @@
 
         How to build ISO:
           Building .#nixosConfigurations.isoimage-pc.config.system.build.isoImage
-          should build ISO to "result" (or other set) symlink.
+            should build ISO to "result" (or other set) symlink.
           Alternatively, use:
           - nix build -L .#packages.x86_64-linux.build_isoimage-pc
           - nix build -L .#build_isoimage-pc
@@ -394,30 +394,24 @@
     };
 
     packages.x86_64-linux = {
-      binaryobjectscanner = pkgs.callPackage ./home/packages/binaryobjectscanner/package.nix {};
       hactoolnet-bin = pkgs.callPackage ./home/packages/hactoolnet-bin/package.nix {};
-      ird_tools = pkgs.callPackage ./home/packages/ird_tools/package.nix {};
       irdkit = pkgs.callPackage ./home/packages/irdkit/package.nix {};
+      ird_tools = pkgs.callPackage ./home/packages/ird_tools/package.nix {};
       nxtik = pkgs.callPackage ./home/packages/nxtik/package.nix {};
       ps3dec = pkgs.callPackage ./home/packages/ps3dec/package.nix {};
-      rom-properties = pkgs.callPackage ./home/packages/rom-properties/package.nix {};
       sabretools = pkgs.callPackage ./home/packages/sabretools/package.nix {};
-      # rom-properties_ninja = pkgs.callPackage ./home/packages/rom-properties/package.nix { useNinja = true; };
+      rom-properties = pkgs.callPackage ./home/packages/rom-properties/package.nix {};
-      # rom-properties_gtracker = pkgs.callPackage ./home/packages/rom-properties/package.nix { useTracker = true; };
+      rom-properties_ninja = pkgs.callPackage ./home/packages/rom-properties/package.nix { useNinja = true; };
-      # rom-properties_ninja_gtracker = pkgs.callPackage ./home/packages/rom-properties/package.nix { useNinja = true; useTracker = true; };
+      rom-properties_gtracker = pkgs.callPackage ./home/packages/rom-properties/package.nix { useTracker = true; };
+      rom-properties_ninja_gtracker = pkgs.callPackage ./home/packages/rom-properties/package.nix { useNinja = true; useTracker = true; };
+      binaryobjectscanner = pkgs.callPackage ./home/packages/binaryobjectscanner/package.nix {};
       new_rclone = pkgs.rclone.overrideAttrs (
         oldAttrs: {
           patches = [ ./home/packages/new_rclone/patches/rclone_8ffe3e462cbf5688c37c54009db09d8dcb486860.diff ];
         }
       );
-      new_nix-init = pkgs.nix-init.overrideAttrs (oldAttrs: rec {
-        patches = [ ./home/packages/nix-init/default_to_package.diff ];
-      }
-    );
-
       build_isoimage-pc = self.nixosConfigurations.isoimage-pc.config.system.build.isoImage;
       external_xil = xil.packages.x86_64-linux.xil;
-      external_aaru = aaru.packages.x86_64-linux.git;
     };
   };
 }

home/pkgs_and_programs.nix

@@ -142,12 +142,7 @@ in
     my_packages.ird_tools
     my_packages.irdkit
     my_packages.new_rclone
-    # my_packages.nix-init_packagenix
+    my_packages.nix-init_packagenix # Yay for patched apps :)
-      # Yay for patched apps :)
-      # TODO: Wait for github:NixOS/nixpkgs/pull/335035 to become available on
-        # nixos-unstable. Commit in question is
-        # 6d1563583aedcf2cfeab34f4977e6062d1617696 | 2024-08-16
-
     my_packages.nxtik
     my_packages.ps3dec
     my_packages.rom-properties