From e6483d793245ee6a0faba895ee8c13c9aed75409 Mon Sep 17 00:00:00 2001
From: 2 * r + 2 * t <61896496+soramanew@users.noreply.github.com>
Date: Thu, 4 Sep 2025 22:47:40 +1000
Subject: [PATCH] internal: rename assets -> extras

---
 CMakeLists.txt                        |  6 +++---
 {assets/cpp => extras}/CMakeLists.txt |  0
 {assets/cpp => extras}/version.cpp    |  0
 flake.nix                             |  2 +-
 nix/default.nix                       | 16 ++++++++--------
 5 files changed, 12 insertions(+), 12 deletions(-)
 rename {assets/cpp => extras}/CMakeLists.txt (100%)
 rename {assets/cpp => extras}/version.cpp (100%)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4a166429..7b95855b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -34,7 +34,7 @@ set(CMAKE_CXX_EXTENSIONS OFF)
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib")
 
 set(DISTRIBUTOR "Unset" CACHE STRING "Distributor")
-set(ENABLE_MODULES "assets;plugin;shell" CACHE STRING "Modules to build/install")
+set(ENABLE_MODULES "extras;plugin;shell" CACHE STRING "Modules to build/install")
 set(INSTALL_LIBDIR "usr/lib/caelestia" CACHE STRING "Library install dir")
 set(INSTALL_QMLDIR "usr/lib/qt6/qml" CACHE STRING "QML install dir")
 set(INSTALL_QSCONFDIR "etc/xdg/quickshell/caelestia" CACHE STRING "Quickshell config install dir")
@@ -51,8 +51,8 @@ if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
     add_compile_options(-Wunused-lambda-capture)
 endif()
 
-if("assets" IN_LIST ENABLE_MODULES)
-    add_subdirectory(assets/cpp)
+if("extras" IN_LIST ENABLE_MODULES)
+    add_subdirectory(extras)
 endif()
 
 if("plugin" IN_LIST ENABLE_MODULES)
diff --git a/assets/cpp/CMakeLists.txt b/extras/CMakeLists.txt
similarity index 100%
rename from assets/cpp/CMakeLists.txt
rename to extras/CMakeLists.txt
diff --git a/assets/cpp/version.cpp b/extras/version.cpp
similarity index 100%
rename from assets/cpp/version.cpp
rename to extras/version.cpp
diff --git a/flake.nix b/flake.nix
index 239c2e8e..60f2b226 100644
--- a/flake.nix
+++ b/flake.nix
@@ -49,7 +49,7 @@
         shell = self.packages.${pkgs.system}.caelestia-shell;
       in
         pkgs.mkShell {
-          inputsFrom = [shell shell.plugin shell.assets];
+          inputsFrom = [shell shell.plugin shell.extras];
           packages = with pkgs; [material-symbols rubik nerd-fonts.caskaydia-cove];
           CAELESTIA_XKB_RULES_PATH = "${pkgs.xkeyboard-config}/share/xkeyboard-config-2/rules/base.lst";
         };
diff --git a/nix/default.nix b/nix/default.nix
index dfe27310..6077054a 100644
--- a/nix/default.nix
+++ b/nix/default.nix
@@ -61,18 +61,18 @@
     (lib.cmakeFeature "DISTRIBUTOR" "nix-flake")
   ];
 
-  assets = stdenv.mkDerivation {
-    name = "caelestia-assets${lib.optionalString debug "-debug"}";
+  extras = stdenv.mkDerivation {
+    name = "caelestia-extras${lib.optionalString debug "-debug"}";
     src = lib.fileset.toSource {
       root = ./..;
-      fileset = lib.fileset.union ./../CMakeLists.txt ./../assets/cpp;
+      fileset = lib.fileset.union ./../CMakeLists.txt ./../extras;
     };
 
     nativeBuildInputs = [cmake ninja];
 
     cmakeFlags =
       [
-        (lib.cmakeFeature "ENABLE_MODULES" "assets")
+        (lib.cmakeFeature "ENABLE_MODULES" "extras")
         (lib.cmakeFeature "INSTALL_LIBDIR" "${placeholder "out"}/lib")
       ]
       ++ cmakeVersionFlags;
@@ -103,7 +103,7 @@ in
     src = ./..;
 
     nativeBuildInputs = [cmake ninja makeWrapper qt6.wrapQtAppsHook];
-    buildInputs = [quickshell assets plugin xkeyboard-config qt6.qtbase];
+    buildInputs = [quickshell extras plugin xkeyboard-config qt6.qtbase];
     propagatedBuildInputs = runtimeDeps;
 
     cmakeBuildType =
@@ -128,16 +128,16 @@ in
       makeWrapper ${quickshell}/bin/qs $out/bin/caelestia-shell \
       	--prefix PATH : "${lib.makeBinPath runtimeDeps}" \
       	--set FONTCONFIG_FILE "${fontconfig}" \
-      	--set CAELESTIA_LIB_DIR ${assets}/lib \
+      	--set CAELESTIA_LIB_DIR ${extras}/lib \
         --set CAELESTIA_XKB_RULES_PATH ${xkeyboard-config}/share/xkeyboard-config-2/rules/base.lst \
       	--add-flags "-p $out/share/caelestia-shell"
 
       mkdir -p $out/lib
-      ln -s ${assets}/lib/* $out/lib/
+      ln -s ${extras}/lib/* $out/lib/
     '';
 
     passthru = {
-      inherit plugin assets;
+      inherit plugin extras;
     };
 
     meta = {