diff --git a/configuration.nix b/configuration.nix index 837bd1a..5f3509e 100644 --- a/configuration.nix +++ b/configuration.nix @@ -53,39 +53,14 @@ LC_TIME = "de_DE.UTF-8"; }; - # Enable the X11 windowing system. - services.xserver.enable = true; services.rpcbind.enable = true; # needed for NFS - # Enable the KDE Plasma Desktop Environment. - services.xserver.displayManager.sddm.enable = true; - services.xserver.desktopManager.plasma5.enable = true; - # set wayland as default session - services.xserver.displayManager.defaultSession = "plasmawayland"; - programs.partition-manager.enable = true; programs.fish.enable = true; # use bash shell for other users environment.shells = with pkgs; [ bash ]; - programs.dconf.enable = true; - programs.xwayland.enable = true; - - # exclude packages from plasma5 - environment.plasma5.excludePackages = with pkgs.libsForQt5; [ - elisa - oxygen - khelpcenter - kcolorpicker - ]; - - # Configure keymap in X11 - services.xserver = { - layout = "de"; - xkbVariant = ""; - }; - # Configure console keymap console.keyMap = "de"; diff --git a/core/default.nix b/core/default.nix index e214dde..98528bd 100644 --- a/core/default.nix +++ b/core/default.nix @@ -7,5 +7,6 @@ in ++ lib.optionals settings.printing.enable [ ./printing.nix ] ++ lib.optionals settings.xdg.enable [ ./xdg.nix ] ++ lib.optionals settings.java [ ./java.nix ] - ++ lib.optionals settings.dotnet [ ./dotnet.nix ]; + ++ lib.optionals settings.dotnet [ ./dotnet.nix ] + ++ lib.optionals settings.plasma5.enable [ ./plasma5.nix ]; } diff --git a/core/plasma5.nix b/core/plasma5.nix new file mode 100644 index 0000000..22cd913 --- /dev/null +++ b/core/plasma5.nix @@ -0,0 +1,26 @@ +{ pkgs, lib, config, ... }: +let + settings = import ./../settings.nix; +in +{ + # Enable the X11 windowing system. + services.xserver.enable = true; + + # Configure keymap in X11 + services.xserver = { + layout = "de"; + xkbVariant = ""; + }; + + # Enable the KDE Plasma Desktop Environment. + services.xserver.displayManager.sddm.enable = true; + services.xserver.desktopManager.plasma5.enable = true; + # set wayland as default session + services.xserver.displayManager.defaultSession = "plasmawayland"; + + # exclude packages from plasma5 + environment.plasma5.excludePackages = settings.plasma5.excludePackages; + + programs.dconf.enable = settings.plasma5.dconf; + programs.xwayland.enable = settings.plasma5.xwayland; +} diff --git a/settings.nix b/settings.nix index f79dc1d..a78ad87 100644 --- a/settings.nix +++ b/settings.nix @@ -18,6 +18,18 @@ with import {}; { }; }; + plasma5 = { + enable = true; + dconf = true; + xwayland = true; + excludePackages = with pkgs.libsForQt5; [ + elisa + oxygen + khelpcenter + kcolorpicker + ]; + }; + virtualisation = { docker-rootless = { enable = true;