From bec73e73adcf4f65b04bc1fef9334a7fa2dc7c96 Mon Sep 17 00:00:00 2001 From: Toast Date: Tue, 4 Jun 2024 09:35:54 +0200 Subject: [PATCH 1/3] Machines/WinMax2: enable ryzen smu --- machines/WinMax2/hardware-configuration.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/machines/WinMax2/hardware-configuration.nix b/machines/WinMax2/hardware-configuration.nix index 4778fbe..ac8d1cd 100755 --- a/machines/WinMax2/hardware-configuration.nix +++ b/machines/WinMax2/hardware-configuration.nix @@ -78,7 +78,10 @@ in { nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; hardware = { - cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; + cpu.amd = { + updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; + ryzen-smu.enable = true; + }; sensor.iio.bmi260.enable = true; }; } From f4712fdf707f2d68e5210a6ba96a040631804fdd Mon Sep 17 00:00:00 2001 From: Toast Date: Wed, 5 Jun 2024 22:53:31 +0200 Subject: [PATCH 2/3] Kde/sddm: change cursor name The cursor name changed in Plasma 6 and I forgot to change it --- roles/kde/sddm.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/roles/kde/sddm.nix b/roles/kde/sddm.nix index 4a52489..b435e72 100644 --- a/roles/kde/sddm.nix +++ b/roles/kde/sddm.nix @@ -49,9 +49,10 @@ in { # theme = "sugar-candy"; settings = { General = {Numlock = "off";}; - Theme = {CursorTheme = "Breeze_Snow";}; + Theme = {CursorTheme = "Breeze_Light";}; }; }; + # Sugar candy doesn't seem to work on qt6 :( # environment.systemPackages = [sddm-sugar-candy customcfg]; } From 84fa84350a298398021c1a80daf7e445134cb99d Mon Sep 17 00:00:00 2001 From: Toast Date: Wed, 5 Jun 2024 22:55:38 +0200 Subject: [PATCH 3/3] Kde/sddm: change background --- roles/kde/sddm.nix | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/roles/kde/sddm.nix b/roles/kde/sddm.nix index b435e72..1c296b9 100644 --- a/roles/kde/sddm.nix +++ b/roles/kde/sddm.nix @@ -1,10 +1,8 @@ { - config, + lib, pkgs, ... }: let - currentTheme = config.services.displayManager.sddm.theme; - sddm-sugar-candy = pkgs.stdenv.mkDerivation { pname = "sddm-sugar-candy"; version = "master"; @@ -30,13 +28,18 @@ customcfg = pkgs.stdenv.mkDerivation { name = "sddm-theme-customizer"; dontUnpack = true; - # TODO: generate theme.conf.user outside of installPhase - installPhase = '' + installPhase = let + config = lib.generators.toINI {} { + # Add the custom config here + General = { + background = "${pkgs.kdePackages.breeze}/share/wallpapers/Next/contents/images_dark/5120x2880.png"; + }; + }; + in '' runHook preInstall - mkdir -p $out/share/sddm/themes/${currentTheme}/ - echo "[General] - background = ${pkgs.plasma-workspace-wallpapers}/share/wallpapers/MilkyWay/contents/images/5120x2880.png" >> $out/share/sddm/themes/${currentTheme}/theme.conf.user + mkdir -p $out/share/sddm/themes/breeze/ + echo "${config}" >> $out/share/sddm/themes/breeze/theme.conf.user runHook postInstall ''; @@ -55,4 +58,5 @@ in { # Sugar candy doesn't seem to work on qt6 :( # environment.systemPackages = [sddm-sugar-candy customcfg]; + environment.systemPackages = [customcfg]; }