From 197f6976e0f04934a2ebc19a02729bf0998c8a81 Mon Sep 17 00:00:00 2001 From: Damocles Date: Fri, 17 Apr 2026 21:58:48 +0200 Subject: [PATCH] move content/ up to shell/applets/ --- nix/package.nix | 2 +- shell/{modules/content => applets}/CpuContent.qml | 2 +- shell/{modules/content => applets}/DiskContent.qml | 2 +- shell/{modules/content => applets}/HexWaveBackground.qml | 2 +- shell/{modules/content => applets}/MemoryContent.qml | 2 +- shell/{modules/content => applets}/MprisContent.qml | 2 +- shell/{modules/content => applets}/TemperatureContent.qml | 2 +- shell/{modules/content => applets}/VolumeContent.qml | 2 +- shell/{modules/content => applets}/qmldir | 2 +- shell/lock/LockSurface.qml | 2 +- shell/modules/Cpu.qml | 2 +- shell/modules/Disk.qml | 2 +- shell/modules/Memory.qml | 2 +- shell/modules/Mpris.qml | 2 +- shell/modules/OverviewBackdrop.qml | 2 +- shell/modules/Temperature.qml | 2 +- shell/modules/Volume.qml | 2 +- 17 files changed, 17 insertions(+), 17 deletions(-) rename shell/{modules/content => applets}/CpuContent.qml (99%) rename shell/{modules/content => applets}/DiskContent.qml (99%) rename shell/{modules/content => applets}/HexWaveBackground.qml (99%) rename shell/{modules/content => applets}/MemoryContent.qml (99%) rename shell/{modules/content => applets}/MprisContent.qml (99%) rename shell/{modules/content => applets}/TemperatureContent.qml (99%) rename shell/{modules/content => applets}/VolumeContent.qml (99%) rename shell/{modules/content => applets}/qmldir (94%) diff --git a/nix/package.nix b/nix/package.nix index 48677e4..643e45f 100644 --- a/nix/package.nix +++ b/nix/package.nix @@ -25,7 +25,7 @@ stdenvNoCC.mkDerivation { runHook preInstall mkdir -p $out/share/nova-shell - cp -r shell/shell.qml shell/modules shell/lock shell/assets $out/share/nova-shell/ + cp -r shell/shell.qml shell/modules shell/applets shell/lock shell/assets $out/share/nova-shell/ # Compile fragment shader to Qt RHI format qsb --qt6 \ diff --git a/shell/modules/content/CpuContent.qml b/shell/applets/CpuContent.qml similarity index 99% rename from shell/modules/content/CpuContent.qml rename to shell/applets/CpuContent.qml index 9411538..9f5d3c2 100644 --- a/shell/modules/content/CpuContent.qml +++ b/shell/applets/CpuContent.qml @@ -1,5 +1,5 @@ import QtQuick -import ".." as M +import "../modules" as M Column { id: root diff --git a/shell/modules/content/DiskContent.qml b/shell/applets/DiskContent.qml similarity index 99% rename from shell/modules/content/DiskContent.qml rename to shell/applets/DiskContent.qml index 4fe65f8..45d92ad 100644 --- a/shell/modules/content/DiskContent.qml +++ b/shell/applets/DiskContent.qml @@ -1,5 +1,5 @@ import QtQuick -import ".." as M +import "../modules" as M Column { id: root diff --git a/shell/modules/content/HexWaveBackground.qml b/shell/applets/HexWaveBackground.qml similarity index 99% rename from shell/modules/content/HexWaveBackground.qml rename to shell/applets/HexWaveBackground.qml index a840acc..18d6c9a 100644 --- a/shell/modules/content/HexWaveBackground.qml +++ b/shell/applets/HexWaveBackground.qml @@ -1,6 +1,6 @@ import QtQuick import Quickshell -import ".." as M +import "../modules" as M Item { id: root diff --git a/shell/modules/content/MemoryContent.qml b/shell/applets/MemoryContent.qml similarity index 99% rename from shell/modules/content/MemoryContent.qml rename to shell/applets/MemoryContent.qml index 3ca568e..6071374 100644 --- a/shell/modules/content/MemoryContent.qml +++ b/shell/applets/MemoryContent.qml @@ -1,5 +1,5 @@ import QtQuick -import ".." as M +import "../modules" as M Column { id: root diff --git a/shell/modules/content/MprisContent.qml b/shell/applets/MprisContent.qml similarity index 99% rename from shell/modules/content/MprisContent.qml rename to shell/applets/MprisContent.qml index c916ae1..4d2d888 100644 --- a/shell/modules/content/MprisContent.qml +++ b/shell/applets/MprisContent.qml @@ -1,6 +1,6 @@ import QtQuick import Quickshell.Services.Mpris -import ".." as M +import "../modules" as M Column { id: root diff --git a/shell/modules/content/TemperatureContent.qml b/shell/applets/TemperatureContent.qml similarity index 99% rename from shell/modules/content/TemperatureContent.qml rename to shell/applets/TemperatureContent.qml index fe9ce70..a1093e2 100644 --- a/shell/modules/content/TemperatureContent.qml +++ b/shell/applets/TemperatureContent.qml @@ -1,5 +1,5 @@ import QtQuick -import ".." as M +import "../modules" as M Column { id: root diff --git a/shell/modules/content/VolumeContent.qml b/shell/applets/VolumeContent.qml similarity index 99% rename from shell/modules/content/VolumeContent.qml rename to shell/applets/VolumeContent.qml index 43363a9..2a04757 100644 --- a/shell/modules/content/VolumeContent.qml +++ b/shell/applets/VolumeContent.qml @@ -1,6 +1,6 @@ import QtQuick import Quickshell.Services.Pipewire -import ".." as M +import "../modules" as M Column { id: root diff --git a/shell/modules/content/qmldir b/shell/applets/qmldir similarity index 94% rename from shell/modules/content/qmldir rename to shell/applets/qmldir index cb33d81..2059628 100644 --- a/shell/modules/content/qmldir +++ b/shell/applets/qmldir @@ -1,4 +1,4 @@ -module content +module applets HexWaveBackground 1.0 HexWaveBackground.qml VolumeContent 1.0 VolumeContent.qml MprisContent 1.0 MprisContent.qml diff --git a/shell/lock/LockSurface.qml b/shell/lock/LockSurface.qml index 2798cef..a2ed981 100644 --- a/shell/lock/LockSurface.qml +++ b/shell/lock/LockSurface.qml @@ -5,7 +5,7 @@ import Quickshell.Wayland import Quickshell.Services.Mpris import Quickshell.Services.Pipewire import "../modules" as M -import "../modules/content" as C +import "../applets" as C WlSessionLockSurface { id: root diff --git a/shell/modules/Cpu.qml b/shell/modules/Cpu.qml index 389766e..e4572aa 100644 --- a/shell/modules/Cpu.qml +++ b/shell/modules/Cpu.qml @@ -1,7 +1,7 @@ import QtQuick import Quickshell import "." as M -import "content" as C +import "../applets" as C M.BarSection { id: root diff --git a/shell/modules/Disk.qml b/shell/modules/Disk.qml index c679da9..bbac256 100644 --- a/shell/modules/Disk.qml +++ b/shell/modules/Disk.qml @@ -1,7 +1,7 @@ import QtQuick import Quickshell import "." as M -import "content" as C +import "../applets" as C M.BarSection { id: root diff --git a/shell/modules/Memory.qml b/shell/modules/Memory.qml index ca745a8..0bf6dff 100644 --- a/shell/modules/Memory.qml +++ b/shell/modules/Memory.qml @@ -1,7 +1,7 @@ import QtQuick import Quickshell import "." as M -import "content" as C +import "../applets" as C M.BarSection { id: root diff --git a/shell/modules/Mpris.qml b/shell/modules/Mpris.qml index 887105d..e783bc4 100644 --- a/shell/modules/Mpris.qml +++ b/shell/modules/Mpris.qml @@ -3,7 +3,7 @@ import Quickshell import Quickshell.Io import Quickshell.Services.Mpris import "." as M -import "content" as C +import "../applets" as C M.BarSection { id: root diff --git a/shell/modules/OverviewBackdrop.qml b/shell/modules/OverviewBackdrop.qml index 0e0b050..dbc4308 100644 --- a/shell/modules/OverviewBackdrop.qml +++ b/shell/modules/OverviewBackdrop.qml @@ -2,7 +2,7 @@ import QtQuick import Quickshell import Quickshell.Wayland import "." as M -import "content" as C +import "../applets" as C PanelWindow { id: root diff --git a/shell/modules/Temperature.qml b/shell/modules/Temperature.qml index dd69e3a..3ccc0e4 100644 --- a/shell/modules/Temperature.qml +++ b/shell/modules/Temperature.qml @@ -1,7 +1,7 @@ import QtQuick import Quickshell import "." as M -import "content" as C +import "../applets" as C M.BarSection { id: root diff --git a/shell/modules/Volume.qml b/shell/modules/Volume.qml index 97a93eb..2b28746 100644 --- a/shell/modules/Volume.qml +++ b/shell/modules/Volume.qml @@ -2,7 +2,7 @@ import QtQuick import Quickshell import Quickshell.Services.Pipewire import "." as M -import "content" as C +import "../applets" as C M.BarSection { id: root