From 35dd665979eb42d9d13cb7074156ebe998cfd9dc Mon Sep 17 00:00:00 2001 From: Aly Raffauf Date: Sun, 7 Jul 2024 19:41:21 -0400 Subject: [PATCH] nixosModules: drop plasma --- nixosModules/desktop/default.nix | 2 -- nixosModules/desktop/plasma/default.nix | 46 ------------------------- nixosModules/desktop/waylandComp.nix | 5 ++- nixosModules/options.nix | 1 - 4 files changed, 2 insertions(+), 52 deletions(-) delete mode 100644 nixosModules/desktop/plasma/default.nix diff --git a/nixosModules/desktop/default.nix b/nixosModules/desktop/default.nix index 6c6e4d69..7b80daa1 100644 --- a/nixosModules/desktop/default.nix +++ b/nixosModules/desktop/default.nix @@ -10,7 +10,6 @@ ./greetd ./hyprland ./lightdm - ./plasma ./sway ./waylandComp.nix ]; @@ -20,7 +19,6 @@ config.ar.desktop.cinnamon.enable || config.ar.desktop.gnome.enable || config.ar.desktop.hyprland.enable - || config.ar.desktop.plasma.enable || config.ar.desktop.steam.enable || config.ar.desktop.sway.enable ) { diff --git a/nixosModules/desktop/plasma/default.nix b/nixosModules/desktop/plasma/default.nix deleted file mode 100644 index 8d7983d0..00000000 --- a/nixosModules/desktop/plasma/default.nix +++ /dev/null @@ -1,46 +0,0 @@ -{ - pkgs, - lib, - config, - ... -}: let - plasmaCsAdjuster = pkgs.writeShellScriptBin "plasma-cs-adjuster" '' - # Query the Desktop Portal Service for the current color scheme - color_scheme=$(${lib.getExe' pkgs.kdePackages.qttools "qdbus"} org.freedesktop.portal.Desktop /org/freedesktop/portal/desktop org.freedesktop.portal.Settings.Read org.freedesktop.appearance color-scheme) - - # Check the color scheme and apply the appropriate look and feel - if [ "$color_scheme" = "1" ]; then - ${lib.getExe' pkgs.kdePackages.plasma-workspace "plasma-apply-lookandfeel"} -a org.kde.breeze.desktop - else - ${lib.getExe' pkgs.kdePackages.plasma-workspace "plasma-apply-lookandfeel"} -a org.kde.breezedark.desktop - fi - ''; -in { - config = lib.mkIf config.ar.desktop.plasma.enable { - environment.systemPackages = with pkgs; - [ - kdePackages.kate - kdePackages.kimageformats - kdePackages.kio-gdrive - kdePackages.sddm-kcm - maliit-keyboard - ] - ++ [plasmaCsAdjuster]; - - programs.kdeconnect.enable = true; - - security.pam.services.sddm = { - enableGnomeKeyring = true; - gnupg.enable = true; - kwallet.enable = true; - }; - - services = { - desktopManager.plasma6.enable = true; - displayManager.sddm = { - enable = true; - wayland.enable = true; - }; - }; - }; -} diff --git a/nixosModules/desktop/waylandComp.nix b/nixosModules/desktop/waylandComp.nix index e1ec1b5f..5845d32b 100644 --- a/nixosModules/desktop/waylandComp.nix +++ b/nixosModules/desktop/waylandComp.nix @@ -27,9 +27,8 @@ # Authentication management. auth sufficient pam_unix.so likeauth try_first_pass likeauth nullok # unix (order 11500) ${ - if config.services.fprintd.enable - then "auth sufficient ${pkgs.fprintd}/lib/security/pam_fprintd.so # fprintd (order 11300)" - else "" + lib.strings.optionalString config.services.fprintd.enable + "auth sufficient ${pkgs.fprintd}/lib/security/pam_fprintd.so # fprintd (order 11300)" } auth required pam_deny.so # deny (order 12300) diff --git a/nixosModules/options.nix b/nixosModules/options.nix index 35aff3a3..e0353646 100644 --- a/nixosModules/options.nix +++ b/nixosModules/options.nix @@ -43,7 +43,6 @@ hyprland.enable = lib.mkEnableOption "Hyprland wayland session."; lightdm.enable = lib.mkEnableOption "Lightdm display manager."; - plasma.enable = lib.mkEnableOption "Plasma desktop session."; steam.enable = lib.mkEnableOption "Steam + Gamescope session."; sway.enable = lib.mkEnableOption "Sway wayland session."; };