refactor(de): move plasma config to separate file

This commit is contained in:
2026-04-26 14:58:48 +02:00
parent 85d7fbad13
commit 9b3f9ddb77
6 changed files with 22 additions and 66 deletions
-27
View File
@@ -1,27 +0,0 @@
{ currentSystemDe, ... }:
let
ifDesktop = de: content: {
_type = "if";
condition = currentSystemDe == de;
inherit content;
};
ifNotDesktop = de: content: {
_type = "if";
condition = currentSystemDe != de;
inherit content;
};
ifGnome = ifDesktop "gnome";
ifPlasma = ifDesktop "plasma";
ifNone = ifDesktop "none";
ifNotNone = ifNotDesktop "none";
in
{
inherit
ifDesktop
ifNotDesktop
ifGnome
ifPlasma
ifNone
ifNotNone
;
}
-36
View File
@@ -1,36 +0,0 @@
{
pkgs,
lib,
currentSystemDe,
...
}:
let
libDe = import ../../lib/libde.nix {
inherit currentSystemDe lib;
};
in
{
services = {
xserver.enable = true;
xserver.excludePackages = with pkgs; [
xterm
];
# Display managers
displayManager = {
sddm = libDe.ifPlasma {
enable = true;
wayland.enable = true;
};
};
# Desktop environments
desktopManager = {
plasma6.enable = libDe.ifPlasma true;
};
};
environment.plasma6.excludePackages = with pkgs.kdePackages; [
elisa
konsole
];
}
-1
View File
@@ -16,7 +16,6 @@
++ ( ++ (
if (currentSystemDe != "none") then if (currentSystemDe != "none") then
[ [
./de.nix
./fonts.nix ./fonts.nix
./sound.nix ./sound.nix
] ]
+5 -1
View File
@@ -1,7 +1,11 @@
{ ... }: { pkgs, ... }:
{ {
services = { services = {
pcscd.enable = true; pcscd.enable = true;
xserver.enable = true;
xserver.excludePackages = with pkgs; [
xterm
];
openssh = { openssh = {
enable = true; enable = true;
hostKeys = [ hostKeys = [
+2 -1
View File
@@ -9,7 +9,8 @@
] ]
++ (if currentSystemDe == "niri" then [ ./niri.nix ] else [ ]) ++ (if currentSystemDe == "niri" then [ ./niri.nix ] else [ ])
++ (if currentSystemDe == "gnome" then [ ./gnome.nix ] else [ ]); ++ (if currentSystemDe == "gnome" then [ ./gnome.nix ] else [ ])
++ (if currentSystemDe == "plasma" then [ ./plasma.nix ] else [ ]);
programs = { programs = {
gamescope = { gamescope = {
+15
View File
@@ -0,0 +1,15 @@
{ pkgs, ... }:
{
services = {
displayManager.sddm = {
enable = true;
wayland.enable = true;
};
desktopManager.plasma6.enable = true;
};
environment.plasma6.excludePackages = with pkgs.kdePackages; [
elisa
konsole
];
}