Swap lix input to actually be a flake, and make external_lix package.

Plus adds other inputs that are being used anyway, so they're not needlessly replicated.

flake.lock

@@ -48,7 +48,6 @@
       }
     },
     "flake-compat": {
-      "flake": false,
       "locked": {
         "lastModified": 1696426674,
         "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
@@ -105,11 +104,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1723399884,
+        "lastModified": 1723986931,
-        "narHash": "sha256-97wn0ihhGqfMb8WcUgzzkM/TuAxce2Gd20A8oiruju4=",
+        "narHash": "sha256-Fy+KEvDQ+Hc8lJAV3t6leXhZJ2ncU5/esxkgt3b8DEY=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "086f619dd991a4d355c07837448244029fc2d9ab",
+        "rev": "2598861031b78aadb4da7269df7ca9ddfc3e1671",
         "type": "github"
       },
       "original": {
@@ -119,13 +118,23 @@
       }
     },
     "lix": {
-      "flake": false,
+      "inputs": {
+        "flake-compat": [
+          "flake-compat"
+        ],
+        "nix2container": "nix2container",
+        "nixpkgs": [
+          "nixpkgs"
+        ],
+        "nixpkgs-regression": "nixpkgs-regression",
+        "pre-commit-hooks": "pre-commit-hooks"
+      },
       "locked": {
-        "lastModified": 1723818243,
+        "lastModified": 1724021051,
-        "narHash": "sha256-X3Tm82sqTIRW8r/2452l/Tc00vJ4XJvsZcsoL+lgrOk=",
+        "narHash": "sha256-80mohEXTDXE5aWwMw3a9U9YzQkBdhJAzVYUQBZ3SNvY=",
         "ref": "refs/heads/main",
-        "rev": "41a0b08e646b54b27ae49fb4c23e0c45c60369ca",
+        "rev": "5cbca8553581a358f9b5067bc8def24b1c7b37cc",
-        "revCount": 16135,
+        "revCount": 16146,
         "type": "git",
         "url": "https://git@git.lix.systems/lix-project/lix"
       },
@@ -168,11 +177,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1723352546,
+        "lastModified": 1723950649,
-        "narHash": "sha256-WTIrvp0yV8ODd6lxAq4F7EbrPQv0gscBnyfn559c3k8=",
+        "narHash": "sha256-dHMkGjwwCGj0c2MKyCjRXVBXq2Sz3TWbbM23AS7/5Hc=",
         "owner": "nix-community",
         "repo": "nix-index-database",
-        "rev": "ec78079a904d7d55e81a0468d764d0fffb50ac06",
+        "rev": "392828aafbed62a6ea6ccab13728df2e67481805",
         "type": "github"
       },
       "original": {
@@ -196,9 +205,27 @@
         "type": "github"
       }
     },
+    "nix2container": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1720642556,
+        "narHash": "sha256-qsnqk13UmREKmRT7c8hEnz26X3GFFyIQrqx4EaRc1Is=",
+        "owner": "nlewo",
+        "repo": "nix2container",
+        "rev": "3853e5caf9ad24103b13aa6e0e8bcebb47649fe4",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nlewo",
+        "repo": "nix2container",
+        "type": "github"
+      }
+    },
     "nixos-wsl": {
       "inputs": {
-        "flake-compat": "flake-compat",
+        "flake-compat": [
+          "flake-compat"
+        ],
         "flake-utils": [
           "flake-utils"
         ],
@@ -237,10 +264,43 @@
         "type": "github"
       }
     },
+    "nixpkgs-regression": {
+      "locked": {
+        "lastModified": 1643052045,
+        "narHash": "sha256-uGJ0VXIhWKGXxkeNnq4TvV3CIOkUJ3PAoLZ3HMzNVMw=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2",
+        "type": "github"
+      }
+    },
+    "pre-commit-hooks": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1721042469,
+        "narHash": "sha256-6FPUl7HVtvRHCCBQne7Ylp4p+dpP3P/OYuzjztZ4s70=",
+        "owner": "cachix",
+        "repo": "git-hooks.nix",
+        "rev": "f451c19376071a90d8c58ab1a953c6e9840527fd",
+        "type": "github"
+      },
+      "original": {
+        "owner": "cachix",
+        "repo": "git-hooks.nix",
+        "type": "github"
+      }
+    },
     "root": {
       "inputs": {
         "aaru": "aaru",
         "agenix": "agenix",
+        "flake-compat": "flake-compat",
         "flake-utils": "flake-utils",
         "home-manager": "home-manager",
         "lix": "lix",

flake.nix

@@ -10,6 +10,7 @@
     nixos-wsl = { 
       url = "github:nix-community/NixOS-WSL/main";
       inputs.nixpkgs.follows = "nixpkgs";
+      inputs.flake-compat.follows = "flake-compat";
       inputs.flake-utils.follows = "flake-utils";
     };
 
@@ -56,7 +57,8 @@
           git+https://git@${domain}/${user_org}/${repo}?ref=refs/tags/${TAG}
           git+https://git@${domain}/${user_org}/${repo}?rev=${commitHash}
         */
-      flake = false;
+      inputs.nixpkgs.follows = "nixpkgs";
+      inputs.flake-compat.follows = "flake-compat";
     };
 
     lix-module = {
@@ -88,13 +90,18 @@
       url = "github:nix-systems/default";
     };
 
+    # Ditto to github:edolstra/flake-compat
+    flake-compat = {
+      url = "github:edolstra/flake-compat";
+    };
+
   }; # inputs
 
   outputs = { 
     # Needed
     self, nixpkgs, nixos-wsl,
     # Lix
-    lix-module,
+    lix, lix-module,
     # Added by me
     agenix, home-manager, nix-index-database, xil, aaru, ... }:
   let
@@ -288,7 +295,7 @@
         ];
       };
 
-      my_nixos_vm = nixpkgs.lib.nixosSystem {
+    /*  my_nixos_vm = nixpkgs.lib.nixosSystem {
         system = "x86_64-linux";
         modules = [
           ./system/my_nixos_vm/configuration.nix
@@ -350,9 +357,9 @@
           }
         ];
       };
+    */
 
-      /*
+    /*  nixps = nixpkgs.lib.nixosSystem {
-        nixps = nixpkgs.lib.nixosSystem {
           system = "x86_64-linux";
           modules = [
             ./system/xps/configuration.nix
@@ -390,7 +397,7 @@
             }
           ];
         };
-      */
+    */
     };
 
     packages.x86_64-linux = {
@@ -405,17 +412,15 @@
       # rom-properties_ninja = pkgs.callPackage ./home/packages/rom-properties/package.nix { useNinja = 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; };
-      new_rclone = pkgs.rclone.overrideAttrs (
+      new_rclone = pkgs.rclone.overrideAttrs ( oldAttrs: {
-        oldAttrs: {
           patches = [ ./home/packages/new_rclone/patches/rclone_8ffe3e462cbf5688c37c54009db09d8dcb486860.diff ];
-        }
+        } );
-      );
+      new_nix-init = pkgs.nix-init.overrideAttrs (oldAttrs: {
-      new_nix-init = pkgs.nix-init.overrideAttrs (oldAttrs: rec {
+          patches = [ ./home/packages/nix-init/default_to_package.diff ];
-        patches = [ ./home/packages/nix-init/default_to_package.diff ];
+        } );
-      }
-    );
 
       build_isoimage-pc = self.nixosConfigurations.isoimage-pc.config.system.build.isoImage;
+      external_lix = lix.packages.x86_64-linux.nix;
       external_xil = xil.packages.x86_64-linux.xil;
       external_aaru = aaru.packages.x86_64-linux.git;
     };