From a8c7fc17182812daabc232b9f2bcf672b1d6b0cb Mon Sep 17 00:00:00 2001 From: Ingolf Wagner Date: Tue, 24 Dec 2019 12:50:10 +1300 Subject: [PATCH] reformat --- configs/porani/hardware-configuration.nix | 53 ++++++++++------------- configs/workhorse/jenkins.nix | 1 - configs/workhorse/prometheus.nix | 2 +- 3 files changed, 25 insertions(+), 31 deletions(-) diff --git a/configs/porani/hardware-configuration.nix b/configs/porani/hardware-configuration.nix index c0f4f40..fd64236 100644 --- a/configs/porani/hardware-configuration.nix +++ b/configs/porani/hardware-configuration.nix @@ -2,38 +2,35 @@ imports = [ { - - boot.initrd.availableKernelModules = - [ "ehci_pci" "ahci" "usb_storage" "sd_mod" "sdhci_pci" ]; - boot.initrd.kernelModules = [ "dm-snapshot" ]; - boot.kernelModules = [ "kvm-intel" ]; - boot.extraModulePackages = [ ]; - # grub configuration - # ------------------ - boot.loader.grub = { - device = "/dev/sda"; - enable = true; - version = 2; - }; + boot.initrd.availableKernelModules = + [ "ehci_pci" "ahci" "usb_storage" "sd_mod" "sdhci_pci" ]; + boot.initrd.kernelModules = [ "dm-snapshot" ]; + boot.kernelModules = [ "kvm-intel" ]; + boot.extraModulePackages = [ ]; - # lvm volume group - # ---------------- - boot.initrd.luks.devices = [{ - name = "vg"; - device = "/dev/sda2"; - preLVM = true; - }]; + # grub configuration + # ------------------ + boot.loader.grub = { + device = "/dev/sda"; + enable = true; + version = 2; + }; + + # lvm volume group + # ---------------- + boot.initrd.luks.devices = [{ + name = "vg"; + device = "/dev/sda2"; + preLVM = true; + }]; } - # automount - # --------- - (let - mediaUUID = "3d106f56-89e5-400d-9d6b-1dd957919548"; - in - { + # automount + # --------- + (let mediaUUID = "3d106f56-89e5-400d-9d6b-1dd957919548"; + in { fileSystems."/media" = { - #device = "/dev/disk/by-uuid/162c2f9e-8baa-4433-99fd-bb7e7b69472f"; device = "/dev/disk/by-uuid/${mediaUUID}"; fsType = "ext4"; options = [ @@ -47,14 +44,12 @@ options = "nofail,noauto"; type = "ext4"; wantedBy = [ "multi-user.target" ]; - #what = "/dev/disk/by-uuid/162c2f9e-8baa-4433-99fd-bb7e7b69472f"; what = "/dev/disk/by-uuid/${mediaUUID}"; where = "/media"; }]; }) ]; - # NTFS support # ------------ environment.systemPackages = [ pkgs.ntfs3g ]; diff --git a/configs/workhorse/jenkins.nix b/configs/workhorse/jenkins.nix index ae6e8b8..68aff5d 100644 --- a/configs/workhorse/jenkins.nix +++ b/configs/workhorse/jenkins.nix @@ -227,7 +227,6 @@ in { "ssh://gogs@git.ingolf-wagner.de:443/palo/LineagoOS-build.git" "git@github.com:mrVanDalo/LineagoOS-build.git") - ]; }; }; diff --git a/configs/workhorse/prometheus.nix b/configs/workhorse/prometheus.nix index 611f855..9a282ce 100644 --- a/configs/workhorse/prometheus.nix +++ b/configs/workhorse/prometheus.nix @@ -13,7 +13,7 @@ services.prometheus = { enable = true; # keep data for 30 days - extraFlags = "--storage.tsdb.retention.time=30d" + extraFlags = "--storage.tsdb.retention.time=30d"; scrapeConfigs = [ { job_name = "nginx";