From 881d8b20e45869d4ac0a1bc33ab6cb4ce61f6ec1 Mon Sep 17 00:00:00 2001
From: TolaMironcenko <mironcenkotola@gmail.com>
Date: Wed, 8 May 2024 23:55:26 +0700
Subject: [PATCH] fastfetch configuration and rofi and waybar configuration
 changes

---
 fastfetch/config.jsonc      | 180 +++++++++++++++++++++++++++++++-----
 rofi/powermenu/powermenu.sh |   4 +-
 waybar/config               |  14 +--
 3 files changed, 166 insertions(+), 32 deletions(-)

diff --git a/fastfetch/config.jsonc b/fastfetch/config.jsonc
index b8f605b..f25d417 100644
--- a/fastfetch/config.jsonc
+++ b/fastfetch/config.jsonc
@@ -1,33 +1,167 @@
 {
   "$schema": "https://github.com/fastfetch-cli/fastfetch/raw/dev/doc/json_schema.json",
+  "display": {
+    "separator": " ─▶ "
+  },
   "modules": [
     "title",
-    "separator",
-    "os",
-    "host",
-    "kernel",
-    "uptime",
-    "packages",
-    "shell",
-    "display",
+    {
+        "type": "custom",
+        "format": "─────────"
+    },
+    {
+        "type": "custom",
+        "format": "┌─────────── OS ──────────────┐"
+    },
+    {
+        "type": "os",
+        "key": "├▶ ",
+        "keyColor": "bright_blue"
+    },
+    {
+        "type": "host",
+        "key": "├▶ 󰍺 ",
+        "keyColor": "bright_blue"
+    },
+    {
+        "type": "kernel",
+        "key": "├▶ ",
+        "keyColor": "bright_blue"
+    },
+    {
+        "type": "uptime",
+        "key": "├▶ ",
+        "keyColor": "bright_blue"
+    },
+    {
+        "type": "packages",
+        "key": "├▶ 󰏗",
+        "keyColor": "bright_blue"
+    },
+    {
+        "type": "shell",
+        "key": "├▶ ",
+        "keyColor": "bright_blue"
+    },
+    {
+        "type": "custom",
+        "format": "└─────────────────────────────┘"
+    },
+    {
+        "type": "custom",
+        "format": "┌───────── GRAPHIC ─────────────┐"
+    },
+    {
+        "type": "display",
+        "key": "├▶  ",
+        "keyColor": "green"
+    },
     "de",
-    "wm",
-    "wmtheme",
-    "theme",
-    "icons",
-    "font",
-    "cursor",
-    "terminal",
-    "terminalfont",
-    "cpu",
-    "gpu",
-    "memory",
-    "swap",
-    "disk",
-    "localip",
+    {
+        "type": "wm",
+        "key": "├▶  ",
+        "keyColor": "green"
+    },
+    {
+        "type": "wmtheme",
+        "key": "├▶  ",
+        "keyColor": "green"
+    },
+    {
+        "type": "theme",
+        "key": "├▶  ",
+        "keyColor": "green"
+    },
+    {
+        "type": "icons",
+        "key": "├▶  ",
+        "keyColor": "green"
+    },
+    {
+        "type": "font",
+        "key": "├▶ ꬵ ",
+        "keyColor": "green"
+    },
+    {
+        "type": "cursor",
+        "key": "├▶ ",
+        "keyColor": "green"
+    },
+    {
+        "type": "terminal",
+        "key": "├▶  ",
+        "keyColor": "green"
+    },
+    {
+        "type": "terminalfont",
+        "key": "├▶ tꬵ ",
+        "keyColor": "green"
+    },
+    {
+        "type": "custom",
+        "format": "└───────────────────────────────┘"
+    },
+    {
+        "type": "custom",
+        "format": "┌───────── HARDWARE ─────────────┐"
+    },
+    {
+        "type": "cpu",
+        "key": "├▶  ",
+        "keyColor": "red"
+    },
+    {
+        "type": "gpu",
+        "key": "├▶  ",
+        "keyColor": "red"
+    },
+    {
+        "type": "memory",
+        "key": "├▶  ",
+        "keyColor": "red"
+    },
+    {
+        "type": "swap",
+        "key": "├▶ ",
+        "keyColor": "red"
+    },
+    {
+        "type": "disk",
+        "key": "├▶  (/)",
+        "keyColor": "red"
+    },
+    {
+        "type": "custom",
+        "format": "└────────────────────────────────┘"
+    },
+    {
+        "type": "custom",
+        "format": "┌────────── NET ──────────────┐"
+    },
+    {
+        "type": "localip",
+        "key": "├▶  ",
+        "keyColor": "yellow"
+    },
+    {
+        "type": "custom",
+        "format": "└─────────────────────────────┘"
+    },
     "battery",
     "poweradapter",
-    "locale",
+    {
+        "type": "custom",
+        "format": "┌────────── LOCALE ──────────────┐"
+    },
+    {
+        "type": "locale",
+        "key": "├▶  ",
+        "keyColor": "magenta"
+    },
+    {
+        "type": "custom",
+        "format": "└────────────────────────────────┘"
+    },
     "break",
     "colors"
   ]
diff --git a/rofi/powermenu/powermenu.sh b/rofi/powermenu/powermenu.sh
index b2e2572..841cfba 100755
--- a/rofi/powermenu/powermenu.sh
+++ b/rofi/powermenu/powermenu.sh
@@ -19,8 +19,8 @@ host=`hostname`
 
 # Options
 shutdown=''
-reboot=''
-lock=''
+reboot=''
+lock=''
 suspend=''
 logout=''
 yes=''
diff --git a/waybar/config b/waybar/config
index 87c9b94..72158b5 100644
--- a/waybar/config
+++ b/waybar/config
@@ -16,8 +16,8 @@
         "capslock": true,
         "format": "{name} {icon}",
         "format-icons": {
-            "locked": "",
-            "unlocked": ""
+            "locked": "",
+            "unlocked": ""
         }
     },
     "tray": {
@@ -38,7 +38,7 @@
     "temperature": {
         "critical-threshold": 80,
         "format": "{temperatureC}°C {icon}",
-        "format-icons": ["", "", "⚠"]
+        "format-icons": ["", "", ""]
     },
     "backlight": {
         "format": "{percent}% {icon}",
@@ -60,9 +60,9 @@
     },
     "network": {
         "format-wifi": "{essid} ({signalStrength}%) 󰤨",
-        "format-ethernet": "{ipaddr}/{cidr} ",
-        "tooltip-format": "{ifname} via {gwaddr} ",
-        "format-linked": "{ifname} (No IP) ",
+        "format-ethernet": "{ipaddr}/{cidr} ",
+        "tooltip-format": "{ifname} via {gwaddr} ",
+        "format-linked": "{ifname} (No IP) ",
         "format-disconnected": "Disconnected ⚠",
         "format-alt": "{ifname}: {ipaddr}/{cidr}"
     },
@@ -94,7 +94,7 @@
     },
     "disk": {
         "interval": 30,
-        "format": "/ {free}",
+        "format": " {free}",
         "unit": "GB"
     },
     "custom/spotify": {