From 566370cda6cc38fc250cd03e593fa4de7dee5ca3 Mon Sep 17 00:00:00 2001 From: Aly Raffauf Date: Sun, 24 Mar 2024 14:06:24 -0400 Subject: [PATCH] hosts: reformatted with nixfmt --- hosts/lavaridge/default.nix | 27 +++++++------ hosts/lavaridge/hardware-configuration.nix | 26 ++++++------- hosts/mauville/default.nix | 30 ++++++--------- hosts/mauville/hardware-configuration.nix | 45 +++++++++++----------- hosts/petalburg/default.nix | 19 +++++---- hosts/petalburg/hardware-configuration.nix | 29 +++++++------- hosts/rustboro/default.nix | 21 +++++----- hosts/rustboro/hardware-configuration.nix | 25 +++++++----- 8 files changed, 109 insertions(+), 113 deletions(-) diff --git a/hosts/lavaridge/default.nix b/hosts/lavaridge/default.nix index e4753be2..10290275 100644 --- a/hosts/lavaridge/default.nix +++ b/hosts/lavaridge/default.nix @@ -3,20 +3,19 @@ { config, pkgs, lib, ... }: { - imports = - [ - ../../modules/homelab/virtualization.nix - ../../modules/kde.nix - ../../modules/plymouth.nix - ../../modules/steam.nix - ../../modules/zram_swap.nix - ../../system - ../../users/aly.nix - ./hardware-configuration.nix # Include the results of the hardware scan. - # ../../modules/gnome - # ../../modules/gnome/fingerprint.nix - # ../../modules/gnome/fractional_scaling.nix - ]; + imports = [ + ../../modules/homelab/virtualization.nix + ../../modules/kde.nix + ../../modules/plymouth.nix + ../../modules/steam.nix + ../../modules/zram_swap.nix + ../../system + ../../users/aly.nix + ./hardware-configuration.nix # Include the results of the hardware scan. + # ../../modules/gnome + # ../../modules/gnome/fingerprint.nix + # ../../modules/gnome/fractional_scaling.nix + ]; # Bootloader. boot.loader.systemd-boot.enable = true; diff --git a/hosts/lavaridge/hardware-configuration.nix b/hosts/lavaridge/hardware-configuration.nix index 6b5790c2..03e56934 100644 --- a/hosts/lavaridge/hardware-configuration.nix +++ b/hosts/lavaridge/hardware-configuration.nix @@ -4,24 +4,23 @@ { config, lib, pkgs, modulesPath, ... }: { - imports = - [ (modulesPath + "/installer/scan/not-detected.nix") - ]; + imports = [ (modulesPath + "/installer/scan/not-detected.nix") ]; - boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "thunderbolt" "usb_storage" "sd_mod" ]; + boot.initrd.availableKernelModules = + [ "nvme" "xhci_pci" "thunderbolt" "usb_storage" "sd_mod" ]; boot.initrd.kernelModules = [ ]; boot.kernelModules = [ "kvm-amd" ]; boot.extraModulePackages = [ ]; - fileSystems."/" = - { device = "/dev/disk/by-uuid/2a76d315-37f9-406d-b1b2-01fee209139a"; - fsType = "ext4"; - }; + fileSystems."/" = { + device = "/dev/disk/by-uuid/2a76d315-37f9-406d-b1b2-01fee209139a"; + fsType = "ext4"; + }; - fileSystems."/boot" = - { device = "/dev/disk/by-uuid/7BC8-F615"; - fsType = "vfat"; - }; + fileSystems."/boot" = { + device = "/dev/disk/by-uuid/7BC8-F615"; + fsType = "vfat"; + }; swapDevices = [ ]; @@ -34,5 +33,6 @@ # networking.interfaces.wlp1s0.useDHCP = lib.mkDefault true; nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; - hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; + hardware.cpu.amd.updateMicrocode = + lib.mkDefault config.hardware.enableRedistributableFirmware; } diff --git a/hosts/mauville/default.nix b/hosts/mauville/default.nix index 5d40e4f4..860049e2 100644 --- a/hosts/mauville/default.nix +++ b/hosts/mauville/default.nix @@ -3,16 +3,15 @@ { config, pkgs, lib, ... }: { - imports = - [ - # ../../modules/gnome - ../../modules/kde.nix - ../../modules/homelab - ../../modules/steam.nix - ../../system - ../../users/aly.nix - ./hardware-configuration.nix - ]; + imports = [ + # ../../modules/gnome + ../../modules/kde.nix + ../../modules/homelab + ../../modules/steam.nix + ../../system + ../../users/aly.nix + ./hardware-configuration.nix + ]; # Bootloader. boot.loader.systemd-boot.enable = true; @@ -29,18 +28,13 @@ hardware.opengl = { # Add ROCM annd AMD Vulkan driver. - extraPackages = with pkgs; [ - rocmPackages.clr.icd - amdvlk - ]; + extraPackages = with pkgs; [ rocmPackages.clr.icd amdvlk ]; # Add support for 32bit apps. driSupport32Bit = true; - extraPackages32 = with pkgs; [ - driversi686Linux.amdvlk - ]; + extraPackages32 = with pkgs; [ driversi686Linux.amdvlk ]; }; home-manager.users.aly = import ../../home/aly-kde.nix; - + system.stateVersion = "23.11"; } diff --git a/hosts/mauville/hardware-configuration.nix b/hosts/mauville/hardware-configuration.nix index b2b849b4..f3336404 100644 --- a/hosts/mauville/hardware-configuration.nix +++ b/hosts/mauville/hardware-configuration.nix @@ -4,38 +4,36 @@ { config, lib, pkgs, modulesPath, ... }: { - imports = - [ (modulesPath + "/installer/scan/not-detected.nix") - ]; + imports = [ (modulesPath + "/installer/scan/not-detected.nix") ]; - boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usbhid" "sd_mod" ]; + boot.initrd.availableKernelModules = + [ "xhci_pci" "ahci" "nvme" "usbhid" "sd_mod" ]; boot.initrd.kernelModules = [ ]; boot.kernelModules = [ "kvm-amd" ]; boot.extraModulePackages = [ ]; - fileSystems."/" = - { device = "/dev/disk/by-uuid/c4217c88-3101-434b-8321-58e2ac89527c"; - fsType = "ext4"; - }; + fileSystems."/" = { + device = "/dev/disk/by-uuid/c4217c88-3101-434b-8321-58e2ac89527c"; + fsType = "ext4"; + }; - fileSystems."/boot" = - { device = "/dev/disk/by-uuid/3445-B2A0"; - fsType = "vfat"; - }; + fileSystems."/boot" = { + device = "/dev/disk/by-uuid/3445-B2A0"; + fsType = "vfat"; + }; - fileSystems."/mnt/Archive" = - { device = "/dev/disk/by-uuid/f7e9e6d6-2bf6-429a-aaf0-49b55d53fc83"; - fsType = "ext4"; - }; + fileSystems."/mnt/Archive" = { + device = "/dev/disk/by-uuid/f7e9e6d6-2bf6-429a-aaf0-49b55d53fc83"; + fsType = "ext4"; + }; - fileSystems."/mnt/Media" = - { device = "/dev/disk/by-uuid/d988d5ca-f9d6-4d85-aa0e-8a437b3c859a"; - fsType = "ext4"; - }; + fileSystems."/mnt/Media" = { + device = "/dev/disk/by-uuid/d988d5ca-f9d6-4d85-aa0e-8a437b3c859a"; + fsType = "ext4"; + }; swapDevices = - [ { device = "/dev/disk/by-uuid/26094ada-7ba4-4437-bacb-b3cdf6c3397b"; } - ]; + [{ device = "/dev/disk/by-uuid/26094ada-7ba4-4437-bacb-b3cdf6c3397b"; }]; # 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 @@ -45,5 +43,6 @@ # networking.interfaces.enp4s0.useDHCP = lib.mkDefault true; nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; - hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; + hardware.cpu.amd.updateMicrocode = + lib.mkDefault config.hardware.enableRedistributableFirmware; } diff --git a/hosts/petalburg/default.nix b/hosts/petalburg/default.nix index 79e9475b..7131c704 100644 --- a/hosts/petalburg/default.nix +++ b/hosts/petalburg/default.nix @@ -52,16 +52,15 @@ let }; in { - imports = - [ - # ../../modules/kde.nix - ../../modules/hyprland.nix - ../../modules/plymouth.nix - ../../modules/zram_swap.nix - ../../system - ../../users/aly.nix - ./hardware-configuration.nix # Include the results of the hardware scan. - ]; + imports = [ + # ../../modules/kde.nix + ../../modules/hyprland.nix + ../../modules/plymouth.nix + ../../modules/zram_swap.nix + ../../system + ../../users/aly.nix + ./hardware-configuration.nix # Include the results of the hardware scan. + ]; # Bootloader. boot.loader.systemd-boot.enable = true; diff --git a/hosts/petalburg/hardware-configuration.nix b/hosts/petalburg/hardware-configuration.nix index a2498ee9..822997e0 100644 --- a/hosts/petalburg/hardware-configuration.nix +++ b/hosts/petalburg/hardware-configuration.nix @@ -4,28 +4,26 @@ { config, lib, pkgs, modulesPath, ... }: { - imports = - [ (modulesPath + "/installer/scan/not-detected.nix") - ]; + imports = [ (modulesPath + "/installer/scan/not-detected.nix") ]; - boot.initrd.availableKernelModules = [ "xhci_pci" "thunderbolt" "nvme" "usb_storage" "sd_mod" ]; + boot.initrd.availableKernelModules = + [ "xhci_pci" "thunderbolt" "nvme" "usb_storage" "sd_mod" ]; boot.initrd.kernelModules = [ ]; boot.kernelModules = [ "kvm-intel" ]; boot.extraModulePackages = [ ]; - fileSystems."/" = - { device = "/dev/disk/by-uuid/ed744c02-8854-4f1a-8e75-ed15f02775e3"; - fsType = "ext4"; - }; + fileSystems."/" = { + device = "/dev/disk/by-uuid/ed744c02-8854-4f1a-8e75-ed15f02775e3"; + fsType = "ext4"; + }; - fileSystems."/boot" = - { device = "/dev/disk/by-uuid/37BB-86B6"; - fsType = "vfat"; - }; + fileSystems."/boot" = { + device = "/dev/disk/by-uuid/37BB-86B6"; + fsType = "vfat"; + }; swapDevices = - [ { device = "/dev/disk/by-uuid/7a33dbc2-73f7-490b-9aa6-382e119a997e"; } - ]; + [{ device = "/dev/disk/by-uuid/7a33dbc2-73f7-490b-9aa6-382e119a997e"; }]; # 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 @@ -35,5 +33,6 @@ # networking.interfaces.wlp0s20f3.useDHCP = lib.mkDefault true; nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; - hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; + hardware.cpu.intel.updateMicrocode = + lib.mkDefault config.hardware.enableRedistributableFirmware; } diff --git a/hosts/rustboro/default.nix b/hosts/rustboro/default.nix index da917e7b..1f7d50de 100644 --- a/hosts/rustboro/default.nix +++ b/hosts/rustboro/default.nix @@ -3,16 +3,15 @@ { config, pkgs, ... }: { - imports = - [ - ./hardware-configuration.nix # Include the results of the hardware scan. - ../../users/aly.nix - ../../system - ../../modules/plymouth.nix - # ../../modules/kde.nix - # ../../modules/sway.nix - ../../modules/hyprland.nix - ]; + imports = [ + ./hardware-configuration.nix # Include the results of the hardware scan. + ../../users/aly.nix + ../../system + ../../modules/plymouth.nix + # ../../modules/kde.nix + # ../../modules/sway.nix + ../../modules/hyprland.nix + ]; # Bootloader. boot.loader.grub.enable = true; @@ -32,4 +31,4 @@ # Before changing this value read the documentation for this option # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html). system.stateVersion = "23.11"; # Did you read the comment? -} \ No newline at end of file +} diff --git a/hosts/rustboro/hardware-configuration.nix b/hosts/rustboro/hardware-configuration.nix index 2afecf4d..72128048 100644 --- a/hosts/rustboro/hardware-configuration.nix +++ b/hosts/rustboro/hardware-configuration.nix @@ -4,19 +4,25 @@ { config, lib, pkgs, modulesPath, ... }: { - imports = - [ (modulesPath + "/installer/scan/not-detected.nix") - ]; + imports = [ (modulesPath + "/installer/scan/not-detected.nix") ]; - boot.initrd.availableKernelModules = [ "xhci_pci" "ehci_pci" "ahci" "usb_storage" "sd_mod" "sr_mod" "rtsx_pci_sdmmc" ]; + boot.initrd.availableKernelModules = [ + "xhci_pci" + "ehci_pci" + "ahci" + "usb_storage" + "sd_mod" + "sr_mod" + "rtsx_pci_sdmmc" + ]; boot.initrd.kernelModules = [ ]; boot.kernelModules = [ "kvm-intel" ]; boot.extraModulePackages = [ ]; - fileSystems."/" = - { device = "/dev/disk/by-uuid/ac40bf74-91e3-4387-8125-6037b7fcd0d6"; - fsType = "ext4"; - }; + fileSystems."/" = { + device = "/dev/disk/by-uuid/ac40bf74-91e3-4387-8125-6037b7fcd0d6"; + fsType = "ext4"; + }; swapDevices = [ ]; @@ -30,5 +36,6 @@ # networking.interfaces.wwp0s20u10c2i12.useDHCP = lib.mkDefault true; nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; - hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; + hardware.cpu.intel.updateMicrocode = + lib.mkDefault config.hardware.enableRedistributableFirmware; }