From 067a2c1a8a3a2013661eb2e79b4e942b5d6d3e1d Mon Sep 17 00:00:00 2001 From: Aaron Bieber Date: Wed, 14 Sep 2022 18:35:18 -0600 Subject: [PATCH] fmt --- hosts/h/default.nix | 6 ++++-- hosts/luna/default.nix | 8 ++------ hosts/luna/hardware-configuration.nix | 29 +++++++++++++++++---------- 3 files changed, 24 insertions(+), 19 deletions(-) diff --git a/hosts/h/default.nix b/hosts/h/default.nix index c800923..633612f 100644 --- a/hosts/h/default.nix +++ b/hosts/h/default.nix @@ -387,14 +387,16 @@ in { enableACME = true; locations."/" = { extraConfig = '' - proxy_pass http://127.0.0.1:${toString config.services.gotosocial.configuration.port}; + proxy_pass http://127.0.0.1:${ + toString config.services.gotosocial.configuration.port + }; proxy_set_header Host $host; proxy_set_header Upgrade $http_upgrade; proxy_set_header Connection "upgrade"; proxy_set_header X-Forwarded-For $remote_addr; proxy_set_header X-Forwarded-Proto $scheme; ''; - }; + }; }; "akb.io" = { forceSSL = true; diff --git a/hosts/luna/default.nix b/hosts/luna/default.nix index ab8f9fa..8717b63 100644 --- a/hosts/luna/default.nix +++ b/hosts/luna/default.nix @@ -7,10 +7,7 @@ let userBase = { openssh.authorizedKeys.keys = pubKeys; }; in { _module.args.isUnstable = false; - imports = - [ - ./hardware-configuration.nix - ]; + imports = [ ./hardware-configuration.nix ]; boot.loader.grub.enable = true; boot.loader.grub.device = "/dev/sdb"; @@ -22,8 +19,7 @@ in { networking.networkmanager.enable = true; networking.firewall.allowedTCPPorts = [ 22 ]; - environment.systemPackages = with pkgs; [ - ]; + environment.systemPackages = with pkgs; [ ]; users.users.root = userBase; users.users.qbit = userBase; diff --git a/hosts/luna/hardware-configuration.nix b/hosts/luna/hardware-configuration.nix index 2cdb25c..fb49928 100644 --- a/hosts/luna/hardware-configuration.nix +++ b/hosts/luna/hardware-configuration.nix @@ -1,23 +1,29 @@ { config, lib, pkgs, modulesPath, ... }: { - imports = - [ (modulesPath + "/installer/scan/not-detected.nix") - ]; + imports = [ (modulesPath + "/installer/scan/not-detected.nix") ]; - boot.initrd.availableKernelModules = [ "uhci_hcd" "ehci_pci" "ata_piix" "megaraid_sas" "usb_storage" "usbhid" "sd_mod" "sr_mod" ]; + boot.initrd.availableKernelModules = [ + "uhci_hcd" + "ehci_pci" + "ata_piix" + "megaraid_sas" + "usb_storage" + "usbhid" + "sd_mod" + "sr_mod" + ]; boot.initrd.kernelModules = [ ]; boot.kernelModules = [ "kvm-intel" ]; boot.extraModulePackages = [ ]; - fileSystems."/" = - { device = "/dev/disk/by-uuid/caa1051c-f7c3-4809-9a63-b3908de9c27c"; - fsType = "ext4"; - }; + fileSystems."/" = { + device = "/dev/disk/by-uuid/caa1051c-f7c3-4809-9a63-b3908de9c27c"; + fsType = "ext4"; + }; swapDevices = - [ { device = "/dev/disk/by-uuid/53f8fb0f-1fd8-4785-9278-343b525a23be"; } - ]; + [{ device = "/dev/disk/by-uuid/53f8fb0f-1fd8-4785-9278-343b525a23be"; }]; # Enables DHCP on each ethernet and wireless interface. In case of scripted networking # (the default) this is the recommended approach. When using systemd-networkd it's @@ -29,5 +35,6 @@ # networking.interfaces.eno3.useDHCP = lib.mkDefault true; # networking.interfaces.eno4.useDHCP = lib.mkDefault true; - hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; + hardware.cpu.intel.updateMicrocode = + lib.mkDefault config.hardware.enableRedistributableFirmware; }