move lock dir up to shell/lock as sibling of modules

This commit is contained in:
Damocles 2026-04-17 18:32:33 +02:00
parent d6cd2f173a
commit b5b1f4f406
7 changed files with 5 additions and 5 deletions

View file

@ -25,7 +25,7 @@ stdenvNoCC.mkDerivation {
runHook preInstall runHook preInstall
mkdir -p $out/share/nova-shell 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 # Compile fragment shader to Qt RHI format
qsb --qt6 \ qsb --qt6 \

View file

@ -2,7 +2,7 @@ import QtQuick
import Quickshell import Quickshell
import Quickshell.Io import Quickshell.Io
import Quickshell.Wayland import Quickshell.Wayland
import ".." as M import "../modules" as M
Scope { Scope {
id: root id: root

View file

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

View file

@ -2,7 +2,7 @@ import QtQuick
import QtQuick.Effects import QtQuick.Effects
import Quickshell import Quickshell
import Quickshell.Wayland import Quickshell.Wayland
import ".." as M import "../modules" as M
WlSessionLockSurface { WlSessionLockSurface {
id: root id: root

View file

@ -1,7 +1,7 @@
//@ pragma Env QS_NO_RELOAD_POPUP=1 //@ pragma Env QS_NO_RELOAD_POPUP=1
import "modules" import "modules"
import "modules/lock" as Lock import "lock" as Lock
import Quickshell import Quickshell
ShellRoot { ShellRoot {