move content/ up to shell/applets/

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 \

shell/applets/CpuContent.qml

@@ -1,5 +1,5 @@
 import QtQuick
-import ".." as M
+import "../modules" as M
 
 Column {
     id: root

shell/applets/DiskContent.qml

@@ -1,5 +1,5 @@
 import QtQuick
-import ".." as M
+import "../modules" as M
 
 Column {
     id: root

shell/applets/HexWaveBackground.qml

@@ -1,6 +1,6 @@
 import QtQuick
 import Quickshell
-import ".." as M
+import "../modules" as M
 
 Item {
     id: root

shell/applets/MemoryContent.qml

@@ -1,5 +1,5 @@
 import QtQuick
-import ".." as M
+import "../modules" as M
 
 Column {
     id: root

shell/applets/MprisContent.qml

@@ -1,6 +1,6 @@
 import QtQuick
 import Quickshell.Services.Mpris
-import ".." as M
+import "../modules" as M
 
 Column {
     id: root

shell/applets/TemperatureContent.qml

@@ -1,5 +1,5 @@
 import QtQuick
-import ".." as M
+import "../modules" as M
 
 Column {
     id: root

shell/applets/VolumeContent.qml

@@ -1,6 +1,6 @@
 import QtQuick
 import Quickshell.Services.Pipewire
-import ".." as M
+import "../modules" as M
 
 Column {
     id: root

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

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

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

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

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

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

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

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

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