diff --git a/nix/package.nix b/nix/package.nix index 7800ac2..48677e4 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/assets $out/share/nova-shell/ + cp -r shell/shell.qml shell/modules shell/lock shell/assets $out/share/nova-shell/ # Compile fragment shader to Qt RHI format qsb --qt6 \ diff --git a/shell/modules/lock/Lock.qml b/shell/lock/Lock.qml similarity index 98% rename from shell/modules/lock/Lock.qml rename to shell/lock/Lock.qml index 2406712..c061214 100644 --- a/shell/modules/lock/Lock.qml +++ b/shell/lock/Lock.qml @@ -2,7 +2,7 @@ import QtQuick import Quickshell import Quickshell.Io import Quickshell.Wayland -import ".." as M +import "../modules" as M Scope { id: root diff --git a/shell/modules/lock/LockAuth.qml b/shell/lock/LockAuth.qml similarity index 100% rename from shell/modules/lock/LockAuth.qml rename to shell/lock/LockAuth.qml diff --git a/shell/modules/lock/LockInput.qml b/shell/lock/LockInput.qml similarity index 99% rename from shell/modules/lock/LockInput.qml rename to shell/lock/LockInput.qml index da2d935..4a53a2e 100644 --- a/shell/modules/lock/LockInput.qml +++ b/shell/lock/LockInput.qml @@ -1,5 +1,5 @@ import QtQuick -import ".." as M +import "../modules" as M Item { id: root diff --git a/shell/modules/lock/LockSurface.qml b/shell/lock/LockSurface.qml similarity index 99% rename from shell/modules/lock/LockSurface.qml rename to shell/lock/LockSurface.qml index e377e89..e47b71c 100644 --- a/shell/modules/lock/LockSurface.qml +++ b/shell/lock/LockSurface.qml @@ -2,7 +2,7 @@ import QtQuick import QtQuick.Effects import Quickshell import Quickshell.Wayland -import ".." as M +import "../modules" as M WlSessionLockSurface { id: root diff --git a/shell/modules/lock/qmldir b/shell/lock/qmldir similarity index 100% rename from shell/modules/lock/qmldir rename to shell/lock/qmldir diff --git a/shell/shell.qml b/shell/shell.qml index 9d319fa..a429291 100644 --- a/shell/shell.qml +++ b/shell/shell.qml @@ -1,7 +1,7 @@ //@ pragma Env QS_NO_RELOAD_POPUP=1 import "modules" -import "modules/lock" as Lock +import "lock" as Lock import Quickshell ShellRoot {