Compare commits

..

No commits in common. "84fa84350a298398021c1a80daf7e445134cb99d" and "7de1a1bad725bd9c0ecad970f2184b2e8c62c005" have entirely different histories.

2 changed files with 10 additions and 18 deletions

View file

@ -78,10 +78,7 @@ in {
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
hardware = { hardware = {
cpu.amd = { cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
ryzen-smu.enable = true;
};
sensor.iio.bmi260.enable = true; sensor.iio.bmi260.enable = true;
}; };
} }

View file

@ -1,8 +1,10 @@
{ {
lib, config,
pkgs, pkgs,
... ...
}: let }: let
currentTheme = config.services.displayManager.sddm.theme;
sddm-sugar-candy = pkgs.stdenv.mkDerivation { sddm-sugar-candy = pkgs.stdenv.mkDerivation {
pname = "sddm-sugar-candy"; pname = "sddm-sugar-candy";
version = "master"; version = "master";
@ -28,18 +30,13 @@
customcfg = pkgs.stdenv.mkDerivation { customcfg = pkgs.stdenv.mkDerivation {
name = "sddm-theme-customizer"; name = "sddm-theme-customizer";
dontUnpack = true; dontUnpack = true;
installPhase = let # TODO: generate theme.conf.user outside of installPhase
config = lib.generators.toINI {} { installPhase = ''
# Add the custom config here
General = {
background = "${pkgs.kdePackages.breeze}/share/wallpapers/Next/contents/images_dark/5120x2880.png";
};
};
in ''
runHook preInstall runHook preInstall
mkdir -p $out/share/sddm/themes/breeze/ mkdir -p $out/share/sddm/themes/${currentTheme}/
echo "${config}" >> $out/share/sddm/themes/breeze/theme.conf.user echo "[General]
background = ${pkgs.plasma-workspace-wallpapers}/share/wallpapers/MilkyWay/contents/images/5120x2880.png" >> $out/share/sddm/themes/${currentTheme}/theme.conf.user
runHook postInstall runHook postInstall
''; '';
@ -52,11 +49,9 @@ in {
# theme = "sugar-candy"; # theme = "sugar-candy";
settings = { settings = {
General = {Numlock = "off";}; General = {Numlock = "off";};
Theme = {CursorTheme = "Breeze_Light";}; Theme = {CursorTheme = "Breeze_Snow";};
}; };
}; };
# Sugar candy doesn't seem to work on qt6 :( # Sugar candy doesn't seem to work on qt6 :(
# environment.systemPackages = [sddm-sugar-candy customcfg]; # environment.systemPackages = [sddm-sugar-candy customcfg];
environment.systemPackages = [customcfg];
} }