From e180e317643f6b5c59d2b0cf4236433a11135122 Mon Sep 17 00:00:00 2001 From: serenity-F Date: Mon, 18 Nov 2024 22:43:35 +1000 Subject: [PATCH] updated persephone --- hosts/persephone/default.nix | 75 +++++++++++--- hosts/persephone/hardware-configuration.nix | 109 -------------------- 2 files changed, 58 insertions(+), 126 deletions(-) delete mode 100644 hosts/persephone/hardware-configuration.nix diff --git a/hosts/persephone/default.nix b/hosts/persephone/default.nix index 910f2d5..726e902 100644 --- a/hosts/persephone/default.nix +++ b/hosts/persephone/default.nix @@ -1,16 +1,13 @@ -{ lib, pkgs, ... }: +{ lib, config, pkgs, ... }: { imports = [ ## Host specific files - ./hardware-configuration.nix # hardware config - #./network-configuration.nix # network config - ./modules/network.nix # more host specific configs + ./modules ## Shared 'core' config options ../../core/config.nix - ]; ## ooh, hostname - this one's important! @@ -21,28 +18,74 @@ ## Enable bluetooth inside Persephone bluetooth.enable = true; - ## Packages for the iGPU inside Persephone + ## Pick either "true" OR "lib.mkDefault -" + cpu.intel.updateMicrocode = + lib.mkDefault config.hardware.enableRedistributableFirmware; + #cpu.intel.updateMicrocode = true; + enableAllFirmware = true; graphics = { enable = true; - enable32Bit = true; + ## Packages for integrated graphics inside Persephone extraPackages = with pkgs; [ intel-compute-runtime - intel-media-driver - libvdpau-va-gl - vaapiIntel - vaapiVdpau + intel-media-driver + vaapiIntel + vaapiVdpau + libvdpau-va-gl ]; + }; + }; + ## Trying out an alternate memory allocator + environment.memoryAllocator.provider = "graphene-hardened-light"; + + ## 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 + ## still possible to use this option, but it's recommended to use it in conjunction + ## with explicit per-interface declarations with `networking.interfaces..useDHCP`. + networking.useDHCP = lib.mkDefault true; + #networking.interfaces.enp0s31f6.useDHCP = lib.mkDefault true; + #networking.interfaces.wlp58s0.useDHCP = lib.mkDefault true; + + boot = { + supportedFilesystems = [ "btrfs" "xfs" "ntfs" ]; + initrd = { + systemd.enable = true; + }; + loader = { + systemd-boot = { + enable = true; + configurationLimit = 5; + }; + efi = { + canTouchEfiVariables = true; + #efiSysMountPoint = "/boot/efi"; + }; }; }; + ## Hardware-related services + services = { + ## TRIM to keep SSDs healthy-ish + fstrim.enable = true; + + }; + + powerManagement = { + enable = true; + powertop.enable = true; + #cpuFreqGovernor = Lib.mkDefault "performance"; + #cpufreq = { + #min = 1500000; + #max = 4400000; + #}; + }; + programs = { ## For tweaking system performance - corectrl = { - enable = true; - }; + corectrl = { enable = true; }; ## Performance tweaking continued tuxclocker = { enable = true; @@ -52,9 +95,7 @@ }; ## Some packages for managing the hardware inside Persephone - environment.systemPackages = with pkgs; [ - nvtopPackages.intel - ]; + environment.systemPackages = with pkgs; [ nvtopPackages.intel ]; nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; diff --git a/hosts/persephone/hardware-configuration.nix b/hosts/persephone/hardware-configuration.nix deleted file mode 100644 index 95b84c1..0000000 --- a/hosts/persephone/hardware-configuration.nix +++ /dev/null @@ -1,109 +0,0 @@ -{ config, lib, pkgs, modulesPath, ... }: - -{ - imports = [ - ## Import necessary flake modules - #"${builtins.fetchTarball "https://github.com/nix-community/disko/archive/master.tar.gz"}/module.nix" - - ## Include results from the (non-existent) hardware scan - ## as well as the host-specific hardware config options - (modulesPath + "/installer/scan/not-detected.nix") - - ## Disko config, should eventually let us nuke our boot drive and reinstall - ## with zero worries. - #./disko.nix - - ]; - - boot = { - kernelModules = [ "kvm-intel" ]; - extraModulePackages = [ ]; - supportedFilesystems = [ - "btrfs" - "xfs" - #"ntfs" - ]; - initrd = { - systemd.enable = true; - kernelModules = [ ]; - availableKernelModules = [ - "xhci_pci" - "ehci_pci" - "ahci" - "usbhid" - "usb_storage" - "sd_mod" - ]; - - secrets = { - #"crypto_keyfile.bin" = null; - }; - #luks = { - #devices."luks-DISK_UUID" = { - #device = "/dev/disk/by-uuid/DISK_UUID"; - #keyfile = "/crypto_keyfile.bin"; - #}; - #}; - }; - - loader = { - systemd-boot = { - enable = true; - configurationLimit = 5; - }; - efi = { - canTouchEfiVariables = true; - #efiSysMountPoint = "/boot/efi"; - }; - }; - - }; - - ## Hardware-related services - services = { - ## TRIM to keep SSDs healthy-ish - fstrim.enable = true; - - }; - - powerManagement = { - enable = true; - powertop.enable = true; - #cpuFreqGovernor = Lib.mkDefault "performance"; - #cpufreq = { - #min = 1500000; - #max = 4400000; - #}; - }; - - hardware = { - ## Pick either "true" OR "lib.mkDefault -" - cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; - #cpu.intel.updateMicrocode = true; - enableAllFirmware = true; - graphics = { - enable = true; - ## Packages for integrated graphics inside Persephone - extraPackages = with pkgs; [ - intel-compute-runtime - intel-media-driver - vaapiIntel - vaapiVdpau - libvdpau-va-gl - ]; - }; - }; - - ## Trying out an alternate memory allocator - #environment.memoryAllocator.provider = "graphene-hardened-light"; - - ## 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 - ## still possible to use this option, but it's recommended to use it in conjunction - ## with explicit per-interface declarations with `networking.interfaces..useDHCP`. - networking.useDHCP = lib.mkDefault true; - #networking.interfaces.enp0s31f6.useDHCP = lib.mkDefault true; - #networking.interfaces.wlp58s0.useDHCP = lib.mkDefault true; - - nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; -}