florian.richer/nixos
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add merkuro and wallpaper engine / rocm on perso-desktop
All checks were successful
check / check (push) Successful in 36s
Details

Browse source
This commit is contained in:
Florian RICHER 2025-06-26 21:06:39 +02:00
parent d9e46a5e24
commit 5d0800d0b3
Signed by: florian.richer
GPG key ID: C73D37CBED7BFC77
2 changed files with 33 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

30
hosts/perso-desktop/configuration.nix
View file

@ -1,18 +1,19 @@
# Edit this configuration file to define what should be installed on # Edit this configuration file to define what should be installed on
# your system. Help is available in the configuration.nix(5) man page # your system. Help is available in the configuration.nix(5) man page
# and in the NixOS manual (accessible by running ‘nixos-help’). # and in the NixOS manual (accessible by running ‘nixos-help’).
{ config, pkgs, lib, ... }:
{ {
imports = config,
[ pkgs,
../../modules/system lib,
...
}: {
imports = [
../../modules/system
# Include the results of the hardware scan. # Include the results of the hardware scan.
./hardware-configuration.nix ./hardware-configuration.nix
./disko-config.nix ./disko-config.nix
]; ];
# Bootloader. # Bootloader.
boot.loader.systemd-boot.enable = lib.mkForce false; boot.loader.systemd-boot.enable = lib.mkForce false;
@ -41,6 +42,7 @@
desktop = { desktop = {
plasma = { plasma = {
enable = true; enable = true;
enableWallpaperEngine = true;
}; };
}; };
@ -58,10 +60,8 @@
# Revert to RADV when this https://gitlab.freedesktop.org/mesa/mesa/-/issues/12865 is resolved # Revert to RADV when this https://gitlab.freedesktop.org/mesa/mesa/-/issues/12865 is resolved
chaotic.mesa-git = { chaotic.mesa-git = {
enable = true; enable = true;
# NOTE: Fixed when https://github.com/NixOS/nixpkgs/pull/418461 is available extraPackages = with pkgs; [amdvlk rocmPackages.clr.icd];
# rocmPackages.clr.icd extraPackages32 = with pkgs; [driversi686Linux.amdvlk];
extraPackages = with pkgs; [ amdvlk ];
extraPackages32 = with pkgs; [ driversi686Linux.amdvlk ];
}; };
networking.interfaces.enp17s0.wakeOnLan.enable = true; 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."];
} }

30
modules/system/desktop/plasma.nix
View file

@ -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 = { options.modules.system.desktop.plasma = {
enable = mkEnableOption '' enable = mkEnableOption ''
Enable plasma with my custom configurations Enable plasma with my custom configurations
@ -30,11 +32,15 @@ in
programs.kdeconnect.enable = true; programs.kdeconnect.enable = true;
environment.systemPackages = with pkgs; with kdePackages; [ environment.systemPackages = with pkgs;
krfb # Use by kdeconnect for virtualmonitorplugin "krfb-virtualmonitor" with kdePackages;
discover [
kgpg krfb # Use by kdeconnect for virtualmonitorplugin "krfb-virtualmonitor"
yakuake discover
] ++ lib.optionals cfg.enableWallpaperEngine [ wallpaper-engine-plugin ]; kgpg
yakuake
merkuro
]
++ lib.optionals cfg.enableWallpaperEngine [wallpaper-engine-plugin];
}; };
} }