Compare commits

..

No commits in common. "7e4959352a3ba725c5482e6434dcf987ac4ad292" and "56af3c8919a817ea06f3613ef692f7a03567a93a" have entirely different histories.

View file

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