diff --git a/nixos/hyprland.nix b/nixos/hyprland.nix index 28a2bacc..7b438bef 100644 --- a/nixos/hyprland.nix +++ b/nixos/hyprland.nix @@ -30,13 +30,21 @@ makeEnable config "myModules.hyprland" true { systemdTarget = "graphical-session.target"; settings = [ { - profile.name = "ryzen-shine-primary"; + # USB-C connector names can move between DP-* ports across docks/reboots. + profile.name = "ultrawide-usbc-desk"; profile.outputs = [ { - criteria = "DP-1"; + criteria = "eDP-1"; + status = "enable"; + mode = "2560x1600@240Hz"; + position = "0,0"; + scale = 1.0; + } + { + criteria = "Microstep MPG341CX OLED Unknown"; status = "enable"; mode = "3440x1440@240Hz"; - position = "0,0"; + position = "2560,0"; scale = 1.0; } ]; diff --git a/nixos/machines/strixi-minaj.nix b/nixos/machines/strixi-minaj.nix index 6d3250e8..3e7efa09 100644 --- a/nixos/machines/strixi-minaj.nix +++ b/nixos/machines/strixi-minaj.nix @@ -65,12 +65,17 @@ boot.kernelModules = [ "kvm-intel" ]; boot.extraModulePackages = [ ]; hardware.nvidia.powerManagement.enable = true; + # This laptop has a hardware MUX, so prefer dGPU-only mode instead of + # PRIME sync hybrid mode to keep the compositor and displays on NVIDIA. hardware.nvidia.prime.offload.enable = lib.mkForce false; - hardware.nvidia.prime.sync.enable = lib.mkForce true; + hardware.nvidia.prime.sync.enable = lib.mkForce false; boot.loader.systemd-boot.enable = true; boot.loader.efi.canTouchEfiVariables = true; services.asusd.enable = true; + services.supergfxd.settings = { + mode = "AsusMuxDgpu"; + }; services.power-profiles-daemon.enable = false; services.tlp.enable = false;