From 10c5d8f9b3f972846ca6c60814942b2ec25eef02 Mon Sep 17 00:00:00 2001
From: Jonathan Bourdon <lowrad000@gmail.com>
Date: Thu, 2 Apr 2026 16:38:08 -0400
Subject: [PATCH] feat: more like omarchy

---
 hypr/.config/hypr/hyprland.conf    |  6 ++--
 waybar/.config/waybar/config.jsonc | 11 +++---
 waybar/.config/waybar/style.css    | 55 +++++++++++++++---------------
 3 files changed, 35 insertions(+), 37 deletions(-)

diff --git a/hypr/.config/hypr/hyprland.conf b/hypr/.config/hypr/hyprland.conf
index 4406bcd..33d92fd 100644
--- a/hypr/.config/hypr/hyprland.conf
+++ b/hypr/.config/hypr/hyprland.conf
@@ -73,8 +73,8 @@ env = QT_QPA_PLATFORMTHEME,qt5ct
 
 # https://wiki.hyprland.org/Configuring/Variables/#general
 general { 
-    gaps_in = 4
-    gaps_out = 8
+    gaps_in = 3
+    gaps_out = 6
     border_size = 1 
 
     # https://wiki.hyprland.org/Configuring/Variables/#variable-types for info about colors
@@ -92,7 +92,7 @@ general {
 
 # https://wiki.hyprland.org/Configuring/Variables/#decoration
 decoration {
-  rounding = 3
+  rounding = 2
   inactive_opacity = 1.00
   active_opacity = 1.00
   fullscreen_opacity = 1.00
diff --git a/waybar/.config/waybar/config.jsonc b/waybar/.config/waybar/config.jsonc
index 5427d08..4bf123a 100644
--- a/waybar/.config/waybar/config.jsonc
+++ b/waybar/.config/waybar/config.jsonc
@@ -2,9 +2,9 @@
   "layer": "top",
   "position": "top",
   "mod": "dock",
-  "margin-left": 8,
-  "margin-right": 8,
-  "margin-top": 8,
+  "margin-left": 0,
+  "margin-right": 0,
+  "margin-top": 0,
   "margin-bottom": 0,
   "exclusive": true,
   "passthrough": false,
@@ -57,7 +57,7 @@
     "tooltip": true
   },
   "tray": {
-    "icon-size": 18,
+    "icon-size": 16,
     "spacing": 6,
     "rotate": 0
   },
@@ -91,7 +91,6 @@
       "9": "󰎼",
       "10": "󰽽",
       "urgent": "",
-      "active": "",
       "default": "",
       "empty": ""
     }
@@ -105,7 +104,7 @@
     }
   },
   "clock": {
-    "format": "{:%R %a %d %b}",
+    "format": "{:%A %R}",
     "rotate": 0,
     "tooltip-format": "<tt>{calendar}</tt>",
     "calendar": {
diff --git a/waybar/.config/waybar/style.css b/waybar/.config/waybar/style.css
index 4179a79..b6aa6e8 100644
--- a/waybar/.config/waybar/style.css
+++ b/waybar/.config/waybar/style.css
@@ -1,6 +1,6 @@
 @import url("../rider-palette/palette.css");
 
-@define-color foreground @rider-fg-bright;
+@define-color foreground @rider-fg;
 @define-color foreground-muted @rider-fg-gutter;
 @define-color background @rider-bg;
 @define-color background-alt @rider-cursor-line;
@@ -11,23 +11,23 @@
 @define-color warning @rider-string;
 @define-color danger @rider-error;
 
+/*  font-family: 'JetBrainsMono Nerd Font Mono';*/
 * {
   color: @foreground;
-  font-family: 'JetBrainsMono Nerd Font Mono';
+  font-family: 'JetBrainsMono Nerd Font';
   font-size: 15px;
-  min-height: 0;
+  font-weight: 300;
 }
 
 window#waybar {
-  background: alpha(@background, 0.95);
-  border: 1px solid #595959;
-  border-radius: 6px;
+  background: @background;
+  border-radius: 0px;
   box-shadow: none;
   color: @foreground;
 }
 
-window#waybar > box {
-  padding: 8px;
+window#waybar>box {
+  padding: 6px 3px;
 }
 
 tooltip {
@@ -56,30 +56,30 @@ tooltip {
 #custom-power {
   background: alpha(@background, 0.56);
   border: 1px solid alpha(@foreground, 0.14);
-  border-radius: 9px;
+  border-radius: 8px;
   box-shadow: 0 8px 24px alpha(@background, 0.22);
-  margin: 0 4px;
-  padding: 0 12px;
-  min-height: 34px;
+  margin: 0 3px;
+  padding: 0 10px;
+  min-height: 30px;
 }
 
 #workspaces {
-  padding: 0 6px;
+  padding: 0 5px;
 }
 
 #workspaces button {
   all: initial;
-  font-size: 21px;
-  min-width: 22px;
-  padding: 0 4px;
-  margin: 5px 2px;
-  border-radius: 7px;
+  font-size: 18px;
+  min-width: 19px;
+  padding: 0 3px;
+  margin: 4px 2px;
+  border-radius: 6px;
   color: @foreground-muted;
   opacity: 0.9;
 }
 
 #workspaces button label {
-  font-size: 21px;
+  font-size: 18px;
 }
 
 #workspaces button.empty {
@@ -100,14 +100,14 @@ tooltip {
 
 #window {
   color: @foreground-muted;
-  padding-right: 16px;
+  padding-right: 14px;
 }
 
 #clock {
-  border-color: alpha(@accent, 0.35);
   color: @foreground;
-  font-weight: 400;
-  padding: 0 18px;
+  padding: 0 15px;
+  box-shadow: none;
+  border: none;
 }
 
 #network {
@@ -145,13 +145,12 @@ tooltip {
 }
 
 #tray {
-  padding: 0 14px;
+  padding: 0 12px;
 }
 
 #custom-power {
   color: @danger;
-  font-size: 22px;
-  padding: 0 13px;
+  padding: 0px 16px 0px 12px;
 }
 
 #custom-launcher:hover,
@@ -187,8 +186,8 @@ menu#menu {
 
 menu#menu menuitem {
   border-radius: 10px;
-  margin: 2px 4px;
-  padding: 6px 12px;
+  margin: 10px;
+  padding: 8px 12px;
 }
 
 menu#menu menuitem:hover {