diff --git a/modules/plasma.nix b/modules/plasma.nix index dd899c8..21275e7 100644 --- a/modules/plasma.nix +++ b/modules/plasma.nix @@ -4,8 +4,7 @@ services.xserver.enable = true; services.xserver.displayManager.sddm.enable = true; services.xserver.desktopManager.plasma5.enable = true; - - services.xserver.desktopManager.plasma5.excludePackages = with pkgs.libsForQt5; [ + environment.plasma5.excludePackages = with pkgs.libsForQt5; [ khelpcenter ]; @@ -16,6 +15,7 @@ environment.systemPackages = with pkgs; [ spectacle ]; + # GNUPG Stuff services.pcscd.enable = true; programs.gnupg.agent = { diff --git a/systems/aurora.nix b/systems/aurora.nix index 8a94cfe..192b6a8 100644 --- a/systems/aurora.nix +++ b/systems/aurora.nix @@ -10,7 +10,6 @@ nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; - hardware.video.hidpi.enable = lib.mkDefault true; fileSystems."/mnt/data" = { device = "/dev/disk/by-label/data"; @@ -19,6 +18,9 @@ services.xserver.videoDrivers = [ "amdgpu" ]; + #scaling + services.xserver.dpi = + hardware.opengl.extraPackages = with pkgs; [ rocm-opencl-icd rocm-opencl-runtime diff --git a/systems/framework.nix b/systems/framework.nix index b117a05..11914ff 100644 --- a/systems/framework.nix +++ b/systems/framework.nix @@ -66,6 +66,10 @@ ACTION=="add", SUBSYSTEM=="usb", ATTR{idVendor}=="0bda", ATTR{idProduct}=="8156", ATTR{power/autosuspend}="20" ''; + #scaling + services.xserver.dpi = 227; + fonts.optimizeForVeryHighDPI = enable; + # Mis-detected by nixos-generate-config # https://github.com/NixOS/nixpkgs/issues/171093 # https://wiki.archlinux.org/title/Framework_Laptop#Changing_the_brightness_of_the_monitor_does_not_work