Merge branch 'caelestia-dots:main' into feat/improveDesktopClockInverse

Author: haikalllp

.envrc

@@ -3,10 +3,11 @@ if has nix; then
 fi
 
 shopt -s globstar
-watch_file assets/cpp/**/*.cpp
-watch_file assets/cpp/**/*.hpp
 watch_file plugin/**/*.cpp
 watch_file plugin/**/*.hpp
+watch_file plugin/**/*.qml
+watch_file plugin/**/*.vert
+watch_file plugin/**/*.frag
 watch_file **/CMakeLists.txt
 
 cmake -B build -G Ninja -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_CXX_COMPILER=clazy -DCMAKE_EXPORT_COMPILE_COMMANDS=ON -DDISTRIBUTOR=direnv

.github/workflows/check-format.yml

@@ -34,6 +34,5 @@ jobs:
       - name: Check C++ format
         shell: fish {0}
         run: |
-          for file in (string match -v 'build/*' **.cpp **.hpp)
-            clang-format $file | diff -u $file - || exit 1
-          end
+          find plugin extras -name '*.cpp' -o -name '*.hpp' \
+            | xargs clang-format --dry-run --Werror

.github/workflows/update-image.yml

@@ -23,7 +23,7 @@ jobs:
         run: |
           cat > /tmp/Dockerfile <<EOF
           FROM archlinux:latest
-          RUN pacman -Syu --needed --noconfirm sudo base-devel cmake ninja fish git clazy qt6-declarative python libpipewire aubio libqalculate && \
+          RUN pacman -Syu --needed --noconfirm sudo base-devel cmake ninja fish git clazy qt6-declarative qt6-shadertools python libpipewire aubio libqalculate && \
               useradd -m builder && \
               echo 'builder ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers && \
               sudo -u builder git clone https://aur.archlinux.org/yay-bin.git /home/builder/yay-bin && \

README.md

@@ -601,6 +601,8 @@ default, you must create it manually.
     "paths": {
         "mediaGif": "root:/assets/bongocat.gif",
         "sessionGif": "root:/assets/kurukuru.gif",
+        "noNotifsPic": "root:/assets/dino.png",
+        "lockNoNotifsPic": "root:/assets/dino.png",
         "wallpaperDir": "~/Pictures/Wallpapers",
         "lyricsDir": "~/Music/lyrics"
     },

config/AppearanceConfig.qml

@@ -65,7 +65,7 @@ JsonObject {
         property list<real> standardDecel: [0, 0, 0, 1, 1, 1]
         property list<real> expressiveFastSpatial: [0.42, 1.67, 0.21, 0.9, 1, 1]
         property list<real> expressiveDefaultSpatial: [0.38, 1.21, 0.22, 1, 1, 1]
-        property list<real> expressiveEffects: [0.34, 0.8, 0.34, 1, 1, 1]
+        property list<real> expressiveSlowSpatial: [0.39, 1.29, 0.35, 0.98, 1, 1]
     }
 
     component AnimDurations: JsonObject {
@@ -76,7 +76,7 @@ JsonObject {
         property int extraLarge: 1000 * scale
         property int expressiveFastSpatial: 350 * scale
         property int expressiveDefaultSpatial: 500 * scale
-        property int expressiveEffects: 200 * scale
+        property int expressiveSlowSpatial: 650 * scale
     }
 
     component Anim: JsonObject {

config/Config.qml

@@ -327,7 +327,7 @@ Singleton {
             const provider = {
                 displayName: p.displayName,
                 enabled: p.enabled,
-                iface: p.iface,
+                interface: p.interface,
                 name: p.name
             };
             if (p.connectCmd && p.connectCmd.length > 0) {
@@ -395,7 +395,9 @@ Singleton {
             wallpaperDir: paths.wallpaperDir,
             lyricsDir: paths.lyricsDir,
             sessionGif: paths.sessionGif,
-            mediaGif: paths.mediaGif
+            mediaGif: paths.mediaGif,
+            noNotifsPic: paths.noNotifsPic,
+            lockNoNotifsPic: paths.lockNoNotifsPic
         };
     }
 

config/UserPaths.qml

@@ -6,4 +6,6 @@ JsonObject {
     property string lyricsDir: `${Paths.home}/Music/lyrics/`
     property string sessionGif: "root:/assets/kurukuru.gif"
     property string mediaGif: "root:/assets/bongocat.gif"
+    property string noNotifsPic: "root:/assets/dino.png"
+    property string lockNoNotifsPic: "root:/assets/dino.png"
 }

modules/Shortcuts.qml

@@ -1,3 +1,4 @@
+import QtQuick
 import Quickshell
 import Quickshell.Io
 import Caelestia
@@ -115,7 +116,7 @@ Scope {
                 const visibilities = Visibilities.getForActive();
                 visibilities[drawer] = !visibilities[drawer];
             } else {
-                console.warn(`[IPC] Drawer "${drawer}" does not exist`);
+                console.warn(lc, `Drawer "${drawer}" does not exist`);
             }
         }
 
@@ -154,4 +155,11 @@ Scope {
 
         target: "toaster"
     }
+
+    LoggingCategory {
+        id: lc
+
+        name: "caelestia.qml.shortcuts"
+        defaultLogLevel: LoggingCategory.Info
+    }
 }