Merge remote-tracking branch 'forge/main'

flake.nix

@@ -2,14 +2,32 @@
   description = "Emile's Nix Dotfiles";
 
   inputs = {
+    systems.url = "github:nix-systems/default";
+
     nixpkgs.url = "github:nixos/nixpkgs/nixos-25.05";
     nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable";
 
-    colmena.url = "github:zhaofengli/colmena/?rev=47b6414d800c8471e98ca072bc0835345741a56a";
+    colmena = {
+      url = "github:zhaofengli/colmena/?rev=47b6414d800c8471e98ca072bc0835345741a56a";
+      inputs = {
+        nixpkgs.follows = "nixpkgs-unstable";
+        stable.follows = "nixpkgs";
+        flake-utils.inputs.systems.follows = "systems";
+      };
+    };
 
     nix-flatpak.url = "github:gmodena/nix-flatpak/?ref=v0.7.0";
 
     grub2-themes.url = "github:vinceliuice/grub2-themes";
+
+    dobutterfliescry-net = {
+      url = "git+https://forge.dobutterfliescry.net/cry/site";
+      inputs = {
+        nixpkgs.follows = "nixpkgs";
+        nixpkgs-unstable.follows = "nixpkgs-unstable";
+        systems.follows = "systems";
+      };
+    };
   };
 
   outputs = {
@@ -32,12 +50,15 @@
     pkgs-unstable = import nixpkgs-unstable {
       inherit system;
       config = {
-        allowUnfree = true; # TODO: bandaid solution... (for minecraft-server)
+        # allowUnfree = true; # TODO: bandaid solution... (for minecraft-server)
+        allowUnfree = false;
       };
     };
     # TODO: come back to this its really cool
     # this is just something I'm experimenting with
-    # PROJECT_ROOT = builtins.toString ./.;
+    # ROOT = ./.;
+
+    specialArgs = {inherit inputs pkgs-unstable;};
   in {
     devShells."x86_64-linux".default = pkgs.mkShell {
       shell = "${pkgs.bash}/bin/bash";
@@ -52,7 +73,7 @@
       # i be on my puter fr
       myputer = nixpkgs.lib.nixosSystem {
         # nix passes these to every single module
-        specialArgs = {inherit inputs pkgs-unstable;};
+        inherit specialArgs;
 
         modules = [
           ./hosts/myputer
@@ -62,7 +83,7 @@
 
       # my laptop 0w0
       lolcathost = nixpkgs.lib.nixosSystem {
-        specialArgs = {inherit inputs pkgs-unstable;};
+        inherit specialArgs;
 
         modules = [
           ./hosts/lolcathost
@@ -75,7 +96,7 @@
     colmenaHive = colmena.lib.makeHive {
       meta = {
         nixpkgs = pkgs;
-        specialArgs = {inherit pkgs-unstable;};
+        inherit specialArgs;
 
         # set nixpkgs per server
         nodeNixpkgs = {