style: format code

flake.nix

@@ -15,14 +15,12 @@
     };
   };
 
-  outputs =
+  outputs = {
-    {
     self,
     nixpkgs,
     quickshell,
     treefmt-nix,
-    }:
+  }: let
-    let
     system = "x86_64-linux";
     pkgs = nixpkgs.legacyPackages.${system};
 
@@ -37,13 +35,12 @@
       projectRootFile = "flake.nix";
 
       programs = {
-          nixfmt.enable = true;
+        alejandra.enable = true;
         qmlformat.enable = true;
         clang-format.enable = true;
       };
     };
-    in
+  in rec {
-    rec {
     formatter.${system} = treefmtEval.config.build.wrapper;
 
     packages.${system} = {

modules/bar/CavaVisualizer.qml

@@ -39,7 +39,7 @@ Rectangle {
                 radius: bar.width / 2
                 color: Theme.colors.accent
                 antialiasing: true
-                opacity: 0.55 + 0.45 * bar.height / Math.max(1, barRow.height)
+                opacity: 0.45 + (bar.level * 0.55)
 
                 Behavior on height {
                     NumberAnimation {

modules/bar/Workspaces.qml

@@ -4,11 +4,24 @@ import QtQuick
 import Quickshell.Hyprland
 import qs.config
 
-Row {
+Item {
     id: root
 
     property int count: 7
 
+    implicitWidth: pillsRow.implicitWidth
+    implicitHeight: Theme.workspaces.height
+    Behavior on implicitWidth {
+        NumberAnimation {
+            duration: Theme.duration
+            easing.type: Easing.OutQuint
+        }
+    }
+
+    Row {
+        id: pillsRow
+
+        anchors.fill: parent
         spacing: Theme.spacing
 
         Repeater {
@@ -21,14 +34,17 @@ Row {
                 property var ws: Hyprland.workspaces.values.find(w => w.id === pill.index + 1)
                 property bool isActive: Hyprland.focusedWorkspace?.id === (pill.index + 1)
 
+                z: 1
                 radius: Theme.workspaces.radius
                 implicitHeight: Theme.workspaces.height
                 implicitWidth: pill.isActive ? pill.implicitHeight * Theme.workspaces.activeWidthRatio : pill.implicitHeight
                 color: {
+                    if (pill.isActive)
+                        return "transparent";
                     if (handler.hovered)
                         return Theme.colors.accent;
-                if (pill.isActive || pill.ws)
+                    if (pill.ws)
-                    return Theme.colors.accent;
+                        return Theme.colors.secondaryForeground;
                     return Theme.colors.inActive;
                 }
 
@@ -36,7 +52,7 @@ Row {
                     hoverEnabled: true
                     anchors.fill: parent
                     cursorShape: Qt.PointingHandCursor
-                onClicked: Hyprland.dispatch("workspace " + (pill.index + 1))
+                    onClicked: Hyprland.dispatch("hl.dsp.focus({ workspace = " + (pill.index + 1) + " })")
                 }
 
                 HoverHandler {
@@ -45,7 +61,7 @@ Row {
 
                 Behavior on color {
                     ColorAnimation {
-                    duration: Theme.duration
+                        duration: Theme.duration + 50
                     }
                 }
 
@@ -57,4 +73,72 @@ Row {
                 }
             }
         }
+    }
+
+    Rectangle {
+        id: highlight
+
+        z: 2
+        radius: Theme.workspaces.radius
+        color: Theme.colors.accent
+
+        readonly property real activeW: Theme.workspaces.height * Theme.workspaces.activeWidthRatio
+        readonly property real inactiveW: Theme.workspaces.height
+        property int curIdx: Hyprland.focusedWorkspace ? Hyprland.focusedWorkspace.id - 1 : -1
+        property int prevIdx: 0
+
+        function getX(index, activeIndex) {
+            if (index < 0)
+                return 0;
+            let x = 0;
+            for (let i = 0; i < index; i++)
+                x += (i === activeIndex ? activeW : inactiveW) + pillsRow.spacing;
+            return x;
+        }
+
+        property real targetLeft: curIdx >= 0 ? getX(curIdx, curIdx) : 0
+        property real targetRight: curIdx >= 0 ? targetLeft + activeW : 0
+        property real actualLeft: targetLeft
+        property real actualRight: targetRight
+
+        Behavior on actualLeft {
+            NumberAnimation {
+                id: leftAnim
+                duration: Theme.duration
+                easing.type: Easing.OutQuint
+            }
+        }
+
+        Behavior on actualRight {
+            NumberAnimation {
+                id: rightAnim
+                duration: Theme.duration
+                easing.type: Easing.OutQuint
+            }
+        }
+
+        onCurIdxChanged: {
+            if (curIdx >= 0 && prevIdx >= 0) {
+                if (curIdx > prevIdx) {
+                    leftAnim.duration = 400;
+                    rightAnim.duration = 300;
+                } else if (curIdx < prevIdx) {
+                    leftAnim.duration = 300;
+                    rightAnim.duration = 400;
+                }
+            }
+            if (curIdx >= 0)
+                prevIdx = curIdx;
+        }
+
+        x: actualLeft
+        width: actualRight - actualLeft
+        height: parent.height
+        opacity: curIdx >= 0 ? 1 : 0
+        Behavior on opacity {
+            NumberAnimation {
+                duration: 180
+            }
+        }
+    }
 }

package.nix

@@ -10,34 +10,32 @@
   cava,
   wallust,
   nerd-fonts,
-  extraRuntimeDeps ? [ ],
+  extraRuntimeDeps ? [],
-}:
+}: let
-let
   version = "0.1.0";
 
-  runtimeDeps = [
+  runtimeDeps =
+    [
       cava
       wallust
     ]
     ++ extraRuntimeDeps;
 
   fontconfig = makeFontsConf {
-    fontDirectories = [ nerd-fonts.fira-code ];
+    fontDirectories = [nerd-fonts.fira-code];
   };
 
   # Unlike lib.fileset, this keeps untracked files (the flake only sees
   # git-tracked paths) while dropping build artifacts.
   src = lib.cleanSourceWith {
     src = lib.cleanSource ./.;
-    filter =
+    filter = path: _: let
-      path: _:
-      let
       name = baseNameOf path;
     in
       !(name == "dist" || name == "result" || name == "result-bin" || lib.hasPrefix "build" name);
   };
 in
-stdenv.mkDerivation {
+  stdenv.mkDerivation {
     inherit version src;
     pname = "tshell";
 
@@ -79,4 +77,4 @@ stdenv.mkDerivation {
       mainProgram = "tshell";
       platforms = lib.platforms.linux;
     };
-}
+  }