From d892bb6db778be42c8656f755809124d3606c4e1 Mon Sep 17 00:00:00 2001
From: outfoxxed <outfoxxed@outfoxxed.me>
Date: Sun, 4 Jun 2023 14:09:47 -0700
Subject: [PATCH 1/2] Fix hy3 dispatchers in named workspaces

---
 src/main.cpp | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/main.cpp b/src/main.cpp
index f299fe9..97b0aa7 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -29,7 +29,7 @@ int workspace_for_action() {
 
 	int workspace_id = g_pCompositor->m_pLastMonitor->activeWorkspace;
 
-	if (workspace_id < 0) return -1;
+	if (workspace_id == -1) return -1;
 	auto* workspace = g_pCompositor->getWorkspaceByID(workspace_id);
 	if (workspace == nullptr) return -1;
 	if (workspace->m_bHasFullscreenWindow) return -1;
@@ -39,7 +39,7 @@ int workspace_for_action() {
 
 void dispatch_makegroup(std::string arg) {
 	int workspace = workspace_for_action();
-	if (workspace < 0) return;
+	if (workspace == -1) return;
 
 	if (arg == "h") {
 		g_Hy3Layout->makeGroupOnWorkspace(workspace, Hy3GroupLayout::SplitH);
@@ -60,7 +60,7 @@ std::optional<ShiftDirection> parseShiftArg(std::string arg) {
 
 void dispatch_movewindow(std::string value) {
 	int workspace = workspace_for_action();
-	if (workspace < 0) return;
+	if (workspace == -1) return;
 
 	auto args = CVarList(value);
 
@@ -72,7 +72,7 @@ void dispatch_movewindow(std::string value) {
 
 void dispatch_movefocus(std::string arg) {
 	int workspace = workspace_for_action();
-	if (workspace < 0) return;
+	if (workspace == -1) return;
 
 	if (auto shift = parseShiftArg(arg)) {
 		g_Hy3Layout->shiftFocus(workspace, shift.value());
@@ -81,17 +81,17 @@ void dispatch_movefocus(std::string arg) {
 
 void dispatch_raisefocus(std::string arg) {
 	int workspace = workspace_for_action();
-	if (workspace < 0) return;
+	if (workspace == -1) return;
 
 	g_Hy3Layout->raiseFocus(workspace);
 }
 
 void dispatch_debug(std::string arg) {
 	int workspace = workspace_for_action();
-	if (workspace < 0) return;
+	if (workspace == -1) return;
 
 	auto* root = g_Hy3Layout->getWorkspaceRootGroup(workspace);
-	if (workspace < 0) {
+	if (workspace == -1) {
 		Debug::log(LOG, "DEBUG NODES: no nodes on workspace");
 	} else {
 		Debug::log(LOG, "DEBUG NODES\n%s", root->debugNode().c_str());

From 7cd65054036e0d015cba3ec844eb90f984e1e1af Mon Sep 17 00:00:00 2001
From: outfoxxed <outfoxxed@outfoxxed.me>
Date: Sun, 4 Jun 2023 14:36:47 -0700
Subject: [PATCH 2/2] Remove explicit gcc12Stdenv in flake

---
 flake.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/flake.nix b/flake.nix
index 75e1b45..49a6a9e 100644
--- a/flake.nix
+++ b/flake.nix
@@ -8,7 +8,7 @@
     hyprlandSystems = fn: nixpkgs.lib.genAttrs (builtins.attrNames hyprland.packages) (system: fn system nixpkgs.legacyPackages.${system});
   in {
     packages = hyprlandSystems (system: pkgs: rec {
-      hy3 = pkgs.gcc12Stdenv.mkDerivation {
+      hy3 = pkgs.stdenv.mkDerivation {
         pname = "hy3";
         version = "0.1";
         src = ./.;
@@ -35,7 +35,7 @@
     });
 
     devShells = hyprlandSystems (system: pkgs: {
-      default = pkgs.mkShell.override { stdenv = pkgs.gcc12Stdenv; } {
+      default = pkgs.mkShell {
         name = "hy3";
 
         nativeBuildInputs = with pkgs; [