diff --git a/flake.nix b/flake.nix index 9667548..e339ce6 100644 --- a/flake.nix +++ b/flake.nix @@ -2,30 +2,12 @@ description = "Emile's Nix Dotfiles"; inputs = { - systems = "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"; - inputs = { - nixpkgs.follows = "nixpkgs-unstable"; - stable.follows = "nixpkgs"; - flake-utils.inputs.systems.follows = "systems"; - }; - }; + colmena.url = "github:zhaofengli/colmena/?rev=47b6414d800c8471e98ca072bc0835345741a56a"; grub2-themes.url = "github:vinceliuice/grub2-themes"; - - dobutterfliescry-net = { - url = "https://forge.imbored.dev/emileclarkb/dobutterfliescry.net"; - inputs = { - nixpkgs.follows = "nixpkgs"; - nixpkgs-unstable.follows = "nixpkgs-unstable"; - systems.follows = "systems"; - }; - }; }; outputs = { @@ -48,15 +30,12 @@ pkgs-unstable = import nixpkgs-unstable { inherit system; config = { - # allowUnfree = true; # TODO: bandaid solution... (for minecraft-server) - allowUnfree = false; + allowUnfree = true; # TODO: bandaid solution... (for minecraft-server) }; }; # TODO: come back to this its really cool # this is just something I'm experimenting with - # ROOT = ./.; - - specialArgs = {inherit inputs pkgs-unstable;}; + # PROJECT_ROOT = builtins.toString ./.; in { devShells."x86_64-linux".default = pkgs.mkShell { shell = "${pkgs.bash}/bin/bash"; @@ -71,7 +50,7 @@ # i be on my puter fr myputer = nixpkgs.lib.nixosSystem { # nix passes these to every single module - inherit specialArgs; + specialArgs = {inherit inputs pkgs-unstable;}; modules = [ ./hosts/myputer @@ -81,7 +60,7 @@ # my laptop 0w0 lolcathost = nixpkgs.lib.nixosSystem { - inherit specialArgs; + specialArgs = {inherit inputs pkgs-unstable;}; modules = [ ./hosts/lolcathost @@ -94,7 +73,7 @@ colmenaHive = colmena.lib.makeHive { meta = { nixpkgs = pkgs; - inherit specialArgs; + specialArgs = {inherit pkgs-unstable;}; # set nixpkgs per server nodeNixpkgs = {