lukegb/depot
1
0
Fork 0
Code Issues 1 Pull requests Projects Packages Activity Actions

ops/nixos: rename blade-leader to blade-janeway

Browse source
This commit is contained in:
Luke Granger-Brown 2021-02-07 20:21:32 +00:00
parent e6f4d37982
commit b0e58ab198
2 changed files with 17 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
ops/nixos/blade-leader/default.nix → ops/nixos/blade-janeway/default.nix
View file

@ -6,34 +6,35 @@
let let
inherit (depot.ops) secrets; inherit (depot.ops) secrets;
in { in {
imports = [
../lib/zfs.nix
];
boot.initrd.availableKernelModules = [ "ahci" "ohci_pci" "ehci_pci" "pata_atiixp" "uhci_hcd" "be2iscsi" "usb_storage" "usbhid" "sd_mod" "sr_mod" ]; boot.initrd.availableKernelModules = [ "ahci" "ohci_pci" "ehci_pci" "pata_atiixp" "uhci_hcd" "be2iscsi" "usb_storage" "usbhid" "sd_mod" "sr_mod" ];
boot.kernelModules = [ "kvm-amd" ]; boot.kernelModules = [ "kvm-amd" ];
boot.kernelParams = [ "mitigations=off" ]; boot.kernelParams = [ "mitigations=off" ];
fileSystems = let fileSystems = let
btrfs = subvol: { zfs = device: {
device = "/dev/sda1"; device = device;
fsType = "btrfs"; fsType = "zfs";
options = [ "subvol=${subvol}" ];
}; };
in { in {
"/" = btrfs "nixos/local/root"; "/" = zfs "tank/local/root";
"/tmp" = btrfs "nixos/local/tmp"; "/tmp" = zfs "tank/local/tmp";
"/nix" = btrfs "nixos/local/nix"; "/nix" = zfs "tank/local/nix";
"/var" = btrfs "nixos/safe/var"; "/var" = zfs "tank/safe/var";
"/home" = btrfs "nixos/safe/home"; "/home" = zfs "tank/safe/home";
}; };
boot.loader.grub.enable = true; boot.loader.grub.enable = true;
boot.loader.grub.version = 2; boot.loader.grub.version = 2;
boot.loader.grub.devices = [ boot.loader.grub.device = "/dev/disk/by-id/usb-USB_SanDisk_3.2Gen1_0401c0556e165beb5c1df7b9f438e6ba98af3caa816d88e69b2bf7ec2909f6ca293a000000000000000000009c7343f0ff88671891558107c52824c1-0:0";
"/dev/disk/by-id/ata-CT2000MX500SSD1_2052E4E1E43F"
"/dev/disk/by-id/ata-CT2000MX500SSD1_2052E4E1E45D"
];
# Networking! # Networking!
networking = { networking = {
hostName = "blade-leader"; hostName = "blade-janeway";
hostId = "3a62390f";
domain = "house.as205479.net"; domain = "house.as205479.net";
nameservers = ["8.8.8.8" "8.8.4.4"]; nameservers = ["8.8.8.8" "8.8.4.4"];
useDHCP = false; useDHCP = false;
@ -50,7 +51,7 @@ in {
}; };
}; };
}; };
my.ip.tailscale = "100.87.45.114"; my.ip.tailscale = "100.121.116.85";
system.stateVersion = "21.05"; system.stateVersion = "21.05";
} }

2
ops/nixos/default.nix
View file

@ -25,7 +25,7 @@ let
"swann" "swann"
"clouvider-lon01" "clouvider-lon01"
"etheroute-lon01" "etheroute-lon01"
"blade-leader" "blade-janeway"
]; ];
rebuilder = system: (import ./lib/rebuilder.nix (args // { system = system; })); rebuilder = system: (import ./lib/rebuilder.nix (args // { system = system; }));
systemCfgs = lib.genAttrs systems systemCfgs = lib.genAttrs systems