hosts: reformatted with nixfmt

This commit is contained in:
Aly Raffauf 2024-03-24 14:06:24 -04:00
parent 375a0927d7
commit 566370cda6
8 changed files with 109 additions and 113 deletions

View file

@ -3,20 +3,19 @@
{ config, pkgs, lib, ... }: { config, pkgs, lib, ... }:
{ {
imports = imports = [
[ ../../modules/homelab/virtualization.nix
../../modules/homelab/virtualization.nix ../../modules/kde.nix
../../modules/kde.nix ../../modules/plymouth.nix
../../modules/plymouth.nix ../../modules/steam.nix
../../modules/steam.nix ../../modules/zram_swap.nix
../../modules/zram_swap.nix ../../system
../../system ../../users/aly.nix
../../users/aly.nix ./hardware-configuration.nix # Include the results of the hardware scan.
./hardware-configuration.nix # Include the results of the hardware scan. # ../../modules/gnome
# ../../modules/gnome # ../../modules/gnome/fingerprint.nix
# ../../modules/gnome/fingerprint.nix # ../../modules/gnome/fractional_scaling.nix
# ../../modules/gnome/fractional_scaling.nix ];
];
# Bootloader. # Bootloader.
boot.loader.systemd-boot.enable = true; boot.loader.systemd-boot.enable = true;

View file

@ -4,24 +4,23 @@
{ config, lib, pkgs, modulesPath, ... }: { config, lib, pkgs, modulesPath, ... }:
{ {
imports = imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
[ (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.initrd.kernelModules = [ ];
boot.kernelModules = [ "kvm-amd" ]; boot.kernelModules = [ "kvm-amd" ];
boot.extraModulePackages = [ ]; boot.extraModulePackages = [ ];
fileSystems."/" = fileSystems."/" = {
{ device = "/dev/disk/by-uuid/2a76d315-37f9-406d-b1b2-01fee209139a"; device = "/dev/disk/by-uuid/2a76d315-37f9-406d-b1b2-01fee209139a";
fsType = "ext4"; fsType = "ext4";
}; };
fileSystems."/boot" = fileSystems."/boot" = {
{ device = "/dev/disk/by-uuid/7BC8-F615"; device = "/dev/disk/by-uuid/7BC8-F615";
fsType = "vfat"; fsType = "vfat";
}; };
swapDevices = [ ]; swapDevices = [ ];
@ -34,5 +33,6 @@
# networking.interfaces.wlp1s0.useDHCP = lib.mkDefault true; # networking.interfaces.wlp1s0.useDHCP = lib.mkDefault true;
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; 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;
} }

View file

@ -3,16 +3,15 @@
{ config, pkgs, lib, ... }: { config, pkgs, lib, ... }:
{ {
imports = imports = [
[ # ../../modules/gnome
# ../../modules/gnome ../../modules/kde.nix
../../modules/kde.nix ../../modules/homelab
../../modules/homelab ../../modules/steam.nix
../../modules/steam.nix ../../system
../../system ../../users/aly.nix
../../users/aly.nix ./hardware-configuration.nix
./hardware-configuration.nix ];
];
# Bootloader. # Bootloader.
boot.loader.systemd-boot.enable = true; boot.loader.systemd-boot.enable = true;
@ -29,15 +28,10 @@
hardware.opengl = { hardware.opengl = {
# Add ROCM annd AMD Vulkan driver. # Add ROCM annd AMD Vulkan driver.
extraPackages = with pkgs; [ extraPackages = with pkgs; [ rocmPackages.clr.icd amdvlk ];
rocmPackages.clr.icd
amdvlk
];
# Add support for 32bit apps. # Add support for 32bit apps.
driSupport32Bit = true; driSupport32Bit = true;
extraPackages32 = with pkgs; [ extraPackages32 = with pkgs; [ driversi686Linux.amdvlk ];
driversi686Linux.amdvlk
];
}; };
home-manager.users.aly = import ../../home/aly-kde.nix; home-manager.users.aly = import ../../home/aly-kde.nix;

View file

@ -4,38 +4,36 @@
{ config, lib, pkgs, modulesPath, ... }: { config, lib, pkgs, modulesPath, ... }:
{ {
imports = imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
[ (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.initrd.kernelModules = [ ];
boot.kernelModules = [ "kvm-amd" ]; boot.kernelModules = [ "kvm-amd" ];
boot.extraModulePackages = [ ]; boot.extraModulePackages = [ ];
fileSystems."/" = fileSystems."/" = {
{ device = "/dev/disk/by-uuid/c4217c88-3101-434b-8321-58e2ac89527c"; device = "/dev/disk/by-uuid/c4217c88-3101-434b-8321-58e2ac89527c";
fsType = "ext4"; fsType = "ext4";
}; };
fileSystems."/boot" = fileSystems."/boot" = {
{ device = "/dev/disk/by-uuid/3445-B2A0"; device = "/dev/disk/by-uuid/3445-B2A0";
fsType = "vfat"; fsType = "vfat";
}; };
fileSystems."/mnt/Archive" = fileSystems."/mnt/Archive" = {
{ device = "/dev/disk/by-uuid/f7e9e6d6-2bf6-429a-aaf0-49b55d53fc83"; device = "/dev/disk/by-uuid/f7e9e6d6-2bf6-429a-aaf0-49b55d53fc83";
fsType = "ext4"; fsType = "ext4";
}; };
fileSystems."/mnt/Media" = fileSystems."/mnt/Media" = {
{ device = "/dev/disk/by-uuid/d988d5ca-f9d6-4d85-aa0e-8a437b3c859a"; device = "/dev/disk/by-uuid/d988d5ca-f9d6-4d85-aa0e-8a437b3c859a";
fsType = "ext4"; fsType = "ext4";
}; };
swapDevices = 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 # 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 # (the default) this is the recommended approach. When using systemd-networkd it's
@ -45,5 +43,6 @@
# networking.interfaces.enp4s0.useDHCP = lib.mkDefault true; # networking.interfaces.enp4s0.useDHCP = lib.mkDefault true;
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; 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;
} }

View file

@ -52,16 +52,15 @@ let
}; };
in { in {
imports = imports = [
[ # ../../modules/kde.nix
# ../../modules/kde.nix ../../modules/hyprland.nix
../../modules/hyprland.nix ../../modules/plymouth.nix
../../modules/plymouth.nix ../../modules/zram_swap.nix
../../modules/zram_swap.nix ../../system
../../system ../../users/aly.nix
../../users/aly.nix ./hardware-configuration.nix # Include the results of the hardware scan.
./hardware-configuration.nix # Include the results of the hardware scan. ];
];
# Bootloader. # Bootloader.
boot.loader.systemd-boot.enable = true; boot.loader.systemd-boot.enable = true;

View file

@ -4,28 +4,26 @@
{ config, lib, pkgs, modulesPath, ... }: { config, lib, pkgs, modulesPath, ... }:
{ {
imports = imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
[ (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.initrd.kernelModules = [ ];
boot.kernelModules = [ "kvm-intel" ]; boot.kernelModules = [ "kvm-intel" ];
boot.extraModulePackages = [ ]; boot.extraModulePackages = [ ];
fileSystems."/" = fileSystems."/" = {
{ device = "/dev/disk/by-uuid/ed744c02-8854-4f1a-8e75-ed15f02775e3"; device = "/dev/disk/by-uuid/ed744c02-8854-4f1a-8e75-ed15f02775e3";
fsType = "ext4"; fsType = "ext4";
}; };
fileSystems."/boot" = fileSystems."/boot" = {
{ device = "/dev/disk/by-uuid/37BB-86B6"; device = "/dev/disk/by-uuid/37BB-86B6";
fsType = "vfat"; fsType = "vfat";
}; };
swapDevices = 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 # 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 # (the default) this is the recommended approach. When using systemd-networkd it's
@ -35,5 +33,6 @@
# networking.interfaces.wlp0s20f3.useDHCP = lib.mkDefault true; # networking.interfaces.wlp0s20f3.useDHCP = lib.mkDefault true;
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; 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;
} }

View file

@ -3,16 +3,15 @@
{ config, pkgs, ... }: { config, pkgs, ... }:
{ {
imports = imports = [
[ ./hardware-configuration.nix # Include the results of the hardware scan.
./hardware-configuration.nix # Include the results of the hardware scan. ../../users/aly.nix
../../users/aly.nix ../../system
../../system ../../modules/plymouth.nix
../../modules/plymouth.nix # ../../modules/kde.nix
# ../../modules/kde.nix # ../../modules/sway.nix
# ../../modules/sway.nix ../../modules/hyprland.nix
../../modules/hyprland.nix ];
];
# Bootloader. # Bootloader.
boot.loader.grub.enable = true; boot.loader.grub.enable = true;

View file

@ -4,19 +4,25 @@
{ config, lib, pkgs, modulesPath, ... }: { config, lib, pkgs, modulesPath, ... }:
{ {
imports = imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
[ (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.initrd.kernelModules = [ ];
boot.kernelModules = [ "kvm-intel" ]; boot.kernelModules = [ "kvm-intel" ];
boot.extraModulePackages = [ ]; boot.extraModulePackages = [ ];
fileSystems."/" = fileSystems."/" = {
{ device = "/dev/disk/by-uuid/ac40bf74-91e3-4387-8125-6037b7fcd0d6"; device = "/dev/disk/by-uuid/ac40bf74-91e3-4387-8125-6037b7fcd0d6";
fsType = "ext4"; fsType = "ext4";
}; };
swapDevices = [ ]; swapDevices = [ ];
@ -30,5 +36,6 @@
# networking.interfaces.wwp0s20u10c2i12.useDHCP = lib.mkDefault true; # networking.interfaces.wwp0s20u10c2i12.useDHCP = lib.mkDefault true;
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; 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;
} }