From d8c8a548ac70003eaa45207ceb127a95f712a7b6 Mon Sep 17 00:00:00 2001
From: Ivan Bushchik <ivabus@ivabus.dev>
Date: Sun, 3 Mar 2024 13:21:55 +0300
Subject: [PATCH] roles/graphical: switch basic to Plasma 6, add basic GUI pkgs
 to both

Signed-off-by: Ivan Bushchik <ivabus@ivabus.dev>
---
 roles/graphical.nix | 25 ++++++++++++++-----------
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/roles/graphical.nix b/roles/graphical.nix
index 13f0442..a2c2dab 100644
--- a/roles/graphical.nix
+++ b/roles/graphical.nix
@@ -4,7 +4,7 @@ let cfg = config.my.roles.graphical;
 in {
   options.my.roles.graphical.enable = lib.mkEnableOption "Enable GUI (sway)";
   options.my.roles.graphical.basic.enable =
-    lib.mkEnableOption "Enable GUI (MATE)";
+    lib.mkEnableOption "Enable GUI (Plasma 6)";
   config = lib.mkMerge [
     (lib.mkIf (cfg.enable) {
       environment.systemPackages = with pkgs; [
@@ -70,6 +70,8 @@ in {
 
         XDG_CURRENT_DESKTOP = "sway";
       };
+    })
+    (lib.mkIf (cfg.enable && config.my.users.ivabus.enable) {
       home-manager.users.ivabus = {
         gtk = {
           enable = true;
@@ -104,13 +106,15 @@ in {
       };
     })
     (lib.mkIf (cfg.basic.enable) {
-      environment.systemPackages = with pkgs; [ ubuntu-themes ];
-      services.xserver.desktopManager.mate.enable = true;
+      services.xserver.desktopManager.plasma6.enable = true;
       networking.networkmanager.enable = lib.mkForce true;
       networking.networkmanager.wifi.backend = "iwd";
       programs.nm-applet.enable = true;
       services.xserver = {
-        displayManager.sddm.enable = true;
+        displayManager.sddm = {
+          enable = true;
+          wayland.enable = true;
+        };
         enable = true;
         layout = "us,ru";
         xkbOptions = "grp:alt_shift_toggle";
@@ -125,17 +129,17 @@ in {
         pulse.enable = true;
         alsa.support32Bit = true;
       };
-      qt = {
+      /*qt = {
         enable = true;
         platformTheme = "gtk2";
         style = "gtk2";
-      };
+      };*/
 
       services.dbus.enable = true;
-      environment.systemPackages = [
-        # With this
-        (pkgs.wrapFirefox
-          (pkgs.firefox-unwrapped.override { pipewireSupport = true; }) { })
+      environment.systemPackages = with pkgs; [
+        (wrapFirefox
+          (firefox-unwrapped.override { pipewireSupport = true; }) { })
+        libreoffice
       ];
       environment.sessionVariables = { MOZ_USE_XINPUT2 = "1"; };
 
@@ -147,7 +151,6 @@ in {
         noto-fonts-emoji
         jetbrains-mono
         font-awesome
-        #google-fonts
         liberation_ttf
         open-sans
         roboto