From a407c49d2c4f70a28dca122dafb1bb6e4f148869 Mon Sep 17 00:00:00 2001
From: Evie Litherland-Smith <evie.litherland-smith@ukaea.uk>
Date: Wed, 7 Aug 2024 18:08:04 +0100
Subject: [PATCH] Back to single main plasma panel

---
 home/desktop/plasma/default.nix | 95 ++++++++++++++-------------------
 1 file changed, 41 insertions(+), 54 deletions(-)

diff --git a/home/desktop/plasma/default.nix b/home/desktop/plasma/default.nix
index 221cffe6..f5a667d1 100644
--- a/home/desktop/plasma/default.nix
+++ b/home/desktop/plasma/default.nix
@@ -87,59 +87,6 @@
       {
         height = 32;
         lengthMode = "fill";
-        location = "top";
-        alignment = "center";
-        hiding = "dodgewindows";
-        floating = true;
-        widgets = [
-          {
-            name = "org.kde.plasma.pager";
-            config.General = {
-              showWindowIcons = "true";
-              showOnlyCurrentScreen = "false";
-              wrapPage = "true";
-            };
-          }
-          "org.kde.plasma.panelspacer"
-          {
-            digitalClock = {
-              date = {
-                enable = true;
-                format = "isoDate";
-                position = "besideTime";
-              };
-              time = {
-                format = "24h";
-                showSeconds = "always";
-              };
-              calendar.showWeekNumbers = true;
-            };
-          }
-          "org.kde.plasma.panelspacer"
-          "org.kde.plasma.keyboardindicator"
-          "org.kde.plasma.cameraindicator"
-          {
-            systemTray = {
-              icons = {
-                spacing = "small";
-                scaleToFit = false;
-              };
-            };
-          }
-          {
-            name = "org.kde.plasma.userswitcher";
-            config.General = {
-              showFace = "true";
-              showName = "false";
-              showFullName = "true";
-              showTechnicalInfo = "true";
-            };
-          }
-        ];
-      }
-      {
-        height = 48;
-        lengthMode = "fit";
         location = "bottom";
         alignment = "center";
         hiding = "dodgewindows";
@@ -171,7 +118,47 @@
             };
           }
           "org.kde.plasma.marginsseparator"
-          "org.kde.plasma.showdesktop"
+          {
+            name = "org.kde.plasma.pager";
+            config.General = {
+              showWindowIcons = "true";
+              showOnlyCurrentScreen = "false";
+              wrapPage = "true";
+            };
+          }
+          "org.kde.plasma.keyboardindicator"
+          "org.kde.plasma.cameraindicator"
+          {
+            systemTray = {
+              icons = {
+                spacing = "small";
+                scaleToFit = false;
+              };
+            };
+          }
+          {
+            digitalClock = {
+              date = {
+                enable = true;
+                format = "isoDate";
+                position = "besideTime";
+              };
+              time = {
+                format = "24h";
+                showSeconds = "onlyInTooltip";
+              };
+              calendar.showWeekNumbers = true;
+            };
+          }
+          {
+            name = "org.kde.plasma.userswitcher";
+            config.General = {
+              showFace = "true";
+              showName = "false";
+              showFullName = "true";
+              showTechnicalInfo = "true";
+            };
+          }
         ];
       }
     ];