14 files changed, 586 insertions, 109 deletions

diff --git a/accounts/gkleen@sif/shell/default.nix b/accounts/gkleen@sif/shell/default.nix
index 26c8bd98..84140072 100644
--- a/accounts/gkleen@sif/shell/default.nix
+++ b/accounts/gkleen@sif/shell/default.nix
@@ -7,8 +7,75 @@
       config = {
         src = ./quickshell;
         replacements = {
-          coreutils = toString pkgs.coreutils;
           ignore_workspaces = builtins.toJSON (map ({ name, ... }: name) config.programs.niri.scratchspaces);
+          wallpapers = builtins.toJSON (pkgs.stdenvNoCC.mkDerivation {
+            name = "wallpapers";
+            srcs = [
+              (pkgs.fetchurl {
+                url = "https://esawebb.org/media/archives/images/publicationtiff10k/carinanebula3.tif";
+                hash = "sha256-YxZEweDKJfvfrdxb/QFmgJhcZDEJYxotoHrG+RRn1tw=";
+              })
+              (pkgs.fetchurl {
+                url = "https://esawebb.org/media/archives/images/original/pillarsofcreation_composite.tif";
+                hash = "sha256-qRiODxR0lZWdxgYXna0fNRFFDErpBJDwOJuQl6sNjRc=";
+              })
+              (pkgs.fetchurl {
+                url = "https://esawebb.org/media/archives/images/publicationtiff10k/weic2212a.tif";
+                hash = "sha256-l2fqE/z//C1a0xkvZwsnwPbTSb+WuA11h+SUl3E1dhw=";
+              })
+              (pkgs.fetchurl {
+                url = "https://esawebb.org/media/archives/images/publicationtiff10k/weic2415a.tif";
+                hash = "sha256-onBy7cPoUpDuzQStbY2E+qmlGgSLXPwFCLX53ukAb4c=";
+              })
+              (pkgs.fetchurl {
+                url = "https://esawebb.org/media/archives/images/publicationtiff10k/weic2330a.tif";
+                hash = "sha256-nn0ZtjZIrPcpj3YcLTsrL7XiXvyh3QYgCSmdDMD+3OM=";
+              })
+              (pkgs.fetchurl {
+                url = "https://esawebb.org/media/archives/images/original/weic2426a.tif";
+                hash = "sha256-EDnfPn3GE9jt6XPqiGInP7E2F3Az7d25NqATSWltDv0=";
+              })
+              (pkgs.fetchurl {
+                url = "https://esawebb.org/media/archives/images/original/weic2503a.tif";
+                hash = "sha256-3/RX6RQp8naELcgReHPd5/zhJkoCjnA10w5BEnNo+qI=";
+              })
+              (pkgs.fetchurl {
+                url = "https://esawebb.org/media/archives/images/original/weic2506a.tif";
+                hash = "sha256-aDld0aoY1owRxDVf7Jcyw71TH42M1foYotxn2thyFYw=";
+              })
+              (pkgs.fetchurl {
+                url = "https://esawebb.org/media/archives/images/original/weic2514a.tif";
+                hash = "sha256-jTi1G1Ofo5xsF6ggrbtYJHxqLaCQ7edM5B3uORiVQtg=";
+              })
+              (pkgs.fetchurl {
+                url = "https://esawebb.org/media/archives/images/original/weic2425c.tif";
+                hash = "sha256-oaEOexSJHEGj090dJF3ct5HAoR+Y5gRiPrUlxdvnTRo=";
+              })
+            ];
+
+            dontUnpack = true;
+
+            buildInputs = [ pkgs.imagemagick ];
+            buildPhase = ''
+              runHook preBuild
+
+              typeset sources=($srcs)
+
+              mkdir -p $out
+              magick ''${sources[0]} -crop 10000x5625+0+79 +repage -define jpeg:extent=10MB $out/carinanebula3.jpeg
+              magick ''${sources[1]} -crop 6716x3778+329+80 +repage -define jpeg:extent=10MB $out/pillarsofcreation_composite.jpeg
+              magick ''${sources[2]} -crop 10000x5625+0+79 +repage -define jpeg:extent=10MB $out/weic2212a.jpeg
+              magick ''${sources[3]} -crop 7650x4302+1166+389 +repage -define jpeg:extent=10MB $out/weic2415a.jpeg
+              magick ''${sources[4]} -crop 8732x4912+0+434 +repage -define jpeg:extent=10MB $out/weic2330a.jpeg
+              magick ''${sources[5]} -crop 5302x2982+636+0 +repage -define jpeg:extent=10MB $out/weic2426a.jpeg
+              magick ''${sources[6]} -crop 4328x2434+0+906 +repage -define jpeg:extent=10MB $out/weic2503a.jpeg
+              magick ''${sources[7]} -crop 4152x2335+0+666 +repage -define jpeg:extent=10MB $out/weic2506a.jpeg
+              magick ''${sources[8]} -crop 4320x2430+0+0 +repage -define jpeg:extent=10MB $out/weic2514a.jpeg
+              magick ''${sources[9]} -crop 5863x3298+0+477 +repage -define jpeg:extent=10MB $out/weic2425c.jpeg
+
+              runHook postBuild
+            '';
+          });
         };
       };
     };
diff --git a/accounts/gkleen@sif/shell/quickshell-plugins/CMakeLists.txt b/accounts/gkleen@sif/shell/quickshell-plugins/CMakeLists.txt
index aa363c4c..2123ed35 100644
--- a/accounts/gkleen@sif/shell/quickshell-plugins/CMakeLists.txt
+++ b/accounts/gkleen@sif/shell/quickshell-plugins/CMakeLists.txt
@@ -104,6 +104,7 @@ qt6_add_qml_module(customplugin
 
 target_sources(customplugin PRIVATE
     Chrono.cpp Chrono.hpp
+    FileSelector.cpp FileSelector.hpp
 )
 
 target_compile_features(customplugin PUBLIC cxx_std_26)
diff --git a/accounts/gkleen@sif/shell/quickshell-plugins/Chrono.cpp b/accounts/gkleen@sif/shell/quickshell-plugins/Chrono.cpp
index 929b7be6..df0c5781 100644
--- a/accounts/gkleen@sif/shell/quickshell-plugins/Chrono.cpp
+++ b/accounts/gkleen@sif/shell/quickshell-plugins/Chrono.cpp
@@ -75,14 +75,10 @@ void Chrono::schedule(const std::chrono::time_point<std::chrono::system_clock>&
   this->timer.start(delay);
 }
 
-QString Chrono::format() const { return this->mFormat; }
-void Chrono::setFormat(QString format) {
-  if (format == this->mFormat) return;
-  this->mFormat = format;
-  emit this->formatChanged();
-  this->update();
+QString Chrono::format(const QString& fmt) const {
+  return QString::fromStdString(std::format(std::runtime_format(fmt.toStdString()), std::chrono::zoned_time(std::chrono::current_zone(), std::chrono::time_point_cast<std::chrono::seconds>(this->currentTime))));
 }
 
-QString Chrono::date() const {
-  return QString::fromStdString(std::format(std::runtime_format(this->mFormat.toStdString()), std::chrono::zoned_time(std::chrono::current_zone(), std::chrono::time_point_cast<std::chrono::seconds>(this->currentTime))));
+QDateTime Chrono::date() const {
+  return QDateTime::fromStdTimePoint(std::chrono::time_point_cast<std::chrono::milliseconds>(this->currentTime));
 }
diff --git a/accounts/gkleen@sif/shell/quickshell-plugins/Chrono.hpp b/accounts/gkleen@sif/shell/quickshell-plugins/Chrono.hpp
index 788fa88e..04080187 100644
--- a/accounts/gkleen@sif/shell/quickshell-plugins/Chrono.hpp
+++ b/accounts/gkleen@sif/shell/quickshell-plugins/Chrono.hpp
@@ -1,17 +1,18 @@
 #pragma once
 
+#include <chrono>
+
+#include <QDateTime>
 #include <QObject>
 #include <QTimer>
 
 #include <qqmlintegration.h>
-#include <chrono>
 
 class Chrono : public QObject {
   Q_OBJECT;
   Q_PROPERTY(bool enabled READ enabled WRITE setEnabled NOTIFY enabledChanged);
   Q_PROPERTY(Chrono::Precision precision READ precision WRITE setPrecision NOTIFY precisionChanged);
-  Q_PROPERTY(QString format READ format WRITE setFormat NOTIFY formatChanged);
-  Q_PROPERTY(QString date READ date NOTIFY dateChanged);
+  Q_PROPERTY(QDateTime date READ date NOTIFY dateChanged)
   QML_ELEMENT;
 
 public:
@@ -30,15 +31,13 @@ public:
   Chrono::Precision precision() const;
   void setPrecision(Chrono::Precision precision);
 
-  QString format() const;
-  void setFormat (QString format);
+  Q_INVOKABLE QString format(const QString& fmt) const;
 
-  QString date() const;
+  QDateTime date() const;
 
 signals:
   void enabledChanged();
   void precisionChanged();
-  void formatChanged();
   void dateChanged();
 
 private slots:
@@ -47,7 +46,6 @@ private slots:
 private:
   bool mEnabled = true;
   Chrono::Precision mPrecision = Chrono::Seconds;
-  QString mFormat = "{:%c}";
   QTimer timer;
   std::chrono::time_point<std::chrono::system_clock> currentTime, targetTime;
 
diff --git a/accounts/gkleen@sif/shell/quickshell-plugins/FileSelector.cpp b/accounts/gkleen@sif/shell/quickshell-plugins/FileSelector.cpp
new file mode 100644
index 00000000..3a0537b6
--- /dev/null
+++ b/accounts/gkleen@sif/shell/quickshell-plugins/FileSelector.cpp
@@ -0,0 +1,99 @@
+#include "FileSelector.hpp"
+
+#include <sstream>
+#include <vector>
+#include <random>
+#include <algorithm>
+
+#include <iostream>
+#include <format>
+
+namespace fs = std::filesystem;
+
+FileSelector::FileSelector(QObject* parent): QObject(parent) {
+  QObject::connect(&this->timer, &QTimer::timeout, this, &FileSelector::onTimeout);
+}
+
+QString FileSelector::directory() const {
+  return QString::fromStdString(this->mDirectory->string());
+}
+void FileSelector::setDirectory(QString directory) {
+  this->mDirectory = directory.toStdString();
+  if (this->mDirectory && this->mEpoch)
+    this->update();
+  emit this->directoryChanged();
+}
+
+unsigned int FileSelector::epoch() const {
+  return std::chrono::duration_cast<std::chrono::milliseconds>(*this->mEpoch).count();
+}
+void FileSelector::setEpoch(unsigned int epoch) {
+  this->mEpoch = std::chrono::milliseconds{epoch};
+  if (this->mDirectory && this->mEpoch)
+    this->update();
+  emit this->epochChanged();
+}
+
+QString FileSelector::seed() const {
+  return this->mSeed;
+}
+void FileSelector::setSeed(QString seed) {
+  this->mSeed = seed;
+  emit this->seedChanged();
+}
+
+QString FileSelector::selected() const {
+  if (!this->mDirectory || !this->mEpoch)
+    return QString();
+
+  std::vector<fs::path> shuffled(this->mFiles.begin(), this->mFiles.end());
+  std::sort(shuffled.begin(), shuffled.end());
+
+  auto currentTime = std::chrono::system_clock::now();
+  uint64_t currentEpoch = currentTime.time_since_epoch() / *this->mEpoch;
+  std::chrono::milliseconds timeInEpoch = std::chrono::duration_cast<std::chrono::milliseconds>(currentTime.time_since_epoch()) % *this->mEpoch;
+
+  std::ostringstream seed;
+  seed << this->mSeed.size() << ";" << this->mSeed.toStdString() << ";";
+  seed << *this->mEpoch << ";";
+  seed << currentEpoch << ";";
+  seed << this->mDirectory->string().size() << ";" << *this->mDirectory << ";";
+  seed << this->mFiles.size() << ";";
+  for (const fs::path& p: this->mFiles)
+    seed << p.string().size() << ";" << p << ";";
+
+  std::vector<std::seed_seq::result_type> v;
+  v.reserve(seed.str().size());
+  for (const char& c: seed.str())
+    v.push_back(c);
+
+  std::seed_seq engine_seed(v.begin(), v.end());
+  std::mt19937 g(engine_seed);
+  std::shuffle(shuffled.begin(), shuffled.end(), g);
+
+  std::vector<fs::path>::size_type ix = shuffled.size() * timeInEpoch / *this->mEpoch;
+  return QString::fromStdString((*this->mDirectory / shuffled[ix]).string());
+}
+
+void FileSelector::onTimeout() {
+  if (!this->mFiles.size())
+    return;
+
+  auto currentTime = std::chrono::system_clock::now();
+  uint64_t currentMinorEpoch = currentTime.time_since_epoch() / (*this->mEpoch / this->mFiles.size());
+  auto nextTime = std::chrono::time_point<std::chrono::system_clock>((2 * currentMinorEpoch + 3) * (*this->mEpoch / (this->mFiles.size() * 2)));
+  this->timer.start(std::chrono::duration_cast<std::chrono::milliseconds>(nextTime - currentTime).count());
+
+  emit this->selectedChanged();
+}
+
+void FileSelector::update() {
+  this->mFiles = std::set<fs::path>{};
+  for (const fs::directory_entry& entry:
+         fs::recursive_directory_iterator(*this->mDirectory, fs::directory_options::follow_directory_symlink))
+    {
+      this->mFiles.insert(fs::relative(entry, *this->mDirectory));
+    }
+
+  this->onTimeout();
+}
diff --git a/accounts/gkleen@sif/shell/quickshell-plugins/FileSelector.hpp b/accounts/gkleen@sif/shell/quickshell-plugins/FileSelector.hpp
new file mode 100644
index 00000000..72c4f2a7
--- /dev/null
+++ b/accounts/gkleen@sif/shell/quickshell-plugins/FileSelector.hpp
@@ -0,0 +1,52 @@
+#pragma once
+
+#include <filesystem>
+#include <chrono>
+#include <set>
+#include <optional>
+
+#include <QObject>
+#include <QTimer>
+
+#include <qqmlintegration.h>
+
+class FileSelector : public QObject {
+  Q_OBJECT;
+  Q_PROPERTY(QString directory READ directory WRITE setDirectory NOTIFY directoryChanged REQUIRED);
+  Q_PROPERTY(unsigned int epoch READ epoch WRITE setEpoch NOTIFY epochChanged REQUIRED);
+  Q_PROPERTY(QString seed READ seed WRITE setSeed NOTIFY seedChanged);
+  Q_PROPERTY(QString selected READ selected NOTIFY selectedChanged);
+  QML_ELEMENT;
+
+public:
+  explicit FileSelector(QObject* parent = nullptr);
+
+  QString directory() const;
+  void setDirectory(QString directory);
+
+  unsigned int epoch() const;
+  void setEpoch(unsigned int epoch);
+
+  QString seed() const;
+  void setSeed(QString seed);
+
+  QString selected() const;
+
+signals:
+  void directoryChanged();
+  void epochChanged();
+  void seedChanged();
+  void selectedChanged();
+
+private slots:
+  void onTimeout();
+
+private:
+  std::optional<std::filesystem::path> mDirectory;
+  std::optional<std::chrono::milliseconds> mEpoch;
+  std::set<std::filesystem::path> mFiles;
+  QString mSeed;
+  QTimer timer;
+
+  void update();
+};
diff --git a/accounts/gkleen@sif/shell/quickshell/Clock.qml b/accounts/gkleen@sif/shell/quickshell/Clock.qml
index 55fabd1c..edce57e3 100644
--- a/accounts/gkleen@sif/shell/quickshell/Clock.qml
+++ b/accounts/gkleen@sif/shell/quickshell/Clock.qml
@@ -7,6 +7,8 @@ import QtQuick.Layouts
 import Quickshell.Widgets
 
 Item {
+  id: clockItem
+
   width: clock.contentWidth
   height: parent.height
   anchors.verticalCenter: parent.verticalCenter
@@ -30,22 +32,25 @@ Item {
 
     onWheel: event => scrollYear(event)
 
-    Text {
-      id: clock
-      color: "white"
+    Item {
+      anchors.fill: parent
 
-      anchors.verticalCenter: parent.verticalCenter
+      Text {
+        id: clock
+        color: "white"
 
-      Custom.Chrono {
-        id: chrono
-        format: "W{0:%V-%u} {0:%F} {0:%H:%M:%S%Ez}"
-      }
+        anchors.verticalCenter: parent.verticalCenter
 
-      text: chrono.date
+        Custom.Chrono {
+          id: chrono
+
+          onDateChanged: clock.text = format("W{0:%V-%u} {0:%F} {0:%H:%M:%S%Ez}")
+        }
 
-      font.pointSize: 10
-      font.family: "Fira Sans"
-      font.features: { "tnum": 1 }
+        font.pointSize: 10
+        font.family: "Fira Sans"
+        font.features: { "tnum": 1 }
+      }
     }
   }
 
@@ -73,8 +78,7 @@ Item {
     color: "black"
 
     onVisibleChanged: {
-      const d = new Date();
-      yearCalendar.year = d.getFullYear();
+      yearCalendar.year = chrono.date.getFullYear();
       clockMouseArea.angleRem = 0;
     }
 
@@ -112,7 +116,7 @@ Item {
           }
 
           GridLayout {
-            property int year: { const d = new Date(); return d.getFullYear(); }
+            property int year: chrono.date.getFullYear()
 
             id: yearCalendar
 
@@ -146,10 +150,7 @@ Item {
                   font.pointSize: 10
                   font.family: "Fira Sans"
 
-                  text: {
-                    const date = Date.fromLocaleDateString(Qt.locale(), `${yearCalendar.year}-${monthCalendar.month + 1}-01`, "yyyy-M-dd");
-                    return date.toLocaleString(Qt.locale("en_DK"), "MMMM")
-                  }
+                  text: new Date(yearCalendar.year, monthCalendar.month, 1).toLocaleString(Qt.locale("en_DK"), "MMMM")
 
                   color: "#ffead3"
                 }
@@ -161,17 +162,25 @@ Item {
                   Layout.column: 1
                   Layout.fillWidth: true
 
-                  delegate: Text {
+                  delegate: WrapperItem {
                     required property string shortName
 
-                    font.pointSize: 10
-                    font.family: "Fira Mono"
+                    width: dowLabel.contentWidth + 6
 
-                    text: shortName
-                    color: "#ffcc66"
+                    Text {
+                      id: dowLabel
 
-                    horizontalAlignment: Text.AlignRight
-                    verticalAlignment: Text.AlignVCenter
+                      anchors.fill: parent
+
+                      font.pointSize: 10
+                      font.family: "Fira Sans"
+
+                      text: parent.shortName
+                      color: "#ffcc66"
+
+                      horizontalAlignment: Text.AlignHCenter
+                      verticalAlignment: Text.AlignVCenter
+                    }
                   }
                 }
 
@@ -236,8 +245,10 @@ Item {
                       font.family: "Fira Sans"
                       font.features: { "tnum": 1 }
 
+                      property bool today: chrono.date.getFullYear() == model.year && chrono.date.getMonth() == model.month && chrono.date.getDate() == model.day
+
                       text: model.day
-                      color: model.today ? "#ff6699" : "white"
+                      color: today ? "#ff6699" : "white"
 
                       horizontalAlignment: Text.AlignRight
                       verticalAlignment: Text.AlignVCenter
diff --git a/accounts/gkleen@sif/shell/quickshell/KeyboardLayout.qml b/accounts/gkleen@sif/shell/quickshell/KeyboardLayout.qml
index 4a6b8390..bc3750f9 100644
--- a/accounts/gkleen@sif/shell/quickshell/KeyboardLayout.qml
+++ b/accounts/gkleen@sif/shell/quickshell/KeyboardLayout.qml
@@ -3,18 +3,8 @@ import QtQuick
 import qs.Services
 import Quickshell.Widgets
 
-Rectangle {
-  id: kbdWidget
-
-  property var keyboardAbbrev: { "English (programmer Dvorak)": "dvp", "English (US)": "us" }
-
+Item {
   width: kbdLabel.contentWidth + 8
-  color: {
-    if (kbdMouseArea.containsMouse) {
-      return "#33808080";
-    }
-    return "transparent";
-  }
   height: parent.height
   anchors.verticalCenter: parent.verticalCenter
 
@@ -22,6 +12,7 @@ Rectangle {
     id: kbdMouseArea
 
     anchors.fill: parent
+
     hoverEnabled: true
     cursorShape: Qt.PointingHandCursor
     enabled: true
@@ -32,23 +23,37 @@ Rectangle {
       NiriService.sendCommand({ "Action": { "SwitchLayout": { "layout": event.angleDelta > 0 ? "Next" : "Prev" } } }, _ => {})
     }
 
-    Text {
-      id: kbdLabel
+    Rectangle {
+      id: kbdWidget
 
-      font.pointSize: 10
-      font.family: "Fira Sans"
+      property var keyboardAbbrev: { "English (programmer Dvorak)": "dvp", "English (US)": "us" }
+
+      anchors.fill: parent
       color: {
-        if (NiriService.keyboardLayouts?.current_idx === 0)
-          return "#555";
-        return "white";
+        if (kbdMouseArea.containsMouse) {
+          return "#33808080";
+        }
+        return "transparent";
       }
-      anchors.centerIn: parent
 
-      text: {
-        const currentLayout = NiriService.keyboardLayouts?.names?.[NiriService.keyboardLayouts.current_idx];
-        if (!currentLayout)
-          return "";
-        return kbdWidget.keyboardAbbrev[currentLayout] ? kbdWidget.keyboardAbbrev[currentLayout] : currentLayout;
+      Text {
+        id: kbdLabel
+
+        font.pointSize: 10
+        font.family: "Fira Sans"
+        color: {
+          if (NiriService.keyboardLayouts?.current_idx === 0)
+            return "#555";
+          return "white";
+        }
+        anchors.centerIn: parent
+
+        text: {
+          const currentLayout = NiriService.keyboardLayouts?.names?.[NiriService.keyboardLayouts.current_idx];
+          if (!currentLayout)
+            return "";
+          return kbdWidget.keyboardAbbrev[currentLayout] ? kbdWidget.keyboardAbbrev[currentLayout] : currentLayout;
+        }
       }
     }
   }
diff --git a/accounts/gkleen@sif/shell/quickshell/Services/NiriService.qml b/accounts/gkleen@sif/shell/quickshell/Services/NiriService.qml
index 179b55e0..af522ec4 100644
--- a/accounts/gkleen@sif/shell/quickshell/Services/NiriService.qml
+++ b/accounts/gkleen@sif/shell/quickshell/Services/NiriService.qml
@@ -160,7 +160,11 @@ Singleton {
     });
   }
   function eventWindowOpenedOrChanged(data) {
-    root.windows = Array.from(root.windows).filter(win => win.id !== data.window.id).concat([data.window]);
+    root.windows = Array.from(root.windows).map(win => {
+      if (data.window.is_focused)
+        win.is_focused = false;
+      return win;
+    }).filter(win => win.id !== data.window.id).concat([data.window]);
   }
   function eventWindowClosed(data) {
     root.windows = Array.from(root.windows).filter(win => win.id !== data.id);
diff --git a/accounts/gkleen@sif/shell/quickshell/Services/WallpaperSelector.qml b/accounts/gkleen@sif/shell/quickshell/Services/WallpaperSelector.qml
new file mode 100644
index 00000000..3c524955
--- /dev/null
+++ b/accounts/gkleen@sif/shell/quickshell/Services/WallpaperSelector.qml
@@ -0,0 +1,8 @@
+import Custom as Custom
+
+Custom.FileSelector {
+  id: root
+
+  directory: @wallpapers@
+  epoch: 72000000
+}
diff --git a/accounts/gkleen@sif/shell/quickshell/SystemTray.qml b/accounts/gkleen@sif/shell/quickshell/SystemTray.qml
index 024026a3..55b1690e 100644
--- a/accounts/gkleen@sif/shell/quickshell/SystemTray.qml
+++ b/accounts/gkleen@sif/shell/quickshell/SystemTray.qml
@@ -17,10 +17,12 @@ Item {
     spacing: 0
 
     Repeater {
-      model: {
-        var trayItems = Array.from(SystemTray.items.values).filter(item => item.status !== Status.Passive);
-        trayItems.sort((a, b) => a.category !== b.category ? b.category - a.category : a.id.localeCompare(b.id))
-        return trayItems;
+      model: ScriptModel {
+        values: {
+          var trayItems = Array.from(SystemTray.items.values).filter(item => item.status !== Status.Passive);
+          trayItems.sort((a, b) => a.category !== b.category ? b.category - a.category : a.id.localeCompare(b.id))
+          return trayItems;
+        }
       }
 
       delegate: Item {
diff --git a/accounts/gkleen@sif/shell/quickshell/WallpaperBackground.qml b/accounts/gkleen@sif/shell/quickshell/WallpaperBackground.qml
new file mode 100644
index 00000000..de31915f
--- /dev/null
+++ b/accounts/gkleen@sif/shell/quickshell/WallpaperBackground.qml
@@ -0,0 +1,85 @@
+import QtQuick
+import Quickshell
+import qs.Services
+
+Item {
+  id: root
+
+  anchors.fill: parent
+
+  required property string screen
+
+  property Img current: one
+  property string source: selector.selected
+
+  WallpaperSelector {
+    id: selector
+    seed: screen
+  }
+
+  onSourceChanged: {
+    if (!source)
+      current = null;
+    else if (current === one)
+      two.update()
+    else
+      one.update()
+  }
+
+  Img { id: one }
+  Img { id: two }
+
+  component Img: Image {
+    id: img
+
+    function update() {
+      source = root.source || ""
+    }
+
+    anchors.fill: parent
+    fillMode: Image.PreserveAspectCrop
+    smooth: true
+    asynchronous: true
+    cache: false
+
+    opacity: 0
+
+    onStatusChanged: {
+      if (status === Image.Ready) {
+        root.current = this
+      }
+    }
+
+    states: State {
+      name: "visible"
+      when: root.current === img
+
+      PropertyChanges {
+        img.opacity: 1
+      }
+      StateChangeScript {
+        name: "unloadOther"
+        script: {
+          if (img === one)
+            two.source = ""
+          if (img === two)
+            one.source = ""
+        }
+      }
+    }
+
+    transitions: Transition {
+      SequentialAnimation {
+        NumberAnimation {
+          target: img
+          properties: "opacity"
+          duration: 5000
+          easing.type: Easing.OutCubic
+        }
+        ScriptAction {
+          scriptName: "unloadOther"
+        }
+      }
+    }
+  }
+}
diff --git a/accounts/gkleen@sif/shell/quickshell/WorkspaceSwitcher.qml b/accounts/gkleen@sif/shell/quickshell/WorkspaceSwitcher.qml
index 153c56bb..c8c017c3 100644
--- a/accounts/gkleen@sif/shell/quickshell/WorkspaceSwitcher.qml
+++ b/accounts/gkleen@sif/shell/quickshell/WorkspaceSwitcher.qml
@@ -1,5 +1,8 @@
+import Quickshell
 import QtQuick
 import qs.Services
+import Quickshell.Widgets
+import QtQuick.Layouts
 
 Row {
   id: workspaces
@@ -11,61 +14,188 @@ Row {
   spacing: 0
 
   Repeater {
-    model: {
-      let currWorkspaces = NiriService.workspaces;
-      const ignoreWorkspaces = Array.from(workspaces.ignoreWorkspaces);
-      currWorkspaces = currWorkspaces.filter(ws => ws.is_active || ignoreWorkspaces.every(iws => iws !== ws.name));
-      currWorkspaces.sort((a, b) => {
-        if (NiriService.outputs?.[a.output]?.logical?.x !== NiriService.outputs?.[b.output]?.logical?.x)
-          return NiriService.outputs?.[a.output]?.logical?.x - NiriService.outputs?.[b.output]?.logical?.x
-        if (NiriService.outputs?.[a.output]?.logical?.y !== NiriService.outputs?.[b.output]?.logical?.y)
-          return NiriService.outputs?.[a.output]?.logical?.y - NiriService.outputs?.[b.output]?.logical?.y
-        return a.idx - b.idx;
-      });
-      return currWorkspaces;
+    model: ScriptModel {
+      values: {
+        let currWorkspaces = NiriService.workspaces;
+        const ignoreWorkspaces = Array.from(workspaces.ignoreWorkspaces);
+        currWorkspaces = currWorkspaces.filter(ws => ws.is_active || ignoreWorkspaces.every(iws => iws !== ws.name));
+        currWorkspaces.sort((a, b) => {
+          if (NiriService.outputs?.[a.output]?.logical?.x !== NiriService.outputs?.[b.output]?.logical?.x)
+            return NiriService.outputs?.[a.output]?.logical?.x - NiriService.outputs?.[b.output]?.logical?.x
+          if (NiriService.outputs?.[a.output]?.logical?.y !== NiriService.outputs?.[b.output]?.logical?.y)
+            return NiriService.outputs?.[a.output]?.logical?.y - NiriService.outputs?.[b.output]?.logical?.y
+          return a.idx - b.idx;
+        });
+        return currWorkspaces;
+      }
     }
 
-    Rectangle {
+    Item {
+      id: wsItem
+
       property var workspaceData: modelData
 
       width: wsLabel.contentWidth + 8
-      color: {
-        if (mouseArea.containsMouse) {
-          return "#33808080";
-        }
-        return "transparent";
-      }
       height: parent.height
       anchors.verticalCenter: parent.verticalCenter
 
-      MouseArea {
+      WrapperMouseArea {
         id: mouseArea
 
         anchors.fill: parent
+
         hoverEnabled: true
         cursorShape: Qt.PointingHandCursor
         enabled: true
         onClicked: {
           NiriService.sendCommand({ "Action": { "FocusWorkspace": { "reference": { "Id": workspaceData.id } } } }, _ => {})
         }
+
+        Rectangle {
+          anchors.fill: parent
+
+          color: {
+            if (mouseArea.containsMouse) {
+              return "#33808080";
+            }
+            return "transparent";
+          }
+
+          Text {
+            id: wsLabel
+
+            anchors.centerIn: parent
+
+            font.pointSize: 10
+            font.family: "Fira Sans"
+            color: {
+              if (workspaceData.is_active)
+                return "#23fd00";
+              if (workspaceData.active_window_id === null)
+                return "#555";
+              return "white";
+            }
+
+            text: workspaceData.name ? workspaceData.name : workspaceData.idx
+          }
+        }
       }
 
-      Text {
-        id: wsLabel
-
-        font.pointSize: 10
-        font.family: "Fira Sans"
-        color: {
-          if (workspaceData.is_active)
-            return "#23fd00";
-          if (workspaceData.active_window_id === null)
-            return "#555";
-          return "white";
+      PopupWindow {
+        id: tooltip
+
+        property bool nextVisible: (mouseArea.containsMouse || tooltipMouseArea.containsMouse) && [...windowsModel.values].length > 0
+
+        anchor {
+          item: mouseArea
+          edges: Edges.Bottom | Edges.Left
+        }
+        visible: false
+
+        onNextVisibleChanged: hangTimer.restart()
+
+        Timer {
+          id: hangTimer
+          interval: 100
+          onTriggered: tooltip.visible = tooltip.nextVisible
         }
-        anchors.centerIn: parent
 
-        text: workspaceData.name ? workspaceData.name : workspaceData.idx
+        implicitWidth: tooltipContent.implicitWidth
+        implicitHeight: tooltipContent.implicitHeight
+        color: "black"
+
+        WrapperMouseArea {
+          id: tooltipMouseArea
+
+          hoverEnabled: true
+          enabled: true
+
+          anchors.fill: parent
+
+          WrapperItem {
+            id: tooltipContent
+
+            margin: 0
+
+            ColumnLayout  {
+              spacing: 0
+
+              Repeater {
+                model: ScriptModel {
+                  id: windowsModel
+
+                  values: {
+                    let currWindows = Array.from(NiriService.windows).filter(win => win.workspace_id == wsItem.workspaceData.id);
+                    currWindows.sort((a, b) => {
+                      if (a.is_floating !== b.is_floating)
+                        return b.is_floating - a.is_floating;
+                      if (a.layout.tile_pos_in_workspace_view?.[0] !== b.layout.tile_pos_in_workspace_view?.[0])
+                        return a.layout.tile_pos_in_workspace_view?.[0] - b.layout.tile_pos_in_workspace_view?.[0]
+                      if (a.layout.tile_pos_in_workspace_view?.[1] !== b.layout.tile_pos_in_workspace_view?.[1])
+                        return a.layout.tile_pos_in_workspace_view?.[1] - b.layout.tile_pos_in_workspace_view?.[1]
+                      if (a.layout.pos_in_scrolling_layout?.[0] !== b.layout.pos_in_scrolling_layout?.[0])
+                        return a.layout.pos_in_scrolling_layout?.[0] - b.layout.pos_in_scrolling_layout?.[0]
+                      if (a.layout.pos_in_scrolling_layout?.[1] !== b.layout.pos_in_scrolling_layout?.[1])
+                        return a.layout.pos_in_scrolling_layout?.[1] - b.layout.pos_in_scrolling_layout?.[1]
+                      if (a.app_id !== b.app_id)
+                        return a.app_id.localeCompare(b.app_id);
+
+                      return a.title.localeCompare(b.title);
+                    });
+                    return currWindows;
+                  }
+                }
+
+                WrapperMouseArea {
+                  id: windowMouseArea
+
+                  property var windowData: modelData
+
+                  hoverEnabled: true
+                  cursorShape: Qt.PointingHandCursor
+                  enabled: true
+
+                  Layout.fillWidth: true
+
+                  onClicked: {
+                    NiriService.sendCommand({ "Action": { "FocusWindow": { "id": windowData.id } } }, _ => {})
+                  }
+
+                  WrapperRectangle {
+                    color: windowMouseArea.containsMouse ? "#33808080" : "transparent";
+
+                    anchors.fill: parent
+
+                    WrapperItem {
+                      anchors.fill: parent
+
+                      margin: 4
+
+                      Text {
+                        id: windowLabel
+
+                        font.pointSize: 10
+                        font.family: "Fira Sans"
+                        color: {
+                          if (windowData.is_focused)
+                            return "#23fd00";
+                          if (NiriService.workspaces.find(ws => ws.id == windowData.workspace_id)?.active_window_id == windowData.id)
+                            return "white";
+                          return "#555";
+                        }
+
+                        text: windowData.title
+
+                        horizontalAlignment: Text.AlignLeft
+                      }
+                    }
+                  }
+                }
+              }
+            }
+          }
+        }
       }
     }
   }
-}
\ No newline at end of file
+}
diff --git a/accounts/gkleen@sif/shell/quickshell/shell.qml b/accounts/gkleen@sif/shell/quickshell/shell.qml
index 4934cd4d..2ddecad9 100644
--- a/accounts/gkleen@sif/shell/quickshell/shell.qml
+++ b/accounts/gkleen@sif/shell/quickshell/shell.qml
@@ -1,6 +1,7 @@
 //@ pragma UseQApplication
 
 import Quickshell
+import Quickshell.Wayland
 
 ShellRoot {
   settings.watchFiles: false
@@ -13,9 +14,27 @@ ShellRoot {
 
       required property var modelData
 
-      Bar {
-        id: bar
+      PanelWindow {
+        id: bgWindow
+
+        screen: screenScope.modelData
+
+        WlrLayershell.layer: WlrLayer.Background
+        WlrLayershell.exclusionMode: ExclusionMode.Ignore
+
+        anchors.top: true
+        anchors.bottom: true
+        anchors.left: true
+        anchors.right: true
 
+        color: "black"
+
+        WallpaperBackground {
+          screen: bgWindow.screen.name
+        }
+      }
+
+      Bar {
         screen: screenScope.modelData
       }
     }