jahanson/mochi
1
0
Fork 0
Code Issues 1 Pull requests 3 Projects Releases Packages Wiki Activity Actions

move disko loading to host profile

Browse source
This commit is contained in:
Joseph Hanson 2024-07-14 06:02:32 -05:00
parent 95d3365580
commit f975cdcde7
Signed by: jahanson
SSH key fingerprint: SHA256:vy6dKBECV522aPAwklFM3ReKAVB086rT3oWwiuiFG7o
2 changed files with 3 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
flake.nix
View file

@ -244,8 +244,6 @@
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

24
nixos/hosts/gandalf/default.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, ... }: { config, lib, modulesPath, inputs, ... }:
let let
sanoidConfig = import ./config/sanoid.nix { }; sanoidConfig = import ./config/sanoid.nix { };
in in
@ -9,6 +9,8 @@ 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 = {
@ -44,26 +46,6 @@ 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;