Skip to content

Commit f0856e8

Browse files
committed
feat(sirius): move to Zima Board
1 parent 2fb8793 commit f0856e8

21 files changed

+464
-503
lines changed

.github/workflows/build-sirius.yaml

+11
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
name: Build sirius
2+
on:
3+
push:
4+
workflow_dispatch:
5+
6+
jobs:
7+
call-workflow-passing-data:
8+
uses: ./.github/workflows/build-x86-host.yaml
9+
with:
10+
configuration: sirius
11+
secrets: inherit

.sops.yaml

+5
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ keys:
1212
- &pikiosk 2994ee04eda55d05dae7019ed74ef11ed4a030bc
1313
- &trizero 626de251782cdf224d7f89a4277110395ef8b6e3
1414
- &print-farm 3901b2e5705df031bb41338c5ba8634804f9940d
15+
- &sirius age1vpflrapt4lz5akw8jcft6lhhq0h26ptjq6ce8da27gzuvfdmtqvs8rk8h6
1516

1617
creation_rules:
1718
- path_regex: cells/secrets/sops/envs.yaml
@@ -40,6 +41,8 @@ creation_rules:
4041
- *pikiosk
4142
- *trizero
4243
- *print-farm
44+
age:
45+
- *sirius
4346

4447
- path_regex: cells/secrets/sops/k3s.yaml
4548
key_groups:
@@ -64,6 +67,8 @@ creation_rules:
6467
- *pikiosk
6568
- *trizero
6669
- *print-farm
70+
age:
71+
- *sirius
6772

6873
- path_regex: cells/secrets/sops/ssh.*$
6974
key_groups:

cells/nixos/hosts/nas/postgres.nix

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
];
66

77
systemd.tmpfiles.rules = [
8-
"d /mnt/db/pg-15 775 postgres postgres"
8+
"d /mnt/db/pg-15 750 postgres postgres"
99
];
1010

1111
services.postgresql = {

cells/nixos/hosts/print-farm/argon.nix

-3
This file was deleted.

cells/nixos/hosts/print-farm/hardware-configuration.nix

-63
This file was deleted.

cells/nixos/hosts/print-farm/rtl8852au/default.nix

-69
This file was deleted.

cells/nixos/hosts/print-farm/rtl8852au/platform_ops.c

-10
This file was deleted.

cells/nixos/hosts/print-farm/rtl8852au/rpi.mk

-10
This file was deleted.

cells/nixos/hosts/print-farm/default.nix renamed to cells/nixos/hosts/sirius/default.nix

+3-12
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
profiles,
55
...
66
}: let
7-
system = "aarch64-linux";
7+
system = "x86_64-linux";
88
in {
99
imports = [
1010
suites.base
@@ -15,18 +15,12 @@ in {
1515

1616
inputs.cells.klipper.nixosModules.klipper
1717
inputs.cells.secrets.nixosProfiles.wifi
18-
# inputs.cells.rpi.nixosModules.rpi
19-
20-
inputs.nixos-hardware.nixosModules.raspberry-pi-4
21-
# "${inputs.argononed}/OS/nixos"
2218

2319
./hardware-configuration.nix
2420
./wifi.nix
2521
./network-switch.nix
2622
./spoolman.nix
2723
./home-assistant
28-
29-
./argon.nix
3024
];
3125

3226
bee.system = system;
@@ -35,17 +29,14 @@ in {
3529
inherit system;
3630
config.allowUnfree = true;
3731
overlays = [
38-
inputs.cells.rpi.overlays.kernel
39-
inputs.cells.rpi.overlays.dtmerge
40-
4132
inputs.cells.klipper.overlays.klipper
4233
];
4334
};
4435

4536
networking = {
46-
hostName = "print-farm";
37+
hostName = "sirius";
4738
firewall.enable = false;
4839
};
4940

50-
system.stateVersion = "23.05";
41+
system.stateVersion = "24.11";
5142
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,88 @@
1+
{
2+
config,
3+
lib,
4+
pkgs,
5+
modulesPath,
6+
...
7+
}: {
8+
imports = [
9+
(modulesPath + "/installer/scan/not-detected.nix")
10+
];
11+
12+
boot = {
13+
initrd = {
14+
availableKernelModules = [
15+
"ahci"
16+
"xhci_pci"
17+
18+
"usbhid"
19+
"usb_storage"
20+
21+
"sd_mod"
22+
"mmc_block"
23+
"sdhci_pci"
24+
25+
"rtc_cmos"
26+
];
27+
kernelModules = ["dm_mod"];
28+
supportedFilesystems = ["zfs"];
29+
};
30+
31+
kernelModules = ["kvm-intel"];
32+
extraModulePackages = [];
33+
34+
supportedFilesystems = ["zfs"];
35+
36+
loader = {
37+
# efi.canTouchEfiVariables = true;
38+
39+
grub = {
40+
enable = true;
41+
zfsSupport = true;
42+
efiSupport = true;
43+
efiInstallAsRemovable = true;
44+
mirroredBoots = [
45+
{
46+
devices = ["nodev"];
47+
path = "/boot";
48+
}
49+
];
50+
};
51+
};
52+
};
53+
54+
fileSystems."/" = {
55+
device = "rpool/root";
56+
fsType = "zfs";
57+
};
58+
59+
fileSystems."/home" = {
60+
device = "rpool/home";
61+
fsType = "zfs";
62+
};
63+
64+
fileSystems."/srv" = {
65+
device = "rpool/srv";
66+
fsType = "zfs";
67+
};
68+
69+
fileSystems."/boot" = {
70+
device = "/dev/disk/by-uuid/02B4-70CB";
71+
fsType = "vfat";
72+
options = ["fmask=0077" "dmask=0077"];
73+
};
74+
75+
swapDevices = [];
76+
77+
# Enables DHCP on each ethernet and wireless interface. In case of scripted networking
78+
# (the default) this is the recommended approach. When using systemd-networkd it's
79+
# still possible to use this option, but it's recommended to use it in conjunction
80+
# with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
81+
# networking.useDHCP = lib.mkDefault true;
82+
# networking.interfaces.enp2s0.useDHCP = lib.mkDefault true;
83+
# networking.interfaces.enp3s0.useDHCP = lib.mkDefault true;
84+
85+
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
86+
hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
87+
networking.hostId = "05121450";
88+
}

cells/nixos/hosts/print-farm/home-assistant/default.nix renamed to cells/nixos/hosts/sirius/home-assistant/default.nix

-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
{...}: {
22
imports = [
33
./z2m.nix
4-
# ./pg.nix
54
./home-assistant.nix
65
./mqtt.nix
76
];

0 commit comments

Comments
 (0)