diff --git a/machines/WinMax2/hardware-configuration.nix b/machines/WinMax2/hardware-configuration.nix index ac8d1cd..4778fbe 100755 --- a/machines/WinMax2/hardware-configuration.nix +++ b/machines/WinMax2/hardware-configuration.nix @@ -78,10 +78,7 @@ in { nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; hardware = { - cpu.amd = { - updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; - ryzen-smu.enable = true; - }; + cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; sensor.iio.bmi260.enable = true; }; } diff --git a/roles/kde/sddm.nix b/roles/kde/sddm.nix index 1c296b9..4a52489 100644 --- a/roles/kde/sddm.nix +++ b/roles/kde/sddm.nix @@ -1,8 +1,10 @@ { - lib, + config, pkgs, ... }: let + currentTheme = config.services.displayManager.sddm.theme; + sddm-sugar-candy = pkgs.stdenv.mkDerivation { pname = "sddm-sugar-candy"; version = "master"; @@ -28,18 +30,13 @@ customcfg = pkgs.stdenv.mkDerivation { name = "sddm-theme-customizer"; dontUnpack = true; - 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 '' + # TODO: generate theme.conf.user outside of installPhase + installPhase = '' runHook preInstall - mkdir -p $out/share/sddm/themes/breeze/ - echo "${config}" >> $out/share/sddm/themes/breeze/theme.conf.user + 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 runHook postInstall ''; @@ -52,11 +49,9 @@ in { # theme = "sugar-candy"; settings = { General = {Numlock = "off";}; - Theme = {CursorTheme = "Breeze_Light";}; + Theme = {CursorTheme = "Breeze_Snow";}; }; }; - # Sugar candy doesn't seem to work on qt6 :( # environment.systemPackages = [sddm-sugar-candy customcfg]; - environment.systemPackages = [customcfg]; }