don/NixOS-Configs
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Activity

flake.nix | remove cache lines + random formating

Browse source
This commit is contained in:
Don Harper 2025-10-02 13:36:57 -05:00
parent 17e2f2a10b
commit 1639e1f8d5
1 changed files with 120 additions and 124 deletions
Download patch file Download diff file Expand all files Collapse all files

98
flake.nix
View file

@ -4,18 +4,6 @@
# Binary cache configuration for faster builds # Binary cache configuration for faster builds
nixConfig = { nixConfig = {
allowUnfree = true; allowUnfree = true;
# Binary cache servers (substituters)
extra-substituters = [
"https://cache.nixos.org"
"https://chaotic-nyx.cachix.org"
"https://nix-community.cachix.org"
];
# Public keys for binary cache verification
extra-trusted-public-keys = [
"cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY="
"chaotic-nyx.cachix.org-1:HfnXSw4pj95iI/n17rIDy40agHj12WfF+Gqk6SonIT8="
"nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
];
}; };
inputs = { inputs = {
@ -38,9 +26,17 @@
nvf.inputs.nixpkgs.follows = "nixpkgs"; nvf.inputs.nixpkgs.follows = "nixpkgs";
}; };
outputs = inputs@{ self, nixpkgs, nix, nixpkgs-stable, nixos-hardware outputs = inputs @ {
, home-manager, catppuccin, colmena, ... }: self,
let nixpkgs,
nix,
nixpkgs-stable,
nixos-hardware,
home-manager,
catppuccin,
colmena,
...
}: let
inherit (self) outputs; inherit (self) outputs;
lib = nixpkgs.lib // home-manager.lib; lib = nixpkgs.lib // home-manager.lib;
in { in {
@ -48,11 +44,11 @@
nixpkgs.config.allowUnfree = true; nixpkgs.config.allowUnfree = true;
config.allowUnfree = true; config.allowUnfree = true;
nixpkgs.config.allowUnfreePredicate = pkg: nixpkgs.config.allowUnfreePredicate = pkg:
builtins.elem (lib.getName pkg) [ "widevine-cdm" ]; builtins.elem (lib.getName pkg) ["widevine-cdm"];
colmena = { colmena = {
meta = { meta = {
nixpkgs = import nixpkgs { system = "x86_64-linux"; }; nixpkgs = import nixpkgs {system = "x86_64-linux";};
specialArgs = { inherit inputs outputs; }; specialArgs = {inherit inputs outputs;};
}; };
# ace = import ./hosts/ace/colmena.nix; # Acer C720 # ace = import ./hosts/ace/colmena.nix; # Acer C720
book = import ./hosts/book/colmena.nix; # Google Pixelbook 2017 w/ nvme. book = import ./hosts/book/colmena.nix; # Google Pixelbook 2017 w/ nvme.
@ -70,47 +66,47 @@
nixosConfigurations = { nixosConfigurations = {
# clients # clients
ace = lib.nixosSystem { ace = lib.nixosSystem {
modules = [ ./hosts/ace ]; modules = [./hosts/ace];
specialArgs = { inherit inputs outputs; }; specialArgs = {inherit inputs outputs;};
}; };
dragon = lib.nixosSystem { dragon = lib.nixosSystem {
modules = [ ./hosts/dragon ]; modules = [./hosts/dragon];
specialArgs = { inherit inputs outputs; }; specialArgs = {inherit inputs outputs;};
}; };
book = lib.nixosSystem { book = lib.nixosSystem {
modules = [ ./hosts/book ]; modules = [./hosts/book];
specialArgs = { inherit inputs outputs; }; specialArgs = {inherit inputs outputs;};
}; };
loki = lib.nixosSystem { loki = lib.nixosSystem {
modules = [ ./hosts/loki ]; modules = [./hosts/loki];
specialArgs = { inherit inputs outputs; }; specialArgs = {inherit inputs outputs;};
}; };
pocket2 = lib.nixosSystem { pocket2 = lib.nixosSystem {
modules = [ ./hosts/pocket2 ]; modules = [./hosts/pocket2];
specialArgs = { inherit inputs outputs; }; specialArgs = {inherit inputs outputs;};
}; };
smaug = lib.nixosSystem { smaug = lib.nixosSystem {
modules = [ ./hosts/smaug ]; modules = [./hosts/smaug];
specialArgs = { inherit inputs outputs; }; specialArgs = {inherit inputs outputs;};
}; };
t2 = lib.nixosSystem { t2 = lib.nixosSystem {
modules = [ ./hosts/t2 ]; modules = [./hosts/t2];
specialArgs = { inherit inputs outputs; }; specialArgs = {inherit inputs outputs;};
}; };
pi1 = lib.nixosSystem { pi1 = lib.nixosSystem {
modules = [ ./hosts/pi1 ]; modules = [./hosts/pi1];
specialArgs = { inherit inputs outputs; }; specialArgs = {inherit inputs outputs;};
}; };
# servers # servers
display = lib.nixosSystem { display = lib.nixosSystem {
modules = [ ./hosts/display ]; modules = [./hosts/display];
specialArgs = { inherit inputs outputs; }; specialArgs = {inherit inputs outputs;};
}; };
fred = lib.nixosSystem { fred = lib.nixosSystem {
modules = [ ./hosts/fred ]; modules = [./hosts/fred];
specialArgs = { inherit inputs outputs; }; specialArgs = {inherit inputs outputs;};
}; };
vm = lib.nixosSystem { vm = lib.nixosSystem {
modules = [ modules = [
@ -118,31 +114,31 @@
"${nixpkgs}/nixos/modules/installer/cd-dvd/channel.nix" "${nixpkgs}/nixos/modules/installer/cd-dvd/channel.nix"
./hosts/vm ./hosts/vm
]; ];
specialArgs = { inherit inputs outputs; }; specialArgs = {inherit inputs outputs;};
}; };
harper2 = lib.nixosSystem { harper2 = lib.nixosSystem {
modules = [ ./hosts/harper2 ]; modules = [./hosts/harper2];
specialArgs = { inherit inputs outputs; }; specialArgs = {inherit inputs outputs;};
}; };
harper = lib.nixosSystem { harper = lib.nixosSystem {
modules = [ ./hosts/harper ]; modules = [./hosts/harper];
specialArgs = { inherit inputs outputs; }; specialArgs = {inherit inputs outputs;};
}; };
nuwww = lib.nixosSystem { nuwww = lib.nixosSystem {
modules = [ ./hosts/nuwww ]; modules = [./hosts/nuwww];
specialArgs = { inherit inputs outputs; }; specialArgs = {inherit inputs outputs;};
}; };
pihole = lib.nixosSystem { pihole = lib.nixosSystem {
modules = [ ./hosts/pihole ]; modules = [./hosts/pihole];
specialArgs = { inherit inputs outputs; }; specialArgs = {inherit inputs outputs;};
}; };
www2 = lib.nixosSystem { www2 = lib.nixosSystem {
modules = [ ./hosts/www2 ]; modules = [./hosts/www2];
specialArgs = { inherit inputs outputs; }; specialArgs = {inherit inputs outputs;};
}; };
w1 = lib.nixosSystem { w1 = lib.nixosSystem {
modules = [ ./hosts/w1 ]; modules = [./hosts/w1];
specialArgs = { inherit inputs outputs; }; specialArgs = {inherit inputs outputs;};
}; };
# w2 = lib.nixosSystem { # w2 = lib.nixosSystem {
# modules = [./hosts/w2]; # modules = [./hosts/w2];