Skip to content

Commit a3e18bc

Browse files
committed
feat(nix): update serverz to use zfs
1 parent 83a7d37 commit a3e18bc

File tree

3 files changed

+11
-67
lines changed

3 files changed

+11
-67
lines changed

nix/systems/x86_64-linux/serverz/default.nix

+2-5
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,8 @@ in {
1111
];
1212

1313
# Enable Bootloader
14-
system.boot.efi.enable = true;
15-
16-
# environment.systemPackages = with pkgs; [
17-
# # Any particular packages only for this host
18-
# ];
14+
boot.loader.systemd-boot.enable = true;
15+
boot.loader.efi.canTouchEfiVariables = true;
1916

2017
# Suites managed by nix, see suites by home-manager in homes
2118
suites.common.enable = true; # Enables the basics, like audio, networking, ssh, etc.

nix/systems/x86_64-linux/serverz/disk-config.nix

-54
This file was deleted.

nix/systems/x86_64-linux/serverz/hardware-configuration.nix

+9-8
Original file line numberDiff line numberDiff line change
@@ -11,22 +11,24 @@
1111
(modulesPath + "/installer/scan/not-detected.nix")
1212
];
1313

14-
boot.initrd.availableKernelModules = ["ahci" "ohci_pci" "ehci_pci" "pata_atiixp" "usb_storage" "usbhid" "sd_mod"];
15-
boot.initrd.kernelModules = ["dm-snapshot"];
14+
boot.initrd.availableKernelModules = ["ata_piix" "xhci_pci" "ahci" "sd_mod" "sr_mod"];
15+
16+
boot.initrd.kernelModules = [];
1617
boot.kernelModules = ["kvm-amd"];
1718
boot.extraModulePackages = [];
1819
boot.supportedFilesystems = ["zfs"];
1920
boot.zfs.forceImportRoot = false;
21+
boot.zfs.extraPools = ["tank"];
22+
networking.hostId = "3f032089";
2023

2124
fileSystems."/" = {
22-
device = "/dev/disk/by-uuid/644e21d6-33e5-4003-b18a-a41f8dd5e299";
23-
fsType = "ext4";
25+
device = "/dev/disk/by-uuid/e189d61e-5333-4b6e-8423-ea8f27227a9f";
26+
fsType = "ext3";
2427
};
2528

2629
fileSystems."/boot" = {
27-
device = "/dev/disk/by-uuid/19A6-B38B";
30+
device = "/dev/disk/by-uuid/2216-78D1";
2831
fsType = "vfat";
29-
options = ["fmask=0022" "dmask=0022"];
3032
};
3133

3234
swapDevices = [];
@@ -36,8 +38,7 @@
3638
# still possible to use this option, but it's recommended to use it in conjunction
3739
# with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
3840
networking.useDHCP = lib.mkDefault true;
39-
networking.interfaces.enp4s0.useDHCP = lib.mkDefault true;
40-
networking.hostId = "147b8cf8";
41+
# networking.interfaces.enp4s0.useDHCP = lib.mkDefault true;
4142

4243
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
4344
hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;

0 commit comments

Comments
 (0)