diff --git a/hosts/fwbook.nix b/hosts/fwbook.nix index 27703de..37c2054 100644 --- a/hosts/fwbook.nix +++ b/hosts/fwbook.nix @@ -25,7 +25,7 @@ in desktop = { enable = true; cosmic.enable = true; - # kde.enable = true; + kde.enable = true; crypto.enable = true; }; }; @@ -37,9 +37,10 @@ in ]; }; }; - # services.displayManager.sddm.enable = true; - # services.displayManager.sddm.wayland.enable = true; - # services.displayManager.sddm.wayland.compositor = "kwin"; + services.displayManager.cosmic-greeter.enable = false; + services.displayManager.sddm.enable = true; + services.displayManager.sddm.wayland.enable = true; + services.displayManager.sddm.wayland.compositor = "kwin"; # services.xserver.displayManager.gdm.enable = false; # services.xserver.displayManager.gdm.autoSuspend = false; diff --git a/modules/nixos/desktop/cosmic.nix b/modules/nixos/desktop/cosmic.nix index 0be0496..8f7691d 100644 --- a/modules/nixos/desktop/cosmic.nix +++ b/modules/nixos/desktop/cosmic.nix @@ -14,6 +14,5 @@ in pkgs.cosmic-icons ]; services.desktopManager.cosmic.enable = true; - services.displayManager.cosmic-greeter.enable = true; }; } diff --git a/modules/nixos/desktop/kde.nix b/modules/nixos/desktop/kde.nix index fd5c54f..4fc3c26 100644 --- a/modules/nixos/desktop/kde.nix +++ b/modules/nixos/desktop/kde.nix @@ -11,22 +11,22 @@ in }; config = lib.mkIf cfg.enable { services.desktopManager.plasma6.enable = true; - services.desktopManager.plasma6.enableQt5Integration = true; + security.rtkit.enable = true; environment.plasma6.excludePackages = with pkgs.kdePackages; [ konsole # terminal elisa # media player kate # text editor gwenview # image viewer ]; - xdg.portal.extraPortals = [ pkgs.xdg-desktop-portal-kde ]; + xdg.portal.extraPortals = [ + pkgs.xdg-desktop-portal-kde + pkgs.kdePackages.kwallet + ]; environment.systemPackages = with pkgs; [ kdePackages.plasma-browser-integration kdePackages.xdg-desktop-portal-kde konsave # save configs - # kdePackages.kwayland - # kdePackages.kwayland-integration - libsForQt5.kwayland - libsForQt5.kwayland-integration + kdePackages.kwayland ]; services.desktopManager.plasma6.notoPackage = pkgs.fira-code; }; diff --git a/modules/nixos/desktop/wayland.nix b/modules/nixos/desktop/wayland.nix index cbc0de2..920a5aa 100644 --- a/modules/nixos/desktop/wayland.nix +++ b/modules/nixos/desktop/wayland.nix @@ -7,11 +7,11 @@ in { environment.sessionVariables.NIXOS_OZONE_WL = "1"; environment.systemPackages = with pkgs; [ - wayland - wayland-protocols + # wayland + # wayland-protocols wayland-utils - xdg-desktop-portal-wlr - xdg-desktop-portal-gtk + # xdg-desktop-portal-wlr + # xdg-desktop-portal-gtk ]; programs.xwayland.enable = true; xdg.portal = { @@ -21,7 +21,6 @@ in xdg-desktop-portal-gtk xdg-desktop-portal-wlr xdg-desktop-portal - kdePackages.kwallet ]; }; };