mirror of
https://github.com/Superredstone/nixos.git
synced 2026-06-17 15:24:39 +02:00
refactor(de): move plasma config to separate file
This commit is contained in:
@@ -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
|
||||
;
|
||||
}
|
||||
@@ -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
|
||||
];
|
||||
}
|
||||
@@ -16,7 +16,6 @@
|
||||
++ (
|
||||
if (currentSystemDe != "none") then
|
||||
[
|
||||
./de.nix
|
||||
./fonts.nix
|
||||
./sound.nix
|
||||
]
|
||||
|
||||
@@ -1,7 +1,11 @@
|
||||
{ ... }:
|
||||
{ pkgs, ... }:
|
||||
{
|
||||
services = {
|
||||
pcscd.enable = true;
|
||||
xserver.enable = true;
|
||||
xserver.excludePackages = with pkgs; [
|
||||
xterm
|
||||
];
|
||||
openssh = {
|
||||
enable = true;
|
||||
hostKeys = [
|
||||
|
||||
@@ -9,7 +9,8 @@
|
||||
|
||||
]
|
||||
++ (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 = {
|
||||
gamescope = {
|
||||
|
||||
@@ -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
|
||||
];
|
||||
}
|
||||
Reference in New Issue
Block a user