From 367cec54c5345f9f10ddc4c2bd8f25ae2023a763 Mon Sep 17 00:00:00 2001
From: Trianta <56975502+Trimutex@users.noreply.github.com>
Date: Thu, 8 Feb 2024 03:57:45 -0600
Subject: [PATCH] Update armory config

---
 hypr/hyprland.conf    |  8 ++++----
 hypr/theme.conf       |  2 +-
 hypr/windowrules.conf | 20 ++++++++++++--------
 waybar/config         |  6 +++---
 waybar/style.css      | 12 ++++++------
 5 files changed, 26 insertions(+), 22 deletions(-)

diff --git a/hypr/hyprland.conf b/hypr/hyprland.conf
index c09b82d..08f0f57 100755
--- a/hypr/hyprland.conf
+++ b/hypr/hyprland.conf
@@ -2,12 +2,12 @@
 # █░▀░█ █▄█ █░▀█ █ ░█░ █▄█ █▀▄
 
 # Day
-monitor=DP-2, highres, 0x1080, 1, vrr, 1
+monitor=DP-1, highres, 0x1080, 1, vrr, 1
 monitor=DP-3, highres, 760x0, 1, vrr, 1
 workspace = DP-3, 5
 
 # Night
-#monitor=DP-2, highrr, 0x0, 1, bitdepth, 10, vrr, 1
+#monitor=DP-1, highrr, 0x0, 1, bitdepth, 10, vrr, 1
 #monitor=DP-3, disable
 
 
@@ -24,7 +24,7 @@ exec-once = ~/.config/waybar/autobar.sh
 exec-once = dunst # start notification demon
 exec-once = swww init
 exec-once = syncthing --no-browser
-exec-once = xwaylandvideobridge
+#exec-once = xwaylandvideobridge
 exec-once = linux-discord-rich-presence -c ~/.config/linux-discord-rich-presencerc 
 
 
@@ -61,7 +61,7 @@ input {
 # █░░ ▄▀█ █▄█ █▀█ █░█ ▀█▀ █▀
 # █▄▄ █▀█ ░█░ █▄█ █▄█ ░█░ ▄█
 
-workspace = DP-2, 1
+workspace = DP-1, 1
 
 dwindle {
     pseudotile = yes
diff --git a/hypr/theme.conf b/hypr/theme.conf
index 703d339..c34ce8c 100644
--- a/hypr/theme.conf
+++ b/hypr/theme.conf
@@ -30,7 +30,7 @@ general {
     col.active_border = 0xff$yellowAlpha 0xff$mauveAlpha 45deg
     col.inactive_border = rgba(b4befecc) rgba(6c7086cc) 45deg
     layout = dwindle
-    resize_on_border = true
+    resize_on_border = false
 }
 
 group {
diff --git a/hypr/windowrules.conf b/hypr/windowrules.conf
index c7fe6ef..376d72d 100644
--- a/hypr/windowrules.conf
+++ b/hypr/windowrules.conf
@@ -52,8 +52,11 @@ windowrulev2 = float,class:^(io.gitlab.theevilskeleton.Upscaler)$ #Upscaler-Gtk
 windowrulev2 = float,class:^(pavucontrol)$
 windowrulev2 = float,class:^(org.kde.polkit-kde-authentication-agent-1)$
 
+windowrulev2 = tile,class:^(Alacritty.*)$
 windowrulev2 = pseudo,class:^(Alacritty.*)$
 windowrulev2 = pseudo,class:^(firefox.*)$
+windowrulev2 = float, class:^(Steam)$ 
+windowrulev2 = float, class:^(steam)$ 
 
 # Development
 windowrulev2 = float, title:^(SnakePlusPlus)$ 
@@ -63,11 +66,12 @@ windowrulev2 = float, title:^(TetrisPlusPlus)$
 windowrulev2 = center, title:^(TetrisPlusPlus)$ 
 
 # Games
-windowrulev2 = pseudo, class:(Minecraft.*)
-windowrulev2 = size 2646 1108, class:(Minecraft.*)
-windowrulev2 = pseudo, title:(Warframe.*)
-windowrulev2 = size 2646 1108, title:(Warframe.*)
-windowrulev2 = pseudo, class:(steam_app_1361210)
-windowrulev2 = size 2646 1108, class:(steam_app_1361210)
-windowrulev2 = pseudo, class:(Mindustry)
-windowrulev2 = size 2646 1108, class:(Mindustry)
+windowrulev2 = tile, class:^(league.*)$
+windowrulev2 = pseudo, class:^(league.*)$
+windowrulev2 = size 2646 1108, class:^(league.*)$
+windowrulev2 = pseudo, class:^(Minecraft.*)$
+windowrulev2 = size 2646 1108, class:^(Minecraft.*)$
+windowrulev2 = pseudo, class:^(steam_app_.*)$
+windowrulev2 = size 2646 1108, class:^(steam_app_.*)$
+windowrulev2 = pseudo, class:^(steam_proton)$
+windowrulev2 = size 2646 1108, class:^(steam_proton)$
diff --git a/waybar/config b/waybar/config
index a7e6ec0..877b9b3 100755
--- a/waybar/config
+++ b/waybar/config
@@ -1,11 +1,11 @@
 [
     {
         "name": "main",
-        "layer": "bottom",
+        "layer": "top",
         "position": "bottom",
         "height": 48,
         "spacing": 4,
-        "output": "DP-2",
+        "output": "DP-1",
         "margin-left": 800,
         "margin-right": 800,
         "modules-left": [
@@ -117,7 +117,7 @@
             "return-type": "json",
             "format": "{}",
             "tooltip": true,
-            "interval": 600
+            "interval": 3600
         }
     }
 ]
diff --git a/waybar/style.css b/waybar/style.css
index 0e48813..b2ef14f 100755
--- a/waybar/style.css
+++ b/waybar/style.css
@@ -10,8 +10,8 @@
 }
 
 window#waybar {
-    background: alpha(@surface2, 0.6);
-    border: 4px inset @yellow;
+    background: alpha(@base, 0.6);
+    border: 4px solid @sapphire;
     border-radius: 8px;
 	color: @text;
 }
@@ -25,20 +25,20 @@ window#waybar.hidden {
 }
 
 #workspaces button {
-    color: @mauve;
+    color: @blue;
     background: transparent;
     transition: all 0.1s ease;
 }
 
 #workspaces button.active {
-    background-color: @yellow;
+    background-color: @blue;
     margin: 4px;
     border-radius: 6px;
     transition: all 0.1s ease;
 }
 
 .modules-left {
-    color: @mauve;
+    color: @blue;
     margin: 2px;
     border-radius: 16px;
 }
@@ -47,7 +47,7 @@ window#waybar.hidden {
     margin: 2px;
 }
 .modules-right {
-    color: @mauve;
+    color: @blue;
     border-radius: 16px;
     margin: 2px;
 }