consolidate flakes

flake.lock

@@ -72,11 +72,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1720845312,
+        "lastModified": 1721270582,
-        "narHash": "sha256-yPhAsJTpyoIPQZJGC8Fw8W2lAXyhLoTn+HP20bmfkfk=",
+        "narHash": "sha256-MdZmYPPExntE5rJu88IhJSy8Um4UyZCTXhOwvzbjDVI=",
         "owner": "lnl7",
         "repo": "nix-darwin",
-        "rev": "5ce8503cf402cf76b203eba4b7e402bea8e44abc",
+        "rev": "a3e4a7b8ffc08c7dc1973822a77ad432e1ec3dec",
         "type": "github"
       },
       "original": {
@@ -93,11 +93,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1720661479,
+        "lastModified": 1721266288,
-        "narHash": "sha256-nsGgA14vVn0GGiqEfomtVgviRJCuSR3UEopfP8ixW1I=",
+        "narHash": "sha256-MsyTzXu9CJVcBr44ct8ILKF/Ro7VlF+tVZTylzAoXSs=",
         "owner": "nix-community",
         "repo": "disko",
-        "rev": "786965e1b1ed3fd2018d78399984f461e2a44689",
+        "rev": "e8e8d9a3a9c1d0e654ccda7834bf0288a9d15c47",
         "type": "github"
       },
       "original": {
@@ -240,11 +240,11 @@
         "rust-overlay": "rust-overlay"
       },
       "locked": {
-        "lastModified": 1720893718,
+        "lastModified": 1721268519,
-        "narHash": "sha256-jJ8+8KkscGit9p+5fQTEm/ky9qvPFjpr4f1peQyL26s=",
+        "narHash": "sha256-9DTQZDUKdoUNohsOLT/sN9dp5WNvqWlpwn+ME84J/3A=",
         "owner": "helix-editor",
         "repo": "helix",
-        "rev": "e6bf97b8434aa9ecc9e9c6a25411ea6f1148360f",
+        "rev": "b927985cd0f8b68f9a7f177353e96d8aaabf1b06",
         "type": "github"
       },
       "original": {
@@ -339,16 +339,22 @@
     },
     "nix-ld": {
       "inputs": {
+        "flake-compat": [
+          "flake-compat"
+        ],
+        "flake-utils": [
+          "flake-utils"
+        ],
         "nixpkgs": [
           "nixpkgs-stable"
         ]
       },
       "locked": {
-        "lastModified": 1701153607,
+        "lastModified": 1721034844,
-        "narHash": "sha256-h+odOVyiGmEERMECoFOj5P7FPiMR8IPRzroFA4sKivg=",
+        "narHash": "sha256-RkX9MB0s/KWYHeZOHzkVPU5gs8YePkQxAH+3Bl3IH/Q=",
         "owner": "Mic92",
         "repo": "nix-ld",
-        "rev": "bf5aa84a713c31d95b4307e442e966d6c7fd7ae7",
+        "rev": "c95668aafd76080bd1e4d107741029a73552a983",
         "type": "github"
       },
       "original": {
@@ -376,11 +382,11 @@
     },
     "nixpkgs-master": {
       "locked": {
-        "lastModified": 1720900240,
+        "lastModified": 1721292108,
-        "narHash": "sha256-jpOkzgktrwkpgvVsXT16CohkhzFh3z2ljlu30IQKSb0=",
+        "narHash": "sha256-4SkIdxRkoff2skQdKD8bKOOIlZS7IMfDZAQunIEZkNw=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "70d24a27b7230cd8610046de00b8508b2a443c46",
+        "rev": "1c1fb7c4783c2bce7ca9c55a33871dc77ba375bb",
         "type": "github"
       },
       "original": {
@@ -392,11 +398,11 @@
     },
     "nixpkgs-nixos-unstable": {
       "locked": {
-        "lastModified": 1720768451,
+        "lastModified": 1720957393,
-        "narHash": "sha256-EYekUHJE2gxeo2pM/zM9Wlqw1Uw2XTJXOSAO79ksc4Y=",
+        "narHash": "sha256-oedh2RwpjEa+TNxhg5Je9Ch6d3W1NKi7DbRO1ziHemA=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "7e7c39ea35c5cdd002cd4588b03a3fb9ece6fad9",
+        "rev": "693bc46d169f5af9c992095736e82c3488bf7dbb",
         "type": "github"
       },
       "original": {
@@ -408,11 +414,11 @@
     },
     "nixpkgs-rust-analyzer": {
       "locked": {
-        "lastModified": 1720900240,
+        "lastModified": 1721292108,
-        "narHash": "sha256-jpOkzgktrwkpgvVsXT16CohkhzFh3z2ljlu30IQKSb0=",
+        "narHash": "sha256-4SkIdxRkoff2skQdKD8bKOOIlZS7IMfDZAQunIEZkNw=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "70d24a27b7230cd8610046de00b8508b2a443c46",
+        "rev": "1c1fb7c4783c2bce7ca9c55a33871dc77ba375bb",
         "type": "github"
       },
       "original": {
@@ -424,11 +430,11 @@
     },
     "nixpkgs-stable": {
       "locked": {
-        "lastModified": 1720691131,
+        "lastModified": 1720954236,
-        "narHash": "sha256-CWT+KN8aTPyMIx8P303gsVxUnkinIz0a/Cmasz1jyIM=",
+        "narHash": "sha256-1mEKHp4m9brvfQ0rjCca8P1WHpymK3TOr3v34ydv9bs=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "a046c1202e11b62cbede5385ba64908feb7bfac4",
+        "rev": "53e81e790209e41f0c1efa9ff26ff2fd7ab35e27",
         "type": "github"
       },
       "original": {
@@ -440,11 +446,11 @@
     },
     "nur": {
       "locked": {
-        "lastModified": 1720899970,
+        "lastModified": 1721292361,
-        "narHash": "sha256-aC6WheNDJKFPpq2gWTzxy8c68hhBdy5b1iLUhgbPgW0=",
+        "narHash": "sha256-/wBS56xoS21WNrtgA/vMwsODHMC+YBv+YNRNxVIacuQ=",
         "owner": "nix-community",
         "repo": "NUR",
-        "rev": "567a23db21ba9798f52b9d7e900970525a0c7a85",
+        "rev": "f5ad38f18ce4c6a25831a50919a7614863859b30",
         "type": "github"
       },
       "original": {
@@ -554,11 +560,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1720479166,
+        "lastModified": 1720926522,
-        "narHash": "sha256-jqvhLDXzTLTHq9ZviFOpcTmXXmnbLfz7mWhgMNipMN4=",
+        "narHash": "sha256-eTpnrT6yu1vp8C0B5fxHXhgKxHoYMoYTEikQx///jxY=",
         "owner": "Mic92",
         "repo": "sops-nix",
-        "rev": "67035a355b1d52d2d238501f8cc1a18706979760",
+        "rev": "0703ba03fd9c1665f8ab68cc3487302475164617",
         "type": "github"
       },
       "original": {

flake.nix

@@ -26,7 +26,6 @@
       pkgs.lib.nixosSystem {
         inherit system;
         modules = [
-          lix-module.nixosModules.default
           (./. + "/nixos/boxes/${hostname}")
           (import ./nixos/server-common.nix)
           sops.nixosModules.sops
@@ -355,6 +354,8 @@
       repo = "nix-ld";
       ref = "main";
       inputs.nixpkgs.follows = "nixpkgs-stable";
+      inputs.flake-utils.follows = "flake-utils";
+      inputs.flake-compat.follows = "flake-compat";
     };
     helix = {
       type = "github";