From 609b8457fbfe812034986b234f39475dcafdcec0 Mon Sep 17 00:00:00 2001
From: Zacharias-Brohn <zacbro-8@student.ltu.se>
Date: Sat, 7 Feb 2026 01:13:49 +0100
Subject: [PATCH] nix fixed??

---
 CMakeLists.txt                | 18 ++++++++++++++----
 Plugins/ZShell/CMakeLists.txt |  2 +-
 nix/default.nix               | 15 ++++++++-------
 shell.qml                     |  2 +-
 4 files changed, 24 insertions(+), 13 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5aa944b..8a45b3e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,5 +1,4 @@
 cmake_minimum_required(VERSION 3.19)
-include(GNUInstallDirs)
 
 project(ZShell)
 
@@ -8,9 +7,10 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(CMAKE_CXX_EXTENSIONS OFF)
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib")
 set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
+set(ENABLE_MODULES "plugin;shell" CACHE STRING "Modules to build/install")
 
-set(INSTALL_LIBDIR "${CMAKE_INSTALL_LIBDIR}/ZShell" CACHE STRING "Library install dir")
-set(INSTALL_QMLDIR "${CMAKE_INSTALL_LIBDIR}/qt6/qml" CACHE STRING "QML install dir")
+set(INSTALL_LIBDIR "usr/lib/ZShell" CACHE STRING "Library install dir")
+set(INSTALL_QMLDIR "usr/lib/qt6/qml" CACHE STRING "QML install dir")
 
 add_compile_options(
     -Wall -Wextra -Wpedantic -Wshadow -Wconversion
@@ -20,4 +20,14 @@ add_compile_options(
     -Wunreachable-code
 )
 
-add_subdirectory(Plugins)
+
+if("plugin" IN_LIST ENABLE_MODULES)
+	add_subdirectory(Plugins)
+endif()
+
+if("shell" IN_LIST ENABLE_MODULES)
+	foreach(dir assets scripts Components Config Modules Daemons Drawers Effects Helpers Paths)
+        install(DIRECTORY ${dir} DESTINATION "${INSTALL_QSCONFDIR}")
+    endforeach()
+	install(FILES shell.qml Bar.qml Wallpaper.qml DESTINATION "${INSTALL_QSCONFDIR}")
+endif()
diff --git a/Plugins/ZShell/CMakeLists.txt b/Plugins/ZShell/CMakeLists.txt
index f76f23b..1c4bf42 100644
--- a/Plugins/ZShell/CMakeLists.txt
+++ b/Plugins/ZShell/CMakeLists.txt
@@ -20,7 +20,7 @@ function(qml_module arg_TARGET)
         QMLDIR module_qmldir
         TYPEINFO module_typeinfo
     )
-    set(module_dir "/usr/lib/qt6/qml/${module_target_path}")
+	set(module_dir "${INSTALL_QMLDIR}/${module_target_path}")
     install(TARGETS ${arg_TARGET} LIBRARY DESTINATION "${module_dir}" RUNTIME DESTINATION "${module_dir}")
     install(TARGETS "${module_plugin_target}" LIBRARY DESTINATION "${module_dir}" RUNTIME DESTINATION "${module_dir}")
     install(FILES "${module_qmldir}" DESTINATION "${module_dir}")
diff --git a/nix/default.nix b/nix/default.nix
index 9c3c27b..b876da7 100644
--- a/nix/default.nix
+++ b/nix/default.nix
@@ -95,28 +95,29 @@ stdenv.mkDerivation {
     quickshell
     plugin
     qt6.qtbase
+    qt6.qtwayland
   ];
   propagatedBuildInputs = runtimeDeps;
 
   cmakeFlags = [
     (lib.cmakeFeature "ENABLE_MODULES" "shell")
+    (lib.cmakeFeature "INSTALL_QSCONFDIR" "${placeholder "out"}/share/ZShell")
   ]
   ++ cmakeVersionFlags;
 
   prePatch = ''
-    substituteInPlace assets/pam.d/fprint \
-      --replace-fail pam_fprintd.so /run/current-system/sw/lib/security/pam_fprintd.so
     substituteInPlace shell.qml \
       --replace-fail 'ShellRoot {' 'ShellRoot {  settings.watchFiles: false'
   '';
 
   postInstall = ''
-    makeWrapper ${quickshell}/bin/qs $out/bin/zshell \
-    	--prefix PATH : "${lib.makeBinPath runtimeDeps}" \
-    	--set FONTCONFIG_FILE "${fontconfig}" \
-    	--add-flags "-p $out/share/ZShell"
+        makeWrapper ${quickshell}/bin/qs $out/bin/zshell \
+        	--prefix PATH : "${lib.makeBinPath runtimeDeps}" \
+        	--set FONTCONFIG_FILE "${fontconfig}" \
+        	--add-flags "-p $out/share/ZShell"
 
-    mkdir -p $out/lib
+    	echo "$out"
+        mkdir -p $out/lib
   '';
 
   passthru = {
diff --git a/shell.qml b/shell.qml
index 691af97..c6d35b7 100644
--- a/shell.qml
+++ b/shell.qml
@@ -7,7 +7,7 @@ import qs.Modules.Lock as Lock
 import qs.Helpers
 import qs.Modules.Polkit
 
-Scope {
+ShellRoot {
     Bar {}
     Wallpaper {}
     Launcher {}