diff --git a/flake.nix b/flake.nix index f1e9519..2675f15 100644 --- a/flake.nix +++ b/flake.nix @@ -54,8 +54,8 @@ disko.nixosModules.disko nixos-hardware.nixosModules.common-cpu-amd nixos-hardware.nixosModules.common-cpu-amd-pstate + nixos-hardware.nixosModules.common-cpu-amd-zenpower nixos-hardware.nixosModules.common-gpu-nvidia-nonprime - # nixos-hardware.common.gpu.nvidia.ampere agenix.nixosModules.default home-manager.nixosModules.home-manager ./systems/BASED.nix diff --git a/systems/NOcomputer.nix b/systems/NOcomputer.nix index 49ba892..2c5bce5 100644 --- a/systems/NOcomputer.nix +++ b/systems/NOcomputer.nix @@ -4,11 +4,6 @@ lib, ... }: { - services.syncplay = { - enable = true; - motd = "we only watch kino here"; - }; - environment.systemPackages = with pkgs; [ # nvtopPackages.nvidia # egl-wayland @@ -21,10 +16,6 @@ openrgb-plugin-hardwaresync ]; - services.tailscale.useRoutingFeatures = "both"; - boot.kernel.sysctl."net.ipv4.ip_forward" = "1"; - boot.kernel.sysctl."net.ipv6.conf.all.forwarding" = "1"; - environment.sessionVariables = { # wayland chromium workaround NIXOS_OZONE_WL = "1"; @@ -36,11 +27,12 @@ hardware.nvidia = { powerManagement.enable = true; - # options: production, beta, vulkan_beta, latest - package = config.boot.kernelPackages.nvidiaPackages.latest; open = true; - nvidiaSettings = true; }; + services.tailscale.useRoutingFeatures = "both"; + boot.kernel.sysctl."net.ipv4.ip_forward" = "1"; + boot.kernel.sysctl."net.ipv6.conf.all.forwarding" = "1"; + systemd.services.nvpl = { description = "Increase GPU power limit to 400w"; script = "/run/current-system/sw/bin/nvidia-smi -pl=400"; @@ -48,8 +40,13 @@ }; services.lact.enable = true; - services.udev.packages = [pkgs.openrgb]; + services.syncplay = { + enable = true; + motd = "we only watch kino here"; + }; + services.udev.extraRules = '' + # pcpanel KERNEL=="hidraw*", ATTRS{idVendor}=="0483", ATTRS{idProduct}=="a3c5", MODE="0666" ''; services.hardware.openrgb = { @@ -62,8 +59,6 @@ boot.initrd.availableKernelModules = ["nvme" "xhci_pci" "ahci" "usb_storage" "usbhid" "sd_mod"]; boot.kernelModules = ["i2c-dev" "kvm-amd" "nct6775"]; boot.kernelParams = ["nvidia-drm.modeset=1"]; - # boot.extraModulePackages = with config.boot.kernelPackages; [ zenpower ]; - # boot.blacklistedKernelModules = with config.boot.kernelPackages; [ k10temp ]; # boot.initrd.kernelModules = ["nvidia"]; # boot.extraModulePackages = [config.boot.kernelPackages.nvidia_x11]; diff --git a/users/tao/nushell/extras/nix.nu b/users/tao/nushell/extras/nix.nu index 8c01ca9..0ffdcb4 100644 --- a/users/tao/nushell/extras/nix.nu +++ b/users/tao/nushell/extras/nix.nu @@ -65,6 +65,7 @@ def bump [...rest] { jj desc -r $r -m "bump (failed)" } jj new + nvd history } alias rb = rebuild boot