diff --git a/hosts/perso-desktop/configuration.nix b/hosts/perso-desktop/configuration.nix index 58de90e..5c81e30 100644 --- a/hosts/perso-desktop/configuration.nix +++ b/hosts/perso-desktop/configuration.nix @@ -1,18 +1,19 @@ # Edit this configuration file to define what should be installed on # your system. Help is available in the configuration.nix(5) man page # and in the NixOS manual (accessible by running ‘nixos-help’). - -{ config, pkgs, lib, ... }: - { - imports = - [ - ../../modules/system + config, + pkgs, + lib, + ... +}: { + imports = [ + ../../modules/system - # Include the results of the hardware scan. - ./hardware-configuration.nix - ./disko-config.nix - ]; + # Include the results of the hardware scan. + ./hardware-configuration.nix + ./disko-config.nix + ]; # Bootloader. boot.loader.systemd-boot.enable = lib.mkForce false; @@ -41,6 +42,7 @@ desktop = { plasma = { enable = true; + enableWallpaperEngine = true; }; }; @@ -58,10 +60,8 @@ # Revert to RADV when this https://gitlab.freedesktop.org/mesa/mesa/-/issues/12865 is resolved chaotic.mesa-git = { enable = true; - # NOTE: Fixed when https://github.com/NixOS/nixpkgs/pull/418461 is available - # rocmPackages.clr.icd - extraPackages = with pkgs; [ amdvlk ]; - extraPackages32 = with pkgs; [ driversi686Linux.amdvlk ]; + extraPackages = with pkgs; [amdvlk rocmPackages.clr.icd]; + extraPackages32 = with pkgs; [driversi686Linux.amdvlk]; }; networking.interfaces.enp17s0.wakeOnLan.enable = true; @@ -88,5 +88,5 @@ }) ]; - warnings = [ "linux-firmware pinned to 20250625. Remove it when https://github.com/NixOS/nixpkgs/issues/419838 is fixed." ]; + warnings = ["linux-firmware pinned to 20250625. Remove it when https://github.com/NixOS/nixpkgs/issues/419838 is fixed."]; } diff --git a/modules/system/desktop/plasma.nix b/modules/system/desktop/plasma.nix index 315d001..716f8d4 100644 --- a/modules/system/desktop/plasma.nix +++ b/modules/system/desktop/plasma.nix @@ -1,10 +1,12 @@ -{ config, pkgs, lib, ... }: - -with lib; -let - cfg = config.modules.system.desktop.plasma; -in { + config, + pkgs, + lib, + ... +}: +with lib; let + cfg = config.modules.system.desktop.plasma; +in { options.modules.system.desktop.plasma = { enable = mkEnableOption '' Enable plasma with my custom configurations @@ -30,11 +32,15 @@ in programs.kdeconnect.enable = true; - environment.systemPackages = with pkgs; with kdePackages; [ - krfb # Use by kdeconnect for virtualmonitorplugin "krfb-virtualmonitor" - discover - kgpg - yakuake - ] ++ lib.optionals cfg.enableWallpaperEngine [ wallpaper-engine-plugin ]; + environment.systemPackages = with pkgs; + with kdePackages; + [ + krfb # Use by kdeconnect for virtualmonitorplugin "krfb-virtualmonitor" + discover + kgpg + yakuake + merkuro + ] + ++ lib.optionals cfg.enableWallpaperEngine [wallpaper-engine-plugin]; }; }