From ecba5aa626ce4f12932a8ad6cc81ebdac9458c5f Mon Sep 17 00:00:00 2001
From: Price Hiller <price@orion-technologies.io>
Date: Tue, 9 Aug 2022 00:27:14 -0500
Subject: [PATCH] feat(hypr): hypr is back

---
 dots/.config/hypr/hyprland.conf              |  4 +-
 dots/.config/hypr/scripts/launch-waybar.bash |  9 ++++
 dots/.config/hypr/wm/bindings.conf           | 44 ++++++++++++++++----
 3 files changed, 49 insertions(+), 8 deletions(-)
 create mode 100755 dots/.config/hypr/scripts/launch-waybar.bash

diff --git a/dots/.config/hypr/hyprland.conf b/dots/.config/hypr/hyprland.conf
index 13eaff76..0773f984 100644
--- a/dots/.config/hypr/hyprland.conf
+++ b/dots/.config/hypr/hyprland.conf
@@ -1,5 +1,6 @@
 ### Monitor Configuration ###
-monitor=,preferred,auto,1
+monitor=eDP-2,disabled
+monitor=DP-3,preferred,auto,1
 
 ### Input Configuration ###
 input {
@@ -57,3 +58,4 @@ gestures {
 }
 
 source=~/.config/hypr/wm/bindings.conf
+exec=~/.config/hypr/scripts/launch-waybar.bash
diff --git a/dots/.config/hypr/scripts/launch-waybar.bash b/dots/.config/hypr/scripts/launch-waybar.bash
new file mode 100755
index 00000000..0ec7357d
--- /dev/null
+++ b/dots/.config/hypr/scripts/launch-waybar.bash
@@ -0,0 +1,9 @@
+#!/usr/bin/env bash
+
+main() {
+	if pidof waybar >/dev/null 2>&1; then
+		killall -9 waybar
+	fi
+	waybar &
+}
+main
diff --git a/dots/.config/hypr/wm/bindings.conf b/dots/.config/hypr/wm/bindings.conf
index 4d87f807..5d769bd7 100644
--- a/dots/.config/hypr/wm/bindings.conf
+++ b/dots/.config/hypr/wm/bindings.conf
@@ -30,7 +30,7 @@ bind=SUPERSHIFT,up,movewindow,u
 bind=SUPERSHIFT,down,movewindow,d
 
 bind=SUPER,RETURN,exec,wezterm
-bind=SUPER,S,exec,wofi --show drun -o DP-3
+bind=SUPER,SPACE,exec,wofi --show drun -o DP-3
 bind=SUPER,F,fullscreen
 bind=SUPER,Q,killactive,
 bind=SUPER,V,togglefloating,
@@ -45,10 +45,40 @@ bind=SUPER,right,movefocus,r
 bind=SUPER,up,movefocus,u
 bind=SUPER,down,movefocus,d
 
-bind=SUPER,H,workspace,m-1
-bind=SUPER,L,workspace,m+1
-bind=CTRLSUPER,S,togglespecialworkspace
+### Workspaces ###
 
-bind=ALTSUPER,H,movetoworkspace,e-1
-bind=ALTSUPER,L,movetoworkspace,e+1
-bind=SUPERSHIFT,S,movetoworkspace,special
+bind=SUPER,H,workspace,-1
+bind=SUPER,L,workspace,+1
+
+bind=SUPERSHIFT,H,movetoworkspace,-1
+bind=SUPERSHIFT,L,movetoworkspace,+1
+
+bind=SUPER,1,workspace,1
+bind=SUPER,2,workspace,2
+bind=SUPER,3,workspace,3
+bind=SUPER,4,workspace,4
+bind=SUPER,5,workspace,5
+bind=SUPER,6,workspace,6
+bind=SUPER,7,workspace,7
+bind=SUPER,8,workspace,8
+bind=SUPER,9,workspace,9
+
+
+bind=SUPERSHIFT,1,movetoworkspace,1
+bind=SUPERSHIFT,2,movetoworkspace,2
+bind=SUPERSHIFT,3,movetoworkspace,3
+bind=SUPERSHIFT,4,movetoworkspace,4
+bind=SUPERSHIFT,5,movetoworkspace,5
+bind=SUPERSHIFT,6,movetoworkspace,6
+bind=SUPERSHIFT,7,movetoworkspace,7
+bind=SUPERSHIFT,8,movetoworkspace,8
+bind=SUPERSHIFT,9,movetoworkspace,9
+
+### Special Workspace ###
+bind=SUPER,S,submap,specialworkspace
+submap=specialworkspace
+
+bind=,s,togglespecialworkspace
+bind=,a,movetoworkspace,special
+bind=,escape,submap,reset
+submap=reset