Skip to content

Commit

Permalink
refactor: move kde plasma into module
Browse files Browse the repository at this point in the history
  • Loading branch information
icecreammatt committed Feb 11, 2024
1 parent 4137f54 commit 575523b
Show file tree
Hide file tree
Showing 2 changed files with 24 additions and 25 deletions.
26 changes: 1 addition & 25 deletions hosts/nixos/mini/configuration.nix
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
# Include the results of the hardware scan.
./hardware-configuration.nix
../../../modules/vpn/nebula.nix
../../../modules/DE/kde/plasma.nix
../../../modules/apps/vaultwarden.nix
../../../modules/apps/navidrone.nix
../../../modules/ci/hydra.nix
Expand Down Expand Up @@ -37,28 +38,6 @@
users.extraGroups.docker.members = ["matt"];
users.users.matt.extraGroups = ["docker"];

# Enable the X11 windowing system.
services.xserver.enable = true;
programs.xwayland.enable = true;

# Enable login manager
services.xserver.displayManager.sddm.enable = true;
services.xserver.displayManager.sddm.settings.Wayland.SessionDir = "${pkgs.plasma5Packages.plasma-workspace}/share/wayland-sessions";

# KDE Plasma
services.xserver.displayManager.defaultSession = "plasmawayland";
services.xserver.desktopManager.plasma5.enable = true;
environment.plasma5.excludePackages = with pkgs.libsForQt5; [
elisa
gwenview
okular
oxygen
khelpcenter
konsole
plasma-browser-integration
print-manager
];

sops.secrets."attic/ATTIC_SERVER_TOKEN_HS256_SECRET_BASE64" = {
sopsFile = ../../../.secrets/attic.ini;
format = "ini";
Expand Down Expand Up @@ -316,9 +295,6 @@
# useXkbConfig = true; # use xkbOptions in tty.
# };

# Enable the X11 windowing system.
# services.xserver.enable = true;

# Configure keymap in X11
# services.xserver.layout = "us";
# services.xserver.xkbOptions = {
Expand Down
23 changes: 23 additions & 0 deletions modules/DE/kde/plasma.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{pkgs, ...}: {
# Enable the X11 windowing system.
services.xserver.enable = true;
programs.xwayland.enable = true;

# Enable login manager
services.xserver.displayManager.sddm.enable = true;
services.xserver.displayManager.sddm.settings.Wayland.SessionDir = "${pkgs.plasma5Packages.plasma-workspace}/share/wayland-sessions";

# KDE Plasma
services.xserver.displayManager.defaultSession = "plasmawayland";
services.xserver.desktopManager.plasma5.enable = true;
environment.plasma5.excludePackages = with pkgs.libsForQt5; [
elisa
gwenview
okular
oxygen
khelpcenter
konsole
plasma-browser-integration
print-manager
];
}

0 comments on commit 575523b

Please sign in to comment.