diff --git a/system/adrift.nix b/system/adrift.nix index 03c9457..01407a1 100644 --- a/system/adrift.nix +++ b/system/adrift.nix @@ -26,16 +26,16 @@ "rd.udev.log_level=3" "vt.global_cursor_default=0" ]; - boot.initrd.availableKernelModules = [ "xhci_pci" "nvme" "usb_storage" "sd_mod" "rtsx_pci_sdmmc" ]; - boot.initrd.kernelModules = [ "dm-snapshot" ]; - boot.kernelModules = [ "iwlwifi" "kvm-intel" ]; - boot.extraModulePackages = [ pkgs.linuxPackages.system76-scheduler ]; + boot.initrd.availableKernelModules = ["xhci_pci" "nvme" "usb_storage" "sd_mod" "rtsx_pci_sdmmc"]; + boot.initrd.kernelModules = ["dm-snapshot"]; + boot.kernelModules = ["iwlwifi" "kvm-intel"]; + boot.extraModulePackages = [pkgs.linuxPackages.system76-scheduler]; boot.kernelPackages = pkgs.linuxPackages; - fileSystems."/boot" = - { device = "/dev/disk/by-uuid/1C5C-8FF4"; - fsType = "vfat"; - }; + fileSystems."/boot" = { + device = "/dev/disk/by-uuid/1C5C-8FF4"; + fsType = "vfat"; + }; fileSystems."/" = { device = "/dev/mapper/nix-os"; @@ -47,15 +47,13 @@ fsType = "ext4"; }; - swapDevices = [ ]; - + swapDevices = []; boot.loader.systemd-boot.configurationLimit = 2; boot.loader.efi.canTouchEfiVariables = true; # boot.plymouth.enable = true; networking.useDHCP = lib.mkDefault true; - hardware.enableAllFirmware = true; hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; powerManagement.cpuFreqGovernor = lib.mkDefault "powersave"; services.power-profiles-daemon.enable = false; @@ -138,5 +136,4 @@ isNormalUser = true; extraGroups = ["wheel"]; # Enable ‘sudo’ for the user. }; - } diff --git a/system/configuration.nix b/system/configuration.nix index 43e2df5..35bde22 100644 --- a/system/configuration.nix +++ b/system/configuration.nix @@ -44,6 +44,7 @@ environment.pathsToLink = ["/share/zsh"]; hardware.enableRedistributableFirmware = true; + hardware.enableAllFirmware = true; boot.loader.systemd-boot.consoleMode = "max"; boot.loader.timeout = 3; @@ -171,8 +172,8 @@ serviceConfig = { Type = "oneshot"; User = "root"; - ExecStart = '' ${pkgs.bash}/bin/bash -c 'if [[ "$( ${pkgs.iproute2}/bin/ip rule | grep -e "62:.*52" | wc -l)" -eq 0 ]]; then ${pkgs.iproute2}/bin/ip rule add pref 62 table 52; fi''''; - # ExecStop = ''${pkgs.iproute2}/bin/ip rule del pref 62 table 52''; + ExecStart = '' ${pkgs.bash}/bin/bash -c 'if [[ "$( ${pkgs.iproute2}/bin/ip rule | grep -e "62:.*52" | wc -l)" -eq 0 ]]; then ${pkgs.iproute2}/bin/ip rule add pref 62 table 52; fi'''; + # ExecStop = ''${pkgs.iproute2}/bin/ip rule del pref 62 table 52''; }; }; diff --git a/system/quiver.nix b/system/quiver.nix index e6c6894..ea27594 100644 --- a/system/quiver.nix +++ b/system/quiver.nix @@ -21,7 +21,7 @@ boot.initrd.availableKernelModules = ["xhci_pci" "ahci" "usbcore" "sd_mod"]; boot.initrd.kernelModules = []; boot.kernelModules = ["kvm-amd" "i2c-dev"]; - boot.extraModulePackages = [ pkgs.linuxPackages_xanmod_latest.system76_scheduler ]; + boot.extraModulePackages = [pkgs.linuxPackages_xanmod_latest.system76_scheduler]; boot.kernelParams = [ "nvidia_drm.modeset=1" "mitigations=off" @@ -179,7 +179,6 @@ options = ["rw" "uid=1000" "gid=100"]; }; - networking.nftables.enable = true; networking.firewall = { allowedUDPPorts = [1900];