Compare commits

..

No commits in common. "49d687995544f3ae231b0b7bccf7fb97ad772037" and "5e09e75f63444d3925dee97cb58afa37a5bcb60a" have entirely different histories.

4 changed files with 29 additions and 9 deletions

View file

@ -244,6 +244,8 @@
hardwareModules = [ hardwareModules = [
lix-module.nixosModules.default lix-module.nixosModules.default
./nixos/profiles/hw-supermicro.nix ./nixos/profiles/hw-supermicro.nix
disko.nixosModules.disko
(import ./nixos/profiles/disko-nixos.nix { disks = [ "/dev/disk/by-id/ata-Seagate_IronWolfPro_ZA240NX10001-2ZH100_7TF002RA" ]; })
]; ];
profileModules = [ profileModules = [
./nixos/profiles/role-server.nix ./nixos/profiles/role-server.nix

View file

@ -1,7 +1,7 @@
# Do not modify this file! It was generated by nixos-generate-config # Do not modify this file! It was generated by nixos-generate-config
# and may be overwritten by future invocations. Please make changes # and may be overwritten by future invocations. Please make changes
# to /etc/nixos/configuration.nix instead. # to /etc/nixos/configuration.nix instead.
{ config, lib, modulesPath, inputs, ... }: { config, lib, modulesPath, ... }:
let let
sanoidConfig = import ./config/sanoid.nix { }; sanoidConfig = import ./config/sanoid.nix { };
in in
@ -9,8 +9,6 @@ in
imports = imports =
[ [
(modulesPath + "/installer/scan/not-detected.nix") (modulesPath + "/installer/scan/not-detected.nix")
inputs.disko.nixosModules.disko
(import ./nixos/profiles/disko-nixos.nix { disks = [ "/dev/sda" ]; })
]; ];
boot = { boot = {
@ -46,6 +44,26 @@ in
}; };
}; };
fileSystems."/" = {
device = "zroot/root";
fsType = "zfs";
};
fileSystems."/nix" = {
device = "zroot/nix";
fsType = "zfs";
};
fileSystems."/var" = {
device = "zroot/var";
fsType = "zfs";
};
fileSystems."/home" = {
device = "zroot/home";
fsType = "zfs";
};
swapDevices = [ ]; swapDevices = [ ];
hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;

View file

@ -21,6 +21,9 @@
{ devices = [ "nodev" ]; path = "/boot"; } { devices = [ "nodev" ]; path = "/boot"; }
]; ];
}; };
# efi = {
# canTouchEfiVariables = true;
# };
}; };
}; };

View file

@ -5,12 +5,9 @@
supportedFilesystems = [ "nfs" ]; supportedFilesystems = [ "nfs" ];
loader = { loader = {
grub = { systemd-boot.enable = true;
enable = true; efi = {
efiInstallAsRemovable = true; canTouchEfiVariables = true;
mirroredBoots = [
{ devices = [ "nodev" ]; path = "/boot"; }
];
}; };
}; };
}; };