formating

This commit is contained in:
Don Harper 2025-08-31 15:13:01 -05:00
parent 63e412b597
commit e634c42b23
11 changed files with 141 additions and 186 deletions

232
flake.nix
View file

@ -38,126 +38,118 @@
nvf.inputs.nixpkgs.follows = "nixpkgs";
};
outputs = inputs @ {
self,
nixpkgs,
nix,
nixpkgs-stable,
nixos-hardware,
home-manager,
catppuccin,
colmena,
...
}: let
inherit (self) outputs;
lib = nixpkgs.lib // home-manager.lib;
in {
inherit lib;
nixpkgs.config.allowUnfree = true;
config.allowUnfree = true;
nixpkgs.config.allowUnfreePredicate = pkg:
builtins.elem (lib.getName pkg) ["widevine-cdm"];
colmena = {
meta = {
nixpkgs = import nixpkgs {system = "x86_64-linux";};
specialArgs = {inherit inputs outputs;};
outputs = inputs@{ self, nixpkgs, nix, nixpkgs-stable, nixos-hardware
, home-manager, catppuccin, colmena, ... }:
let
inherit (self) outputs;
lib = nixpkgs.lib // home-manager.lib;
in {
inherit lib;
nixpkgs.config.allowUnfree = true;
config.allowUnfree = true;
nixpkgs.config.allowUnfreePredicate = pkg:
builtins.elem (lib.getName pkg) [ "widevine-cdm" ];
colmena = {
meta = {
nixpkgs = import nixpkgs { system = "x86_64-linux"; };
specialArgs = { inherit inputs outputs; };
};
# ace = import ./hosts/ace/colmena.nix; # Acer C720
book = import ./hosts/book/colmena.nix; # Google Pixelbook 2017 w/ nvme.
display = import ./hosts/display/colmena.nix; # Pi4
# eve = import ./hosts/eve/colmena.nix; # Google Pixelbook 2017 w/ eMMC.
fred = import ./hosts/fred/colmena.nix; # acer server
loki = import ./hosts/loki/colmena.nix; # Dell XPS 13
# pi1 = import ./hosts/pi1/colmena.nix;
# pocket2 = import ./hosts/pocket2/colmena.nix;
smaug = import ./hosts/smaug/colmena.nix; # Thinkpad x260
w1 = import ./hosts/w1/colmena.nix; # Hetzner VPS
# w2 = import ./hosts/w2/colmena.nix;
};
nixosConfigurations = {
# clients
ace = lib.nixosSystem {
modules = [ ./hosts/ace ];
specialArgs = { inherit inputs outputs; };
};
dragon = lib.nixosSystem {
modules = [ ./hosts/dragon ];
specialArgs = { inherit inputs outputs; };
};
book = lib.nixosSystem {
modules = [ ./hosts/book ];
specialArgs = { inherit inputs outputs; };
};
loki = lib.nixosSystem {
modules = [ ./hosts/loki ];
specialArgs = { inherit inputs outputs; };
};
pocket2 = lib.nixosSystem {
modules = [ ./hosts/pocket2 ];
specialArgs = { inherit inputs outputs; };
};
smaug = lib.nixosSystem {
modules = [ ./hosts/smaug ];
specialArgs = { inherit inputs outputs; };
};
t2 = lib.nixosSystem {
modules = [ ./hosts/t2 ];
specialArgs = { inherit inputs outputs; };
};
pi1 = lib.nixosSystem {
modules = [ ./hosts/pi1 ];
specialArgs = { inherit inputs outputs; };
};
# servers
display = lib.nixosSystem {
modules = [ ./hosts/display ];
specialArgs = { inherit inputs outputs; };
};
fred = lib.nixosSystem {
modules = [ ./hosts/fred ];
specialArgs = { inherit inputs outputs; };
};
vm = lib.nixosSystem {
modules = [
"${nixpkgs}/nixos/modules/installer/cd-dvd/installation-cd-graphical-gnome.nix"
"${nixpkgs}/nixos/modules/installer/cd-dvd/channel.nix"
./hosts/vm
];
specialArgs = { inherit inputs outputs; };
};
harper2 = lib.nixosSystem {
modules = [ ./hosts/harper2 ];
specialArgs = { inherit inputs outputs; };
};
harper = lib.nixosSystem {
modules = [ ./hosts/harper ];
specialArgs = { inherit inputs outputs; };
};
nuwww = lib.nixosSystem {
modules = [ ./hosts/nuwww ];
specialArgs = { inherit inputs outputs; };
};
pihole = lib.nixosSystem {
modules = [ ./hosts/pihole ];
specialArgs = { inherit inputs outputs; };
};
www2 = lib.nixosSystem {
modules = [ ./hosts/www2 ];
specialArgs = { inherit inputs outputs; };
};
w1 = lib.nixosSystem {
modules = [ ./hosts/w1 ];
specialArgs = { inherit inputs outputs; };
};
# w2 = lib.nixosSystem {
# modules = [./hosts/w2];
# specialArgs = {
# inherit inputs outputs;
# };
# };
};
# ace = import ./hosts/ace/colmena.nix; # Acer C720
book = import ./hosts/book/colmena.nix; # Google Pixelbook 2017 w/ nvme.
display = import ./hosts/display/colmena.nix; # Pi4
# eve = import ./hosts/eve/colmena.nix; # Google Pixelbook 2017 w/ eMMC.
fred = import ./hosts/fred/colmena.nix; # acer server
loki = import ./hosts/loki/colmena.nix; # Dell XPS 13
# pi1 = import ./hosts/pi1/colmena.nix;
# pocket2 = import ./hosts/pocket2/colmena.nix;
smaug = import ./hosts/smaug/colmena.nix; # Thinkpad x260
w1 = import ./hosts/w1/colmena.nix; # Hetzner VPS
# w2 = import ./hosts/w2/colmena.nix;
};
nixosConfigurations = {
# clients
ace = lib.nixosSystem {
modules = [./hosts/ace];
specialArgs = {inherit inputs outputs;};
};
dragon = lib.nixosSystem {
modules = [./hosts/dragon];
specialArgs = {inherit inputs outputs;};
};
eve = lib.nixosSystem {
modules = [./hosts/eve];
specialArgs = {inherit inputs outputs;};
};
loki = lib.nixosSystem {
modules = [./hosts/loki];
specialArgs = {inherit inputs outputs;};
};
pocket2 = lib.nixosSystem {
modules = [./hosts/pocket2];
specialArgs = {inherit inputs outputs;};
};
smaug = lib.nixosSystem {
modules = [./hosts/smaug];
specialArgs = {inherit inputs outputs;};
};
t2 = lib.nixosSystem {
modules = [./hosts/t2];
specialArgs = {inherit inputs outputs;};
};
pi1 = lib.nixosSystem {
modules = [./hosts/pi1];
specialArgs = {inherit inputs outputs;};
};
# servers
display = lib.nixosSystem {
modules = [./hosts/display];
specialArgs = {inherit inputs outputs;};
};
fred = lib.nixosSystem {
modules = [./hosts/fred];
specialArgs = {inherit inputs outputs;};
};
vm = lib.nixosSystem {
modules = [
"${nixpkgs}/nixos/modules/installer/cd-dvd/installation-cd-graphical-gnome.nix"
"${nixpkgs}/nixos/modules/installer/cd-dvd/channel.nix"
./hosts/vm
];
specialArgs = {inherit inputs outputs;};
};
harper2 = lib.nixosSystem {
modules = [./hosts/harper2];
specialArgs = {inherit inputs outputs;};
};
harper = lib.nixosSystem {
modules = [./hosts/harper];
specialArgs = {inherit inputs outputs;};
};
nuwww = lib.nixosSystem {
modules = [./hosts/nuwww];
specialArgs = {inherit inputs outputs;};
};
pihole = lib.nixosSystem {
modules = [./hosts/pihole];
specialArgs = {inherit inputs outputs;};
};
www2 = lib.nixosSystem {
modules = [./hosts/www2];
specialArgs = {inherit inputs outputs;};
};
w1 = lib.nixosSystem {
modules = [./hosts/w1];
specialArgs = {inherit inputs outputs;};
};
# w2 = lib.nixosSystem {
# modules = [./hosts/w2];
# specialArgs = {
# inherit inputs outputs;
# };
# };
};
};
}