From cd149d1f81314cceb0d654622223464baba1aad5 Mon Sep 17 00:00:00 2001 From: Payas Relekar Date: Wed, 13 Mar 2024 22:54:07 +0530 Subject: [PATCH] switch to plasma6 --- hosts/phoebe/configuration.nix | 6 +----- modules/plasma-desktop.nix | 15 ++++----------- 2 files changed, 5 insertions(+), 16 deletions(-) diff --git a/hosts/phoebe/configuration.nix b/hosts/phoebe/configuration.nix index 1c09339..950912d 100644 --- a/hosts/phoebe/configuration.nix +++ b/hosts/phoebe/configuration.nix @@ -22,10 +22,7 @@ services.xserver.enable = true; services.xserver = { displayManager.sddm.enable = true; - desktopManager.plasma5 = { - enable = true; - runUsingSystemd = true; - }; + desktopManager.plasma6.enable = true; monitorSection = '' Option "Rotate" "right" ''; @@ -46,7 +43,6 @@ }; }; - # Enable the OpenSSH daemon. services.openssh.enable = true; diff --git a/modules/plasma-desktop.nix b/modules/plasma-desktop.nix index f3b1eb2..d0bd001 100644 --- a/modules/plasma-desktop.nix +++ b/modules/plasma-desktop.nix @@ -12,12 +12,9 @@ enableHidpi = true; autoNumlock = true; }; - defaultSession = "plasmawayland"; - }; - desktopManager.plasma5 = { - enable = true; - runUsingSystemd = true; + defaultSession = "plasma"; }; + desktopManager.plasma6.enable = true; # Enable touchpad support. libinput.enable = true; }; @@ -50,15 +47,11 @@ ''; environment = { - plasma5.excludePackages = with pkgs; [ - plasma5Packages.oxygen - libsForQt5.elisa + plasma6.excludePackages = with pkgs; [ + kdePackages.elisa ]; systemPackages = with pkgs; [ - # dev - yakuake - # Wayland wl-clipboard ];