diff --git a/CMakeLists.txt b/CMakeLists.txt
index ea51dd6..5aa944b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,4 +1,5 @@
 cmake_minimum_required(VERSION 3.19)
+include(GNUInstallDirs)
 
 project(ZShell)
 
@@ -8,8 +9,8 @@ set(CMAKE_CXX_EXTENSIONS OFF)
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib")
 set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
 
-set(INSTALL_LIBDIR "usr/lib/ZShell" CACHE STRING "Library install dir")
-set(INSTALL_QMLDIR "usr/lib/qt6/qml" CACHE STRING "QML install dir")
+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")
 
 add_compile_options(
     -Wall -Wextra -Wpedantic -Wshadow -Wconversion
diff --git a/flake.nix b/flake.nix
index 546027a..19aef0a 100644
--- a/flake.nix
+++ b/flake.nix
@@ -23,7 +23,17 @@
       formatter = forAllSystems (pkgs: pkgs.nixfmt);
 
       packages = forAllSystems (pkgs: rec {
-        app2unit = pkgs.callPackage ./nix/app2unit.nix { inherit pkgs; };
+        zshell = pkgs.callPackage ./nix {
+          rev = self.rev or self.dirtyRev;
+          stdenv = pkgs.clangStdenv;
+          quickshell = inputs.quickshell.packages.${pkgs.stdenv.hostPlatform.system}.default.override {
+            withX11 = false;
+            withI3 = false;
+          };
+          app2unit = pkgs.callPackage ./nix/app2unit.nix { inherit pkgs; };
+        };
+
+        default = zshell;
       });
 
       devShells = forAllSystems (pkgs: {