Skip to content

nix fmt #226

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
24apricots merged 1 commit into from
Apr 1, 2026
Merged

nix fmt #226

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
199 changes: 109 additions & 90 deletions flake.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,21 +109,22 @@
};

outputs =
{ self
, nixpkgs
, systems
, colmena
, agenix
, agenix-rekey
, disko
, nix-index-database
, ocflib
, ocf-sync-etc
, ocf-pam-trimspaces
, ocf-utils
, wayout
, ocf-cosmic-applets
, ocf-jukebox
{
self,
nixpkgs,
systems,
colmena,
agenix,
agenix-rekey,
disko,
nix-index-database,
ocflib,
ocf-sync-etc,
ocf-pam-trimspaces,
ocf-utils,
wayout,
ocf-cosmic-applets,
ocf-jukebox,
}@inputs:
let
# ============== #
Expand All @@ -139,8 +140,9 @@
agenix-rekey.overlays.default
];

customModules =
(with nixpkgs.lib; filter (hasSuffix ".nix") (filesystem.listFilesRecursive ./modules));
customModules = (
with nixpkgs.lib; filter (hasSuffix ".nix") (filesystem.listFilesRecursive ./modules)
);

commonModules = customModules ++ [
./profiles/base.nix
Expand All @@ -150,99 +152,115 @@
];

defaultSystem = "x86_64-linux";
overrideSystem = { overheat = "aarch64-linux"; };
overrideSystem = {
overheat = "aarch64-linux";
};

# ============== #
# Glue/Internals #
# ============== #

pkgsFor = system: import nixpkgs {
inherit overlays system;
config = {
allowUnfreePredicate = pkg: builtins.elem (nixpkgs.lib.getName pkg) [
"code"
"claude-code"
"dwarf-fortress"
"google-chrome"
"helvetica-neue-lt-std" #tornado
"mongodb" #zecora for unifi
"nvidia-settings"
"nvidia-x11"
"steam"
"steam-unwrapped"
"unifi-controller"
"vscode"
"zoom"
"drawio"
"datagrip"
"davinci-resolve"
];
pkgsFor =
system:
import nixpkgs {
inherit overlays system;
config = {
allowUnfreePredicate =
pkg:
builtins.elem (nixpkgs.lib.getName pkg) [
"code"
"claude-code"
"dwarf-fortress"
"google-chrome"
"helvetica-neue-lt-std" # tornado
"mongodb" # zecora for unifi
"nvidia-settings"
"nvidia-x11"
"steam"
"steam-unwrapped"
"unifi-controller"
"vscode"
"zoom"
"drawio"
"datagrip"
"davinci-resolve"
];
};
};
};

forAllSystems = fn: nixpkgs.lib.genAttrs (import systems)
(system: fn (pkgsFor system));
forAllSystems = fn: nixpkgs.lib.genAttrs (import systems) (system: fn (pkgsFor system));

readGroup = group: nixpkgs.lib.mapAttrs'
(filename: _: {
readGroup =
group:
nixpkgs.lib.mapAttrs' (filename: _: {
name = nixpkgs.lib.nameFromURL filename ".";
value = {
inherit group;
modules = [ ./hosts/${group}/${filename} ];
};
})
(builtins.readDir ./hosts/${group});
}) (builtins.readDir ./hosts/${group});

hosts = nixpkgs.lib.concatMapAttrs
(group: _: readGroup group)
(builtins.readDir ./hosts);
hosts = nixpkgs.lib.concatMapAttrs (group: _: readGroup group) (builtins.readDir ./hosts);

deploy-user = "ocf-nix-deploy-user";
colmenaHosts = builtins.mapAttrs
(host: { modules, group }: {
colmenaHosts = builtins.mapAttrs (
host:
{ modules, group }:
{
imports = commonModules ++ modules;
deployment.tags = [ group ];
deployment.targetHost = "${host}.ocf.berkeley.edu";
# TODO: Think of a less ugly way of doing this
deployment.targetUser = nixpkgs.lib.mkIf self.colmenaHive.nodes.${host}.config.ocf.managed-deployment.enable deploy-user;
})
hosts;
deployment.targetUser =
nixpkgs.lib.mkIf self.colmenaHive.nodes.${host}.config.ocf.managed-deployment.enable
deploy-user;
}
) hosts;
in
{
formatter = forAllSystems (pkgs: pkgs.nixfmt-tree);

colmenaHive = colmena.lib.makeHive (colmenaHosts // {
meta = {
nixpkgs = pkgsFor defaultSystem;
nodeNixpkgs = nixpkgs.lib.mapAttrs (name: pkgsFor) overrideSystem;
specialArgs = { inherit self inputs; };
colmenaHive = colmena.lib.makeHive (
colmenaHosts
// {
meta = {
nixpkgs = pkgsFor defaultSystem;
nodeNixpkgs = nixpkgs.lib.mapAttrs (name: pkgsFor) overrideSystem;
specialArgs = { inherit self inputs; };
};
}
);

autoDeploy =
let
# returns the value of a managed-deployment option (given as a string containing the option name) for the given node
getOptionForNode =
option: node: self.colmenaHive.nodes.${node}.config.ocf.managed-deployment.${option};

# returns a list of the MAC addresses for the given list of nodes with automated deploy enabled
# hosts that do not have mac-address set will be gracefully ignored
getMACs =
nodes:
builtins.filter (mac: mac != "") (builtins.map (node: getOptionForNode "mac-address" node) nodes);
in
{
# list of nodes with automated deploy enabled, to be consumed by github actions
nodes = builtins.filter (node: getOptionForNode "automated-deploy" node) (
builtins.attrNames self.colmenaHive.nodes
);

# list of mac addresses of nodes that github actions should wake up on deploy
MACs = getMACs self.autoDeploy.nodes;

# attribute set combining automatedDeployNodes and automatedDeployNodeMACs
# get json with `nix eval .#autoDeploy.nodesWithMACs --json`!
# TODO: script to wake up hosts with this
nodesWithMACs = nixpkgs.lib.listToAttrs (
nixpkgs.lib.zipListsWith (name: value: {
inherit name value;
}) self.autoDeploy.nodes self.autoDeploy.MACs
);
};
});

autoDeploy = let
# returns the value of a managed-deployment option (given as a string containing the option name) for the given node
getOptionForNode = option: node: self.colmenaHive.nodes.${node}.config.ocf.managed-deployment.${option};

# returns a list of the MAC addresses for the given list of nodes with automated deploy enabled
# hosts that do not have mac-address set will be gracefully ignored
getMACs = nodes: builtins.filter (mac: mac != "")
(builtins.map
(node: getOptionForNode "mac-address" node)
nodes);
in {
# list of nodes with automated deploy enabled, to be consumed by github actions
nodes = builtins.filter (node: getOptionForNode "automated-deploy" node) (builtins.attrNames self.colmenaHive.nodes);

# list of mac addresses of nodes that github actions should wake up on deploy
MACs = getMACs self.autoDeploy.nodes;

# attribute set combining automatedDeployNodes and automatedDeployNodeMACs
# get json with `nix eval .#autoDeploy.nodesWithMACs --json`!
# TODO: script to wake up hosts with this
nodesWithMACs = nixpkgs.lib.listToAttrs (nixpkgs.lib.zipListsWith
(name: value: { inherit name value; })
self.autoDeploy.nodes self.autoDeploy.MACs);
};

overlays.default = final: prev: {
ocf-utils = ocf-utils.packages.${final.system}.default;
Expand All @@ -265,7 +283,7 @@
default = pkgs.mkShell {
packages = [
pkgs.git
pkgs.age
pkgs.age
pkgs.agenix-rekey
pkgs.age-plugin-fido2-hmac
pkgs.wol
Expand All @@ -284,13 +302,14 @@
};
});

nixosConfigurations = builtins.mapAttrs
(host: colmenaConfig: nixpkgs.lib.nixosSystem rec {
nixosConfigurations = builtins.mapAttrs (
host: colmenaConfig:
nixpkgs.lib.nixosSystem rec {
system = overrideSystem.${host} or defaultSystem;
pkgs = pkgsFor system;
modules = colmenaConfig.imports;
specialArgs = { inherit inputs; };
})
colmenaHosts;
}
) colmenaHosts;
};
}
17 changes: 15 additions & 2 deletions hardware/minisforum-new.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,24 @@
{ config, lib, pkgs, modulesPath, ... }:
{
config,
lib,
pkgs,
modulesPath,
...
}:

{
imports = [
(modulesPath + "/installer/scan/not-detected.nix")
];

boot.initrd.availableKernelModules = [ "xhci_pci" "nvme" "thunderbolt" "usbhid" "usb_storage" "sd_mod" ];
boot.initrd.availableKernelModules = [
"xhci_pci"
"nvme"
"thunderbolt"
"usbhid"
"usb_storage"
"sd_mod"
];
boot.initrd.kernelModules = [ ];
boot.kernelModules = [ "kvm-amd" ];
boot.extraModulePackages = [ ];
Expand Down
19 changes: 17 additions & 2 deletions hardware/nuc.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,26 @@
{ config, lib, pkgs, modulesPath, ... }:
{
config,
lib,
pkgs,
modulesPath,
...
}:

{
imports = [
(modulesPath + "/installer/scan/not-detected.nix")
];

boot.initrd.availableKernelModules = [ "xhci_pci" "thunderbolt" "ahci" "nvme" "usb_storage" "usbhid" "sd_mod" "rtsx_pci_sdmmc" ];
boot.initrd.availableKernelModules = [
"xhci_pci"
"thunderbolt"
"ahci"
"nvme"
"usb_storage"
"usbhid"
"sd_mod"
"rtsx_pci_sdmmc"
];
boot.initrd.kernelModules = [ ];
boot.kernelModules = [ "kvm-intel" ];
boot.extraModulePackages = [ ];
Expand Down
18 changes: 16 additions & 2 deletions hardware/nucleus.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,28 @@
# Hardware configuration for 2022 newk8s servers (dna).
# Requires filesystems to be labeled with `nixos` and `boot`.

{ config, lib, pkgs, modulesPath, ... }:
{
config,
lib,
pkgs,
modulesPath,
...
}:

{
imports = [
(modulesPath + "/installer/scan/not-detected.nix")
];

boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" "sr_mod" ];
boot.initrd.availableKernelModules = [
"nvme"
"xhci_pci"
"ahci"
"usbhid"
"usb_storage"
"sd_mod"
"sr_mod"
];
boot.initrd.kernelModules = [ ];
boot.kernelModules = [ "kvm-amd" ];
boot.extraModulePackages = [ ];
Expand Down
Loading
Loading