From b0790876ec1f9841010e071d374eebc41fb1d621 Mon Sep 17 00:00:00 2001 From: teutat3s Date: Sat, 24 Aug 2024 17:39:49 +0200 Subject: [PATCH] style: format using nixfmt-rfc-style --- hosts/blue-shell/configuration.nix | 7 ++++++- hosts/blue-shell/disk-config.nix | 16 ++++----------- hosts/blue-shell/hardware-configuration.nix | 20 ++++++++++++++----- hosts/delite/disk-config.nix | 16 ++++----------- hosts/delite/hardware-configuration.nix | 20 +++++++++++++------ hosts/trinkgenossin/configuration.nix | 2 +- .../trinkgenossin/hardware-configuration.nix | 6 ++---- secrets/secrets.nix | 6 +++++- 8 files changed, 51 insertions(+), 42 deletions(-) diff --git a/hosts/blue-shell/configuration.nix b/hosts/blue-shell/configuration.nix index 07364e55..20ad2910 100644 --- a/hosts/blue-shell/configuration.nix +++ b/hosts/blue-shell/configuration.nix @@ -1,4 +1,9 @@ -{ config, lib, pkgs, ... }: +{ + config, + lib, + pkgs, + ... +}: { boot.loader.grub.enable = true; diff --git a/hosts/blue-shell/disk-config.nix b/hosts/blue-shell/disk-config.nix index 9be1ff5a..2903130d 100644 --- a/hosts/blue-shell/disk-config.nix +++ b/hosts/blue-shell/disk-config.nix @@ -18,9 +18,7 @@ type = "filesystem"; format = "ext4"; mountpoint = "/boot"; - mountOptions = [ - "defaults" - ]; + mountOptions = [ "defaults" ]; }; }; luks = { @@ -60,9 +58,7 @@ type = "filesystem"; format = "xfs"; mountpoint = "/var/lib/garage/data"; - mountOptions = [ - "defaults" - ]; + mountOptions = [ "defaults" ]; }; }; }; @@ -80,9 +76,7 @@ type = "filesystem"; format = "ext4"; mountpoint = "/"; - mountOptions = [ - "defaults" - ]; + mountOptions = [ "defaults" ]; }; }; swap = { @@ -97,9 +91,7 @@ type = "filesystem"; format = "btrfs"; mountpoint = "/var/lib/garage/meta"; - mountOptions = [ - "defaults" - ]; + mountOptions = [ "defaults" ]; }; }; }; diff --git a/hosts/blue-shell/hardware-configuration.nix b/hosts/blue-shell/hardware-configuration.nix index d6d2835e..86e1e30f 100644 --- a/hosts/blue-shell/hardware-configuration.nix +++ b/hosts/blue-shell/hardware-configuration.nix @@ -1,14 +1,24 @@ # Do not modify this file! It was generated by ‘nixos-generate-config’ # and may be overwritten by future invocations. Please make changes # to /etc/nixos/configuration.nix instead. -{ config, lib, pkgs, modulesPath, ... }: +{ + config, + lib, + pkgs, + modulesPath, + ... +}: { - imports = - [ (modulesPath + "/profiles/qemu-guest.nix") - ]; + imports = [ (modulesPath + "/profiles/qemu-guest.nix") ]; - boot.initrd.availableKernelModules = [ "ata_piix" "uhci_hcd" "virtio_pci" "sr_mod" "virtio_blk" ]; + boot.initrd.availableKernelModules = [ + "ata_piix" + "uhci_hcd" + "virtio_pci" + "sr_mod" + "virtio_blk" + ]; boot.initrd.kernelModules = [ ]; boot.kernelModules = [ ]; boot.extraModulePackages = [ ]; diff --git a/hosts/delite/disk-config.nix b/hosts/delite/disk-config.nix index e478b7fb..dea45f44 100644 --- a/hosts/delite/disk-config.nix +++ b/hosts/delite/disk-config.nix @@ -18,9 +18,7 @@ type = "filesystem"; format = "ext4"; mountpoint = "/boot"; - mountOptions = [ - "defaults" - ]; + mountOptions = [ "defaults" ]; }; }; luks = { @@ -52,9 +50,7 @@ type = "filesystem"; format = "ext4"; mountpoint = "/"; - mountOptions = [ - "defaults" - ]; + mountOptions = [ "defaults" ]; }; }; swap = { @@ -69,9 +65,7 @@ type = "filesystem"; format = "xfs"; mountpoint = "/var/lib/garage/data"; - mountOptions = [ - "defaults" - ]; + mountOptions = [ "defaults" ]; }; }; metadata = { @@ -80,9 +74,7 @@ type = "filesystem"; format = "btrfs"; mountpoint = "/var/lib/garage/meta"; - mountOptions = [ - "defaults" - ]; + mountOptions = [ "defaults" ]; }; }; }; diff --git a/hosts/delite/hardware-configuration.nix b/hosts/delite/hardware-configuration.nix index bfdede70..5fff3303 100644 --- a/hosts/delite/hardware-configuration.nix +++ b/hosts/delite/hardware-configuration.nix @@ -1,18 +1,26 @@ # Do not modify this file! It was generated by ‘nixos-generate-config’ # and may be overwritten by future invocations. Please make changes # to /etc/nixos/configuration.nix instead. -{ config, lib, pkgs, modulesPath, ... }: +{ + config, + lib, + pkgs, + modulesPath, + ... +}: { - imports = - [ (modulesPath + "/profiles/qemu-guest.nix") - ]; + imports = [ (modulesPath + "/profiles/qemu-guest.nix") ]; - boot.initrd.availableKernelModules = [ "ata_piix" "uhci_hcd" "virtio_pci" "virtio_blk" ]; + boot.initrd.availableKernelModules = [ + "ata_piix" + "uhci_hcd" + "virtio_pci" + "virtio_blk" + ]; boot.initrd.kernelModules = [ "dm-snapshot" ]; boot.kernelModules = [ ]; boot.extraModulePackages = [ ]; - nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; } diff --git a/hosts/trinkgenossin/configuration.nix b/hosts/trinkgenossin/configuration.nix index ca20c940..c5e0016e 100644 --- a/hosts/trinkgenossin/configuration.nix +++ b/hosts/trinkgenossin/configuration.nix @@ -7,7 +7,7 @@ }: { boot.loader.grub.enable = true; - boot.loader.grub.devices = ["/dev/vda"]; + boot.loader.grub.devices = [ "/dev/vda" ]; boot.kernelParams = [ "boot.shell_on_fail=1" diff --git a/hosts/trinkgenossin/hardware-configuration.nix b/hosts/trinkgenossin/hardware-configuration.nix index c4ee45e4..a1432c97 100644 --- a/hosts/trinkgenossin/hardware-configuration.nix +++ b/hosts/trinkgenossin/hardware-configuration.nix @@ -24,7 +24,7 @@ boot.extraModulePackages = [ ]; boot.initrd.luks.devices."cryptroot" = { - device = "/dev/disk/by-uuid/52a1fd17-63d7-4d0a-b7ff-74aceaf6085a"; + device = "/dev/disk/by-uuid/52a1fd17-63d7-4d0a-b7ff-74aceaf6085a"; }; fileSystems."/" = { @@ -47,9 +47,7 @@ fsType = "btrfs"; }; - swapDevices = [ - { device = "/dev/disk/by-label/swap"; } - ]; + swapDevices = [ { device = "/dev/disk/by-label/swap"; } ]; nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; virtualisation.hypervGuest.enable = true; diff --git a/secrets/secrets.nix b/secrets/secrets.nix index 6661e182..686345a9 100644 --- a/secrets/secrets.nix +++ b/secrets/secrets.nix @@ -21,7 +21,11 @@ let metronomKeys = [ metronom-host ]; - garageKeys = [ trinkgenossin-host delite-host blue-shell-host ]; + garageKeys = [ + trinkgenossin-host + delite-host + blue-shell-host + ]; in { # ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBB5XaH02a6+TchnyQED2VwaltPgeFCbildbE2h6nF5e root@nachtigall