From 6f5d421b4debcd5f67c0e77003ce08dee4078c3a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20Av=C3=A9?= <email@thomasave.be>
Date: Sat, 20 Jan 2024 00:03:32 +0100
Subject: [PATCH] Ricing

---
 nvim/lua/plugins/catppuccin.lua |  2 +-
 nvim/lua/teaching.lua           |  2 +-
 waybar/config                   | 10 ++++-----
 waybar/style.css                | 38 ++++++++++++++++++++++-----------
 4 files changed, 32 insertions(+), 20 deletions(-)

diff --git a/nvim/lua/plugins/catppuccin.lua b/nvim/lua/plugins/catppuccin.lua
index 39ea191..51387e7 100644
--- a/nvim/lua/plugins/catppuccin.lua
+++ b/nvim/lua/plugins/catppuccin.lua
@@ -14,7 +14,7 @@ return {
                 TelescopeBorder = { bg = "#191926", fg = "#191926" },
                 TelescopePromptBorder = { bg = "#191926", fg = "#191926" },
                 TelescopeTitle = { fg = colors.blue },
-                WinSeparator = { fg = "#191926" }
+                WinSeparator = { fg = "#023269" }
             }
         end,
         color_overrides = {
diff --git a/nvim/lua/teaching.lua b/nvim/lua/teaching.lua
index 135c716..0ea9f32 100644
--- a/nvim/lua/teaching.lua
+++ b/nvim/lua/teaching.lua
@@ -33,8 +33,8 @@ local function should_load(path)
 end
 
 function teaching.load()
-    require("nvim-tree").open()
     require("trouble").open()
+    require("nvim-tree").open()
     local scan = require("plenary.scandir").scan_dir('.')
     local cwd = vim.fn.getcwd()
     for _, v in ipairs(scan) do
diff --git a/waybar/config b/waybar/config
index d0dce99..2360d38 100644
--- a/waybar/config
+++ b/waybar/config
@@ -1,15 +1,15 @@
 {
     "layer": "top", // Waybar at top layer
-    "height": 30, // Waybar height (to be removed for auto height)
+    "height": 35, // Waybar height (to be removed for auto height)
     "spacing": 4, // Gaps between modules (4px)
     "output": "DP-1",
     "modules-left": ["wlr/taskbar"],
     "modules-center": ["hyprland/workspaces"],
-    "modules-right": ["tray", "wireplumber", "cpu#cpu2", "cpu", "memory", "custom/updates", "temperature", "battery", "clock#clock2", "clock"],
+    "modules-right": ["tray", "wireplumber", "cpu#cpu2", "cpu", "memory", "custom/updates", "temperature", "battery", "clock", "clock#clock2"],
     "wlr/taskbar": {
         "on-click": "activate",
         "on-click-right": "close",
-        "format": "{icon}  {title:.30}",
+        "format": "{icon}  {title:.20}",
         "all-outputs": true
     },
     "wireplumber": {
@@ -31,13 +31,13 @@
         // "icon-size": 21,
         "spacing": 10
     },
-    "clock": {
+    "clock#clock2": {
         "timezone": "Europe/Brussels",
         "format": "{:%H:%M:%S}",
         "interval": 1,
 
     },
-    "clock#clock2": {
+    "clock": {
         "timezone": "Europe/Brussels",
         "format": "{:%Y-%m-%d}",
         "interval": 3600,
diff --git a/waybar/style.css b/waybar/style.css
index ef8cef5..467c266 100644
--- a/waybar/style.css
+++ b/waybar/style.css
@@ -1,12 +1,12 @@
 * {
     /* `otf-font-awesome` is required to be installed for icons */
-    font-family: Ubuntu;
-    font-size: 17px;
-    font-weight:500;
+    font-family: "Roboto Sans";
+    font-size: 18px;
+    font-weight:400;
 }
 
 window#waybar {
-    background-color: rgba(0, 0, 0, 0.3);
+    background-color: rgba(0, 0, 0, 0.2);
     color: #ffffff;
     transition-property: background-color;
     transition-duration: .5s;
@@ -26,9 +26,10 @@ button:hover {
     box-shadow: inset 0 0 #ffffff;
 }
 #workspaces button {
-    padding: 0 8px;
+    padding: 0 5px;
     background-color: transparent;
     color: #ffffff;
+    border-radius: 2px;
 }
 
 #workspaces button:hover {
@@ -62,21 +63,32 @@ button:hover {
 #custom-updates,
 #custom-powermode,
 #tray {
-    padding: 0 12px;
-    border-radius: 5px;
+    padding: 0 14px;
+    border-radius: 7px;
     color: #ffffff;
+    background-color: #1f2430;
+    margin-left:4px;
+    margin-right:4px;
+    margin-top:2px;
+    margin-bottom:2px;
+}
+
+#clock.clock2,
+#cpu.cpu2,
+#memory,
+#temperature {
     background-color: #002F5F;
-    margin-left:2px;
-    margin-right:2px;
 }
 
 #taskbar button {
     padding: 0 12px;
-    border-radius: 5px;
+    border-radius: 7px;
     color: #ffffff;
     background-color: #1f2430;
-    margin-left:2px;
-    margin-right:2px;
+    margin-left:4px;
+    margin-right:4px;
+    margin-top:2px;
+    margin-bottom:2px;
 }
 #taskbar button.active {
     background-color: #002F5F;
@@ -95,7 +107,7 @@ window#waybar.empty #window {
 }
 
 #workspaces {
-    margin: 0 10px;
+    margin: 4px 9px;
 }
 
 /* If workspaces is the leftmost module, omit left margin */