From 1b3c4bbd27214a2b6dfec7e26b92b32a171fbc48 Mon Sep 17 00:00:00 2001 From: sefidel Date: Sat, 4 Feb 2023 01:13:35 +0900 Subject: project: reformat --- colmena/cobalt/configuration.nix | 7 ++++--- colmena/cobalt/hardware-configuration.nix | 21 ++++++++++++++------- 2 files changed, 18 insertions(+), 10 deletions(-) diff --git a/colmena/cobalt/configuration.nix b/colmena/cobalt/configuration.nix index cd56f40..7caac5e 100644 --- a/colmena/cobalt/configuration.nix +++ b/colmena/cobalt/configuration.nix @@ -21,7 +21,8 @@ let in { imports = - [ # Include the results of the hardware scan. + [ + # Include the results of the hardware scan. ./hardware-configuration.nix ./services/acme.nix @@ -44,8 +45,8 @@ in boot.loader.grub.copyKernels = true; # Make sure that you've listed all of the boot partitions here. boot.loader.grub.mirroredBoots = [ - { path = "/boot"; devices = ["/dev/disk/by-id/ata-ST4000NM0245-1Z2107_ZC17GW7G"]; } - { path = "/boot-fallback"; devices = ["/dev/disk/by-id/ata-ST4000NM0245-1Z2107_ZC17GWB2"]; } + { path = "/boot"; devices = [ "/dev/disk/by-id/ata-ST4000NM0245-1Z2107_ZC17GW7G" ]; } + { path = "/boot-fallback"; devices = [ "/dev/disk/by-id/ata-ST4000NM0245-1Z2107_ZC17GWB2" ]; } ]; # Boot normally when one of the boot partitions are missing diff --git a/colmena/cobalt/hardware-configuration.nix b/colmena/cobalt/hardware-configuration.nix index edd805f..95ecb96 100644 --- a/colmena/cobalt/hardware-configuration.nix +++ b/colmena/cobalt/hardware-configuration.nix @@ -5,7 +5,8 @@ { imports = - [ (modulesPath + "/installer/scan/not-detected.nix") + [ + (modulesPath + "/installer/scan/not-detected.nix") ]; boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "sd_mod" ]; @@ -14,32 +15,38 @@ boot.extraModulePackages = [ ]; fileSystems."/" = - { device = "rpool/local/root"; + { + device = "rpool/local/root"; fsType = "zfs"; }; fileSystems."/boot" = - { device = "/dev/disk/by-uuid/445A-0C55"; + { + device = "/dev/disk/by-uuid/445A-0C55"; fsType = "vfat"; }; fileSystems."/boot-fallback" = - { device = "/dev/disk/by-uuid/445C-198F"; + { + device = "/dev/disk/by-uuid/445C-198F"; fsType = "vfat"; }; fileSystems."/nix" = - { device = "rpool/local/nix"; + { + device = "rpool/local/nix"; fsType = "zfs"; }; fileSystems."/home" = - { device = "rpool/safe/home"; + { + device = "rpool/safe/home"; fsType = "zfs"; }; fileSystems."/persist" = - { device = "rpool/safe/persist"; + { + device = "rpool/safe/persist"; fsType = "zfs"; }; -- cgit 1.4.1