From 8f56cf5a99e70ac7f90f250e594eea5041035297 Mon Sep 17 00:00:00 2001 From: Fabian Hauser Date: Mon, 3 May 2021 15:05:10 +0200 Subject: [PATCH] Apply nixfmt --- defaults/user-configuration/fhauser/sway.nix | 4 +-- hardware/thinkpad-t470s.nix | 10 ++---- host/speer/filesystems.nix | 33 ++++++++++---------- 3 files changed, 20 insertions(+), 27 deletions(-) diff --git a/defaults/user-configuration/fhauser/sway.nix b/defaults/user-configuration/fhauser/sway.nix index 21fffef..e14fe1b 100644 --- a/defaults/user-configuration/fhauser/sway.nix +++ b/defaults/user-configuration/fhauser/sway.nix @@ -182,9 +182,7 @@ }) ]; home-pc.outputs = [ - (mkScreen "Dell Inc. DELL P2720DC 22JPK53" // { - position = "0,0"; - }) + (mkScreen "Dell Inc. DELL P2720DC 22JPK53" // { position = "0,0"; }) (mkScreen "Unknown HP Z27 CN482201RP" // { position = "2560,0"; scale = 1.5; diff --git a/hardware/thinkpad-t470s.nix b/hardware/thinkpad-t470s.nix index 2a30a6a..585104a 100644 --- a/hardware/thinkpad-t470s.nix +++ b/hardware/thinkpad-t470s.nix @@ -7,14 +7,8 @@ ]; - boot.initrd.availableKernelModules = [ - "xhci_pci" - "ahci" - "nvme" - "usb_storage" - "usbhid" - "sd_mod" - ]; + boot.initrd.availableKernelModules = + [ "xhci_pci" "ahci" "nvme" "usb_storage" "usbhid" "sd_mod" ]; boot.kernelModules = [ "kvm-intel" ]; # Ignore Alcor smartcard (gpg is not very smart) diff --git a/host/speer/filesystems.nix b/host/speer/filesystems.nix index 1e207a1..e7c98c1 100644 --- a/host/speer/filesystems.nix +++ b/host/speer/filesystems.nix @@ -1,25 +1,26 @@ { config, pkgs, lib, ... }: { - boot.initrd.luks.devices.system.device = "/dev/disk/by-uuid/bf353bb1-43bf-453f-ae7e-0fa9b4d8778c"; + boot.initrd.luks.devices.system.device = + "/dev/disk/by-uuid/bf353bb1-43bf-453f-ae7e-0fa9b4d8778c"; boot.initrd.kernelModules = [ "dm-snapshot" ]; - fileSystems."/" = - { device = "/dev/disk/by-uuid/661ad230-72da-4326-bb3a-4965006475f8"; - fsType = "btrfs"; - options = [ "subvol=nixos" ]; - }; + fileSystems."/" = { + device = "/dev/disk/by-uuid/661ad230-72da-4326-bb3a-4965006475f8"; + fsType = "btrfs"; + options = [ "subvol=nixos" ]; + }; - fileSystems."/home" = - { device = "/dev/disk/by-uuid/661ad230-72da-4326-bb3a-4965006475f8"; - fsType = "btrfs"; - options = [ "subvol=home" ]; - }; + fileSystems."/home" = { + device = "/dev/disk/by-uuid/661ad230-72da-4326-bb3a-4965006475f8"; + fsType = "btrfs"; + options = [ "subvol=home" ]; + }; - fileSystems."/boot" = - { device = "/dev/disk/by-uuid/A5C5-1372"; - fsType = "vfat"; - }; + fileSystems."/boot" = { + device = "/dev/disk/by-uuid/A5C5-1372"; + fsType = "vfat"; + }; - swapDevices = []; + swapDevices = [ ]; # Use the systemd-boot EFI boot loader. boot.loader.systemd-boot.enable = true;