Clean up flake.nix

caddy.nix

@@ -39,7 +39,7 @@ in
     package = pkgs.caddy.withPlugins {
       # https://github.com/NixOS/nixpkgs/pull/358586#issuecomment-2564016652
       plugins = [ "github.com/caddy-dns/cloudflare@v0.0.0-20240703190432-89f16b99c18e" ];
-      hash = "sha256-JoujVXRXjKUam1Ej3/zKVvF0nX97dUizmISjy3M3Kr8=";
+      hash = "sha256-jCcSzenewQiW897GFHF9WAcVkGaS/oUu63crJu7AyyQ=";
     };
 
     globalConfig = ''

flake.lock

@@ -77,7 +77,9 @@
     "confess": {
       "inputs": {
         "flake-utils": "flake-utils",
-        "nixpkgs": "nixpkgs"
+        "nixpkgs": [
+          "nixpkgs"
+        ]
       },
       "locked": {
         "lastModified": 1733584831,
@@ -96,14 +98,16 @@
     "drasl": {
       "inputs": {
         "buildNodeModules": "buildNodeModules",
-        "nixpkgs": "nixpkgs_2"
+        "nixpkgs": [
+          "nixpkgs"
+        ]
       },
       "locked": {
-        "lastModified": 1736991762,
+        "lastModified": 1737600860,
-        "narHash": "sha256-tyEi1NmInl13+Ce5L6+3Cf+kTjIDWDk9xXZVnqpCqyY=",
+        "narHash": "sha256-YlZKA34RjKyOklTOUssErn1vbLJdjPI4Us6PKDNyQTw=",
         "owner": "unmojang",
         "repo": "drasl",
-        "rev": "13ed66f73564f137f8f4f769c8daddd034012b84",
+        "rev": "b431fc0b2d759d126341fcb645afad890e80d78e",
         "type": "github"
       },
       "original": {
@@ -221,7 +225,9 @@
     "lastfm-status": {
       "inputs": {
         "flake-utils": "flake-utils_2",
-        "nixpkgs": "nixpkgs_3"
+        "nixpkgs": [
+          "nixpkgs"
+        ]
       },
       "locked": {
         "lastModified": 1722695709,
@@ -241,14 +247,14 @@
       "inputs": {
         "flake-compat": "flake-compat",
         "flake-utils": "flake-utils_3",
-        "nixpkgs": "nixpkgs_4"
+        "nixpkgs": "nixpkgs"
       },
       "locked": {
-        "lastModified": 1737596641,
+        "lastModified": 1737683037,
-        "narHash": "sha256-OuBKRW5JqgBfHl/pfFkSVT8KcE+oW+hbcv7HSy2+Yok=",
+        "narHash": "sha256-1J2Pf6ub2DkkoqRq2xEFrusJKR4XHnnFk0wyOPrV2PM=",
         "owner": "Infinidoge",
         "repo": "nix-minecraft",
-        "rev": "f84f3c897daef1cca391ec9544f8ba2f3cbdd38b",
+        "rev": "f80c70946d3e27a466b8b9e65b24e36d571eac8b",
         "type": "github"
       },
       "original": {
@@ -260,7 +266,7 @@
     "nix-minecraft-plugin-upgrade": {
       "inputs": {
         "flake-utils": "flake-utils_4",
-        "nixpkgs": "nixpkgs_5",
+        "nixpkgs": "nixpkgs_2",
         "rust-overlay": "rust-overlay"
       },
       "locked": {
@@ -278,53 +284,6 @@
       }
     },
     "nixpkgs": {
-      "locked": {
-        "lastModified": 1733392399,
-        "narHash": "sha256-kEsTJTUQfQFIJOcLYFt/RvNxIK653ZkTBIs4DG+cBns=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "d0797a04b81caeae77bcff10a9dde78bc17f5661",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_2": {
-      "locked": {
-        "lastModified": 1729665710,
-        "narHash": "sha256-AlcmCXJZPIlO5dmFzV3V2XF6x/OpNWUV8Y/FMPGd8Z4=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "2768c7d042a37de65bb1b5b3268fc987e534c49d",
-        "type": "github"
-      },
-      "original": {
-        "id": "nixpkgs",
-        "ref": "nixos-unstable",
-        "type": "indirect"
-      }
-    },
-    "nixpkgs_3": {
-      "locked": {
-        "lastModified": 1722421184,
-        "narHash": "sha256-/DJBI6trCeVnasdjUo9pbnodCLZcFqnVZiLUfqLH4jA=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "9f918d616c5321ad374ae6cb5ea89c9e04bf3e58",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_4": {
       "locked": {
         "lastModified": 1715266358,
         "narHash": "sha256-doPgfj+7FFe9rfzWo1siAV2mVCasW+Bh8I1cToAXEE4=",
@@ -340,7 +299,7 @@
         "type": "github"
       }
     },
-    "nixpkgs_5": {
+    "nixpkgs_2": {
       "locked": {
         "lastModified": 1731319897,
         "narHash": "sha256-PbABj4tnbWFMfBp6OcUK5iGy1QY+/Z96ZcLpooIbuEI=",
@@ -356,7 +315,7 @@
         "type": "github"
       }
     },
-    "nixpkgs_6": {
+    "nixpkgs_3": {
       "locked": {
         "lastModified": 1728538411,
         "narHash": "sha256-f0SBJz1eZ2yOuKUr5CA9BHULGXVSn6miBuUWdTyhUhU=",
@@ -372,13 +331,13 @@
         "type": "github"
       }
     },
-    "nixpkgs_7": {
+    "nixpkgs_4": {
       "locked": {
-        "lastModified": 1737469691,
+        "lastModified": 1737632463,
-        "narHash": "sha256-nmKOgAU48S41dTPIXAq0AHZSehWUn6ZPrUKijHAMmIk=",
+        "narHash": "sha256-38J9QfeGSej341ouwzqf77WIHAScihAKCt8PQJ+NH28=",
         "owner": "Nixos",
         "repo": "nixpkgs",
-        "rev": "9e4d5190a9482a1fb9d18adf0bdb83c6e506eaab",
+        "rev": "0aa475546ed21629c4f5bbf90e38c846a99ec9e9",
         "type": "github"
       },
       "original": {
@@ -388,22 +347,6 @@
         "type": "github"
       }
     },
-    "nixpkgs_8": {
-      "locked": {
-        "lastModified": 1735291276,
-        "narHash": "sha256-NYVcA06+blsLG6wpAbSPTCyLvxD/92Hy4vlY9WxFI1M=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "634fd46801442d760e09493a794c4f15db2d0cbb",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
     "root": {
       "inputs": {
         "bsky-website": "bsky-website",
@@ -414,14 +357,13 @@
         "lastfm-status": "lastfm-status",
         "nix-minecraft": "nix-minecraft",
         "nix-minecraft-plugin-upgrade": "nix-minecraft-plugin-upgrade",
-        "nixpkgs": "nixpkgs_7",
+        "nixpkgs": "nixpkgs_4",
-        "xn--tdaa-website": "xn--tdaa-website",
         "youtuee": "youtuee"
       }
     },
     "rust-overlay": {
       "inputs": {
-        "nixpkgs": "nixpkgs_6"
+        "nixpkgs": "nixpkgs_3"
       },
       "locked": {
         "lastModified": 1731637922,
@@ -512,26 +454,12 @@
         "type": "github"
       }
     },
-    "xn--tdaa-website": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1732727153,
-        "narHash": "sha256-w0B5gvhVCc3YyAJtuUsShVuOz9U2JlTzsqaB17KD8Xs=",
-        "ref": "refs/heads/main",
-        "rev": "b173f5b5cd847fafe5c40204c3ba662d8f1524f6",
-        "revCount": 1,
-        "type": "git",
-        "url": "ssh://forgejo@forge.catnip.ee:2222/batteredbunny/xn--tdaa.ee"
-      },
-      "original": {
-        "type": "git",
-        "url": "ssh://forgejo@forge.catnip.ee:2222/batteredbunny/xn--tdaa.ee"
-      }
-    },
     "youtuee": {
       "inputs": {
         "flake-utils": "flake-utils_5",
-        "nixpkgs": "nixpkgs_8"
+        "nixpkgs": [
+          "nixpkgs"
+        ]
       },
       "locked": {
         "lastModified": 1735495331,

flake.nix

@@ -1,17 +1,34 @@
 {
   inputs = {
     nixpkgs.url = "github:Nixos/nixpkgs/nixos-unstable";
-    lastfm-status.url = "github:BatteredBunny/lastfm-status";
     nix-minecraft-plugin-upgrade.url = "github:BatteredBunny/nix-minecraft-plugin-upgrade";
     nix-minecraft.url = "github:Infinidoge/nix-minecraft";
 
-    catnip-website = {
+    common-modules = {
-      url = "git+ssh://forgejo@forge.catnip.ee:2222/batteredbunny/catnip.ee";
+      url = "git+https://forge.catnip.ee/batteredbunny/common.nix?ref=cross-seed";
-      flake = false;
+      inputs.nixpkgs.follows = "nixpkgs";
     };
 
-    xn--tdaa-website = {
+    drasl = {
-      url = "git+ssh://forgejo@forge.catnip.ee:2222/batteredbunny/xn--tdaa.ee";
+      url = "github:unmojang/drasl";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+    confess = {
+      url = "git+ssh://forgejo@forge.catnip.ee:2222/batteredbunny/confess";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+    lastfm-status = {
+      url = "github:BatteredBunny/lastfm-status";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+    youtuee = {
+      url = "git+ssh://forgejo@forge.catnip.ee:2222/batteredbunny/youtuee";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+
+    # Websites
+    catnip-website = {
+      url = "git+ssh://forgejo@forge.catnip.ee:2222/batteredbunny/catnip.ee";
       flake = false;
     };
 
@@ -19,15 +36,6 @@
       url = "git+ssh://forgejo@forge.catnip.ee:2222/batteredbunny/bsky.ee";
       flake = false;
     };
-
-    common-modules = {
-      url = "git+https://forge.catnip.ee/batteredbunny/common.nix?ref=cross-seed";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
-    confess.url = "git+ssh://forgejo@forge.catnip.ee:2222/batteredbunny/confess";
-    drasl.url = "github:unmojang/drasl";
-
-    youtuee.url = "git+ssh://forgejo@forge.catnip.ee:2222/batteredbunny/youtuee";
   };
 
   outputs =