battery stuff and fixed the weird workspace nonsense

.nvim.lua

@@ -1,2 +1,26 @@
 require("nvim-treesitter").install({ "qmljs" })
 vim.lsp.enable("qmlls")
+
+-- Disable semantic tokens when any LSP client attaches to a buffer
+vim.api.nvim_create_autocmd("LspAttach", {
+	callback = function(args)
+		local client = vim.lsp.get_client_by_id(args.data.client_id)
+		if client then
+			client.server_capabilities.semanticTokensProvider = nil
+		end
+	end,
+})
+
+vim.api.nvim_create_autocmd("FileType", {
+	pattern = { "qml" },
+	callback = function()
+		vim.treesitter.start()
+	end,
+})
+
+require("conform").setup({
+	formatters_by_ft = {
+		qml = { "qmlformat" },
+	},
+	format_on_save = true,
+})

.qmlformat.ini

@@ -0,0 +1,12 @@
+[General]
+FunctionsSpacing=true
+GroupAttributesTogether=false
+IndentWidth=2
+MaxColumnWidth=100
+NewlineType=unix
+NormalizeOrder=true
+ObjectsSpacing=true
+SemicolonRule=always
+SingleLineEmptyObjects=true
+SortImports=true
+UseTabs=true

Bar.qml

@@ -1,11 +1,10 @@
-import Quickshell
-import Quickshell.Hyprland
-
 import QtQuick
 import QtQuick.Effects
+import Quickshell
+import Quickshell.Hyprland
+import "Components/Color.js" as Colors
 
 import "Components"
-import "Components/Color.js" as Colors
 
 Scope {
   Variants {
@@ -14,60 +13,70 @@ Scope {
 	delegate: Component {
 	  PanelWindow {
 		id: win
+
 		required property var modelData
-
-                screen: modelData
-
-								Behavior on implicitHeight {
-									NumberAnimation { duration: 0; easing.type: Easing.InOutQuad }
-								}
-
 		property HyprlandMonitor monitor: Hyprland.monitorFor(modelData)
 
 		color: "transparent"
-
 		exclusionMode: ExclusionMode.Normal
+		exclusiveZone: 20
+		implicitHeight: 1000
+		screen: modelData
 
+		Behavior on implicitHeight {
+		  NumberAnimation {
+			duration: 0
+			easing.type: Easing.InOutQuad
+		  }
+		}
 		mask: Region {
 		  Region {
 			item: workspaceSwitcher
 		  }
+
 		  Region {
 			item: pillItem
 		  }
+
+		  Region {
+			item: utilsItem
+		  }
 		}
 
 		anchors {
-                    top: true
 		  left: true
 		  right: true
+		  top: true
 		}
 
-								implicitHeight: 1000
-								exclusiveZone: 20
-
 		Workspace {
 		  id: workspaceSwitcher
+
 		  monitor: win.monitor
 		}
 
 		RectangularShadow {
 		  anchors.fill: pillItem
+		  blur: 20
+		  color: Colors.crust
 		  offset.x: 3
 		  offset.y: 3
 		  radius: pillItem.radius
-									blur: 20
 		  spread: 7
-									color: Colors.crust
 		}
+
 		Pill {
 		  id: pillItem
+
 		  monitor: win.monitor
 		}
 
 		Item {
 		  anchors.fill: parent
+
 		  Utils {
+			id: utilsItem
+
 			monitor: win.monitor
 		  }
 		}

Components/Utils.qml

@@ -1,41 +1,45 @@
-
 pragma ComponentBehavior: Bound
+import QtQuick
+import QtQuick.Layouts
 
 import Quickshell
 import Quickshell.Hyprland
-import QtQuick
-import QtQuick.Layouts
 
 import "./Utils"
 
 RowLayout {
   id: utilsContainer
+
   required property HyprlandMonitor monitor
+  property bool shown: monitor !== null && monitor.focused
+
+  opacity: shown ? 1 : 0
   state: ""
 
-	anchors {
+  Behavior on anchors.topMargin {
-		right: parent.right
+	SmoothedAnimation {
-		top: parent.top
+	  duration: 300
+	}
+  }
+  Behavior on opacity {
+	NumberAnimation {
+	  duration: 50
+	}
   }
-	
   states: [
 	State {
 	  name: ""
 	}
   ]
 
-	Rectangle {
+  anchors {
-		color: "red"
+	right: parent.right
-		implicitWidth: 40
+	rightMargin: 7
-		implicitHeight: 40
+	top: parent.top
-	}
+	topMargin: shown ? -33 : -40
-	Rectangle {
-		color: "blue"
-		implicitWidth: 40
-		implicitHeight: 40
   }
 
-	// Battery {}
+  Battery {}
   // Mpris {}
 
 }

Components/Utils/Battery.qml

@@ -1,8 +1,46 @@
-import Quickshell
 import QtQuick
+import Quickshell
+import Quickshell.Services.UPower
+
+import "../Color.js" as Colors
+
+import "./"
+
+Container {
+  id: batteryRoot
+
+  boxColor: Colors.green
+  boxState: ""
+  sourceComponent: batteryClosed
+  visible: UPower.devices[0] ? true : false
+
+  MouseArea {
+	anchors.fill: parent
+	enabled: true
+	hoverEnabled: true
+	propagateComposedEvents: true
+
+	onClicked: batteryRoot.boxState == "" ? batteryRoot.boxState = "open" : batteryRoot.boxState = ""
+	onExited: batteryRoot.boxState = ""
+  }
+
+  Component {
+	id: batteryClosed
 
 	Item {
+	  id: batteryRoot
+
+	  anchors.fill: parent
+
 	  Text {
-		text: "some"
+		color: Colors.base
+		text: "something"
+
+		anchors {
+		  bottom: parent.bottom
+		  horizontalCenter: parent.horizontalCenter
+		}
+	  }
+	}
   }
 }

Components/Utils/Container.qml

@@ -0,0 +1,64 @@
+import QtQuick
+import QtQuick.Layouts
+import Quickshell
+
+Item {
+  id: container
+
+  required property color boxColor
+  property double boxHeight
+  property double boxRadius
+  required property string boxState
+  property double boxWidth
+  property double openHeight
+  property double openWidth
+  required property Component sourceComponent
+
+  Layout.topMargin: 0
+  implicitHeight: boxHeight || 50
+  implicitWidth: boxWidth || 30
+  state: boxState
+
+  Behavior on anchors.topMargin {
+	SmoothAnim {}
+  }
+  Behavior on implicitHeight {
+	SmoothAnim {}
+  }
+  Behavior on implicitWidth {
+	SmoothAnim {}
+  }
+  states: [
+	State {
+	  name: ""
+	},
+	State {
+	  name: "open"
+
+	  PropertyChanges {
+		container.Layout.topMargin: 35
+		container.implicitHeight: openHeight || 150
+		container.implicitWidth: openWidth || 200
+	  }
+	}
+  ]
+
+  Rectangle {
+	id: mainBackground
+
+	anchors.fill: parent
+	color: container.boxColor
+	radius: container.boxRadius || 10
+
+	Loader {
+	  anchors.fill: parent
+	  sourceComponent: container.sourceComponent
+	}
+  }
+
+  component SmoothAnim: SpringAnimation {
+	damping: 0.18
+	mass: 0.5
+	spring: 3
+  }
+}

Components/Workspace.qml

@@ -1,17 +1,18 @@
 pragma ComponentBehavior: Bound
+import QtQuick
+import QtQuick.Effects
+import QtQuick.Layouts
 
 import Quickshell
 import Quickshell.Hyprland
-import QtQuick
-import QtQuick.Layouts
-import QtQuick.Effects
 
 import "Color.js" as Colors
 
 Item {
   id: workspaceRowContainer
+
   required property HyprlandMonitor monitor
-	state: ""
+  property int textBottomMargin: 0
 
   function getNextEmptyWorkspaceId() {
 	let maxId = 0;
@@ -26,14 +27,53 @@ Item {
 	}
 
 	// Returns the next global workspace ID (e.g., if max is 3, returns 4)
-		console.log(maxId + 1)
+	console.log(maxId + 1);
 	return maxId === 0 ? 1 : maxId + 1;
   }
 
+  implicitHeight: 65
+  implicitWidth: 200
+  state: ""
+
+  Behavior on anchors.topMargin {
+	NumberAnimation {
+	  duration: 100
+	}
+  }
+  states: [
+	State {
+	  name: ""
+	  // When not hovered, stay at default
+	  when: !workspaceHoverHandler.hovered
+
+	  PropertyChanges {
+		workspaceRowContainer.anchors.topMargin: -33
+	  }
+	},
+	State {
+	  name: "hovered"
+	  // Keep the workspace dropped whenever hovered is true
+	  when: workspaceHoverHandler.hovered
+
+	  PropertyChanges {
+		workspaceRowContainer.anchors.topMargin: -20
+	  }
+
+	  PropertyChanges {
+		workspaceRowContainer.textBottomMargin: 7
+	  }
+	}
+  ]
+  Behavior on textBottomMargin {
+	NumberAnimation {
+	  duration: 80
+	}
+  }
+
   anchors {
-		top: parent.top
 	left: parent.left
 	leftMargin: 15
+	top: parent.top
 	topMargin: -33
   }
 
@@ -41,62 +81,100 @@ Item {
 	id: workspaceHoverHandler
   }
 
-	Behavior on anchors.topMargin {
-		NumberAnimation { duration: 100 }
-	}
-
-	property int textBottomMargin: 0
-
-	Behavior on textBottomMargin {
-		NumberAnimation {duration: 80}
-	}
-
-	states: [
-		State {
-			name: ""
-			// When not hovered, stay at default
-			when: !workspaceHoverHandler.hovered
-			PropertyChanges { workspaceRowContainer.anchors.topMargin: -33 }
-		},
-		State {
-			name: "hovered"
-			// Keep the workspace dropped whenever hovered is true
-			when: workspaceHoverHandler.hovered
-			PropertyChanges { workspaceRowContainer.anchors.topMargin: -20 }
-			PropertyChanges { workspaceRowContainer.textBottomMargin: 7 }
-		}
-	]
-
-	implicitWidth: 200
-	implicitHeight: 65
-
   Row {
 	id: workspaceRow
-		spacing: 5
 
+	spacing: 5
 
 	Repeater {
 	  model: Hyprland.workspaces.values
 
 	  Item {
 		id: selectorContainer
-				required property int index
+
+		property HyprlandWorkspace activeWorkspace: workspaceRowContainer.monitor.activeWorkspace
 		property HyprlandWorkspace currentWorkspace: Hyprland.workspaces.values[index]
 		property HyprlandWorkspace globalFocusedWorkspace: Hyprland.focusedWorkspace
-				implicitHeight: 50
+		required property int index
-				implicitWidth: currentWorkspace.focused && workspaceRowContainer.state == "hovered" ? 50 : workspaceRowContainer.state == "hovered" ? 30 : 25
 
+		function getImplicitWidth() {
+		  let implicitWidth = 25;
+
+		  if (workspaceRowContainer.state == "hovered") {
+			implicitWidth += 5;
+			if (currentWorkspace.focused) {
+			  implicitWidth += 20;
+			}
+		  }
+		  return implicitWidth;
+		}
+
+		function shouldBeVisible() {
+		  let isSpecialWorkspace = !selectorContainer.currentWorkspace.name.includes("special:");
+		  let isCurrentMonitor = Hyprland.workspaces.values[index].monitor
+			  == workspaceRowContainer.monitor;
+		  return isSpecialWorkspace && isCurrentMonitor;
+		}
+
+		implicitHeight: 50
+		implicitWidth: getImplicitWidth()
+		visible: shouldBeVisible()
+
+		Behavior on anchors.topMargin {
+		  NumberAnimation {
+			duration: 100
+		  }
+		}
+		Behavior on implicitWidth {
+		  NumberAnimation {
+			duration: 100
+		  }
+		}
+		states: [
+		  State {
+			name: ""
+			when: !selectorHoverHandler.hovered
+
+			PropertyChanges {
+			  selectorContainer.anchors.topMargin: 0
+			}
+		  },
+		  State {
+			name: "individualHovered"
+			when: selectorHoverHandler.hovered
+
+			PropertyChanges {
+			  selectorContainer.anchors.topMargin: 10
+			}
+		  },
+		  State {
+			name: "workspaceSwitched"
+
+			PropertyChanges {
+			  selectorContainer.anchors.topMargin: 5
+			}
+		  }
+		]
+
+		// onActiveWorkspaceChanged: {
+		//   if (workspaceRowContainer.monitor.activeWorkspace.id == "1") {}
+		//   if (workspaceRowContainer.monitor.activeWorkspace.id == "4") {}
+		// }
 		onGlobalFocusedWorkspaceChanged: {
-					if (globalFocusedWorkspace.id === currentWorkspace.id) {
+		  if (globalFocusedWorkspace.name === currentWorkspace.name && globalFocusedWorkspace.monitor
-						selectorContainer.state = "workspaceSwitched"
+			  === workspaceRowContainer.monitor && workspaceRowContainer.monitor.activeWorkspace.name
-						switchFeedbackTimer.restart()
+			  === currentWorkspace.name) {
+			selectorContainer.state = "workspaceSwitched";
+			switchFeedbackTimer.restart();
 		  }
 		}
 
 		Timer {
 		  id: switchFeedbackTimer
+
 		  interval: 200
 		  repeat: false
+
 		  onTriggered: selectorContainer.state = ""
 		}
 
@@ -111,6 +189,7 @@ Item {
 
 		MouseArea {
 		  id: selectorMouseArea
+
 		  anchors.fill: parent
 		  hoverEnabled: true
 		  propagateComposedEvents: true
@@ -118,102 +197,88 @@ Item {
 		  onClicked: selectorContainer.currentWorkspace.activate()
 		}
 
-				Behavior on anchors.topMargin {
-					NumberAnimation {duration: 100}
-				}
-
-				Behavior on implicitWidth {
-					NumberAnimation {duration: 100}
-				}
-
-				states: [
-					State {
-						name: ""
-						when: !selectorHoverHandler.hovered
-						PropertyChanges { selectorContainer.anchors.topMargin: 0 }
-					},
-					State {
-						name: "individualHovered"
-						when: selectorHoverHandler.hovered
-						PropertyChanges { selectorContainer.anchors.topMargin: 10 }
-					},
-					State {
-						name: "workspaceSwitched"
-						PropertyChanges { selectorContainer.anchors.topMargin: 5 }
-					}
-				]
-
-				visible: Hyprland.workspaces.values[index].monitor == monitor && index > 0 && selectorContainer.currentWorkspace.name != "special:scratch" && selectorContainer.currentWorkspace.name != "special:music"
-
 		RectangularShadow {
 		  anchors.fill: selector
+		  blur: 20
+		  color: Colors.crust
 		  offset.x: 3
 		  offset.y: 3
 		  radius: selector.radius
-					blur: 20
-					z: -1
 		  spread: 7
-					color: Colors.crust
+		  z: -1
 		}
-				Rectangle {
-					z: 1
-					id: selector
-					state: ""
 
-					color: selectorContainer.currentWorkspace.focused ? Colors.mauve : workspaceRowContainer.monitor.activeWorkspace.id == selectorContainer.currentWorkspace.id ? Colors.lavender : Colors.overlay1
+		Rectangle {
-					radius: 8
+		  id: selector
+
 		  anchors.fill: parent
+		  color: selectorContainer.currentWorkspace.focused ? Colors.mauve :
+															  workspaceRowContainer.monitor.activeWorkspace
+															  == selectorContainer.currentWorkspace ? Colors.lavender : Colors.overlay1
+		  radius: 8
+		  state: ""
+		  z: 1
 
 		  Behavior on color {
-						ColorAnimation {duration: 100}
+			ColorAnimation {
+			  duration: 100
+			}
 		  }
 
 		  Text {
 			id: workspaceIdentifier
-						text: selectorContainer.currentWorkspace.name
+
 			font.family: "FiraMono Nerd Font"
 			font.pixelSize: workspaceRowContainer.state == "hovered" ? 15 : 13
+			text: selectorContainer.currentWorkspace.name
+
 			anchors {
 			  bottom: parent.bottom
-							horizontalCenter: parent.horizontalCenter
 			  bottomMargin: workspaceRowContainer.textBottomMargin
+			  horizontalCenter: parent.horizontalCenter
+			}
+		  }
+		}
 	  }
 	}
 
-				}
-			}
-		}
 	Item {
 	  implicitHeight: 40
 	  implicitWidth: 20
 
+	  Behavior on anchors.topMargin {
+		NumberAnimation {
+		  duration: 100
+		}
+	  }
 
 	  anchors {
 		top: parent.top
 		topMargin: workspaceRowContainer.state == "hovered" ? 0 : -10
 	  }
 
-			Behavior on anchors.topMargin {
-				NumberAnimation {duration: 100}
-			}
-
 	  MouseArea {
 		id: newWorkspaceButton
+
 		anchors.fill: parent
 
-				onClicked: Hyprland.dispatch(`hl.dsp.focus({workspace = ${workspaceRowContainer.getNextEmptyWorkspaceId()}})`)
+		onClicked: Hyprland.dispatch(`hl.dsp.focus({workspace = 
+${workspaceRowContainer.getNextEmptyWorkspaceId()}})`)
 	  }
+
 	  Rectangle {
-				color: Colors.surface2
 		anchors.fill: parent
-				radius: 10
 		border.color: Colors.text
 		border.width: 2
+		color: Colors.surface2
+		radius: 10
+
 		Text {
-					text: "+"
 		  color: Colors.text
 		  font.family: "FiraMono Nerd Font"
 		  font.pixelSize: 20
+		  text: "+"
+
 		  anchors {
 			bottom: parent.bottom
 			horizontalCenter: parent.horizontalCenter