From c899616768f7e043c08f85d8880b1e19e832b3f1 Mon Sep 17 00:00:00 2001 From: "qo.is sysadmin" Date: Sat, 10 Apr 2021 18:31:42 +0200 Subject: [PATCH] Apply nixfmt --- hardware/asrock.nix | 7 +++---- host/lindberg/default.nix | 2 +- host/lindberg/filesystems.nix | 13 ++++++++++--- host/lindberg/networking.nix | 3 +-- 4 files changed, 15 insertions(+), 10 deletions(-) diff --git a/hardware/asrock.nix b/hardware/asrock.nix index af564e5..e9c052a 100644 --- a/hardware/asrock.nix +++ b/hardware/asrock.nix @@ -1,9 +1,8 @@ { config, lib, pkgs, modulesPath, ... }: { - imports = - [ (modulesPath + "/installer/scan/not-detected.nix") - ]; + imports = [ (modulesPath + "/installer/scan/not-detected.nix") ]; - boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" ]; + boot.initrd.availableKernelModules = + [ "nvme" "xhci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" ]; boot.initrd.kernelModules = [ ]; boot.kernelModules = [ "kvm-amd" ]; boot.extraModulePackages = [ ]; diff --git a/host/lindberg/default.nix b/host/lindberg/default.nix index 5499c7c..79aaf1d 100644 --- a/host/lindberg/default.nix +++ b/host/lindberg/default.nix @@ -12,7 +12,7 @@ # Set your time zone. time.timeZone = "Europe/Amsterdam"; - + # This value determines the NixOS release from which the default # settings for stateful data, like file locations and database versions # on your system were taken. It‘s perfectly fine and recommended to leave diff --git a/host/lindberg/filesystems.nix b/host/lindberg/filesystems.nix index 063e63c..cfa0323 100644 --- a/host/lindberg/filesystems.nix +++ b/host/lindberg/filesystems.nix @@ -1,6 +1,5 @@ { config, pkgs, ... }: { - boot.initrd.luks.devices = { "system".device = "/dev/disk/by-uuid/ba646016-2618-4d9b-acf2-41986ab76f7e"; "data".device = "/dev/disk/by-uuid/6cfe504d-992f-4b11-be3e-31d00c3e108d"; @@ -42,8 +41,16 @@ enable = true; efiSupport = true; mirroredBoots = [ - { devices = [ "nodev" ]; path = "/boot-primary"; efiBootloaderId = "NixOS primary"; } - { devices = [ "nodev" ]; path = "/boot-secondary"; efiBootloaderId = "NixOS secondary";} + { + devices = [ "nodev" ]; + path = "/boot-primary"; + efiBootloaderId = "NixOS primary"; + } + { + devices = [ "nodev" ]; + path = "/boot-secondary"; + efiBootloaderId = "NixOS secondary"; + } ]; }; } diff --git a/host/lindberg/networking.nix b/host/lindberg/networking.nix index 97c5659..77fce96 100644 --- a/host/lindberg/networking.nix +++ b/host/lindberg/networking.nix @@ -1,7 +1,6 @@ { config, pkgs, ... }: -let - meta = import ../../meta; +let meta = import ../../meta; in { networking.hostName = "lindberg"; # TODO: Extract into meta