update

Signed-off-by: Maximilian Huber <[email protected]>
maxhbr · Jul 18, 2024 · 2d1b637 · 2d1b637
1 parent 143b0d4
commit 2d1b637
Show file tree

Hide file tree

Showing 5 changed files with 46 additions and 38 deletions.
diff --git a/hosts/host.p14/default.nix b/hosts/host.p14/default.nix
@@ -90,6 +90,9 @@
         };
       })
     { environment.systemPackages = with pkgs; [ linuxPackages.usbip ]; }
+    {
+      programs.kdeconnect.enable = true;
+    }
   ];
 
   config = {
@@ -108,7 +111,7 @@
             "niri"
             "labwc"
             "river"
-            "kde"
+            "plasma6"
              # "qtile"
           ];
           niri.additionalConfigKdl = ''

diff --git a/hosts/host.r6c/default.nix b/hosts/host.r6c/default.nix
@@ -8,12 +8,6 @@
       myconfig.metadatalib.get.hosts.x1extremeG2.pubkeys."id_rsa.pub"
     ])
     { environment.systemPackages = with pkgs; [ linuxPackages.usbip ]; }
-
-    {
-      environment.systemPackages = with pkgs; [
-        plasma5Packages.plasma-bigscreen
-      ];
-    }
   ];
 
   config = {
@@ -31,7 +25,8 @@
           enable = true;
           directLoginFirstSession = true;
           selectedSessions = [
-            "kde"
+            "plasma5-bigsrceen"
+            "plasma5"
             # "river" 
             "niri-plain"
             "niri"

diff --git a/hosts/host.workstation/default.nix b/hosts/host.workstation/default.nix
@@ -75,11 +75,11 @@
         wayland = {
           enable = true;
           selectedSessions = [
-            "hyprland"
+            # "hyprland"
             "niri"
             "labwc"
             "river"
-            "kde"
+            "plasma6"
              # "qtile"
           ];
         };

diff --git a/hosts/host.workstation/gaming/games.steam/default.nix b/hosts/host.workstation/gaming/games.steam/default.nix
@@ -60,7 +60,7 @@ in {
 
     hardware = {
       opengl = {
-        driSupport = true;
+        # driSupport = true;
         driSupport32Bit = true;
       };
       pulseaudio.support32Bit = true;

diff --git a/modules/myconfig.desktop.wayland.kde/default.nix b/modules/myconfig.desktop.wayland.kde/default.nix
@@ -5,47 +5,57 @@ let
   cfg = config.myconfig;
   user = myconfig.user;
 in {
-  imports = [
-    (lib.mkIf config.programs.kdeconnect.enable {
-      networking.firewall = {
-        allowedTCPPortRanges = [ 
-          { from = 1714; to = 1764; } # KDE Connect
-        ];  
-        allowedUDPPortRanges = [ 
-          { from = 1714; to = 1764; } # KDE Connect
-        ];
-      };
-    })
-  ];
   config = (lib.mkIf (cfg.desktop.wayland.enable
-    && builtins.elem "kde" cfg.desktop.wayland.selectedSessions) {
-      # services.xserver.enable = true;
-      # services.xserver.displayManager.sddm.enable = true;
-
-      # # services.xserver.enable = lib.mkForce true;
-      # services.xserver.displayManager.sddm.enable = false;
-      # services.xserver.displayManager.gdm.enable = true;
-
-      # services.xserver.desktopManager.plasma5.enable = true;
-      services.desktopManager.plasma6.enable = true;
+  && (builtins.elem "plasma5" cfg.desktop.wayland.selectedSessions ||
+      builtins.elem "plasma6" cfg.desktop.wayland.selectedSessions)) (lib.mkMerge [
+    (lib.mkIf (builtins.elem "plasma5" cfg.desktop.wayland.selectedSessions) {
+      services.xserver.desktopManager.plasma5.enable = true;
       environment.systemPackages = with pkgs; [
         plasma5Packages.bismuth
-        kdeconnect
-        kdeplasma-addons
       ];
       environment.plasma5.excludePackages = with pkgs.libsForQt5; [
         plasma-browser-integration
         konsole
         oxygen
       ];
+      myconfig.desktop.wayland.sessions = {
+        plasma5 = { command = "${pkgs.plasma-workspace}/bin/startplasma-wayland"; };
+      };
+    })
+    (lib.mkIf (builtins.elem "plasma6" cfg.desktop.wayland.selectedSessions) {
+      services.desktopManager.plasma6.enable = true;
       environment.plasma6.excludePackages = with pkgs.kdePackages; [
         plasma-browser-integration
         konsole
         oxygen
       ];
       myconfig.desktop.wayland.sessions = {
-        kde = { command = "${pkgs.plasma-workspace}/bin/startplasma-wayland"; };
+        plasma6 = { command = "${pkgs.plasma-workspace}/bin/startplasma-wayland"; };
       };
-      programs.kdeconnect.enable = false;
-    });
+    })
+    (lib.mkIf (builtins.elem "plasma5-bigsrceen" cfg.desktop.wayland.selectedSessions) {
+      environment.systemPackages = with pkgs; [
+        plasma5Packages.plasma-bigscreen
+      ];
+      myconfig.desktop.wayland.sessions = {
+        plasma5-bigsrceen = { command = "${pkgs.plasma5Packages.plasma-bigscreen}/bin/plasma-bigscreen-wayland"; };
+      };
+    })
+    (lib.mkIf config.programs.kdeconnect.enable {
+      networking.firewall = {
+        allowedTCPPortRanges = [ 
+          { from = 1714; to = 1764; } # KDE Connect
+        ];  
+        allowedUDPPortRanges = [ 
+          { from = 1714; to = 1764; } # KDE Connect
+        ];
+      };
+    })
+    {
+      environment.systemPackages = with pkgs; [
+        kdeplasma-addons
+      ];
+      programs.kdeconnect.enable = lib.mkDefault false;
+    }
+  ]));
 }