diff --git a/config/.config/gtk-3.0/settings.ini b/config/.config/gtk-3.0/settings.ini
index f9f7d1e..44acf06 100644
--- a/config/.config/gtk-3.0/settings.ini
+++ b/config/.config/gtk-3.0/settings.ini
@@ -1,7 +1,7 @@
[Settings]
gtk-theme-name=rose-pine-gtk-theme-unstable-latest-Dark
gtk-icon-theme-name=Papirus
-gtk-font-name=SF Pro Text 11
+gtk-font-name=SF Pro 13
gtk-cursor-theme-name=Bibata-Original-Classic
gtk-cursor-theme-size=24
gtk-toolbar-style=GTK_TOOLBAR_BOTH
diff --git a/fonts/.config/fontconfig/fonts.conf b/fonts/.config/fontconfig/fonts.conf
index 5bbf4b5..85c37b9 100644
--- a/fonts/.config/fontconfig/fonts.conf
+++ b/fonts/.config/fontconfig/fonts.conf
@@ -1,27 +1,58 @@
-
+
-
- sans-serif
-
- NotoSans
- NotoSansCJK
- SymbolsNerdFont
-
-
-
- serif
-
- NotoSerif
- NotoSerifCJK
- SymbolsNerdFont
-
-
-
- monospace
-
- Iosevka
- SymbolsNerdFontMono
-
-
+
+
+ sans-serif
+
+
+ Liberation Sans
+
+
+
+
+
+ serif
+
+
+ Liberation Serif
+
+
+
+
+
+ monospace
+
+
+ CaskaydiaMono Nerd Font
+
+
+
+
+ system-ui
+
+ Liberation Sans
+
+
+
+
+ ui-monospace
+
+ monospace
+
+
+
+
+ -apple-system
+
+ Liberation Sans
+
+
+
+
+ BlinkMacSystemFont
+
+ Liberation Sans
+
+
diff --git a/waybar/.config/waybar/common.jsonc b/waybar/.config/waybar/common.jsonc
index f4fb77f..4f6cbdb 100644
--- a/waybar/.config/waybar/common.jsonc
+++ b/waybar/.config/waybar/common.jsonc
@@ -1,16 +1,13 @@
{
"layer": "top",
"position": "top",
- "margin": "5 0 0",
"mod": "dock",
"exclusive": true,
"passthrough": false,
"gtk-layer-shell": true,
"height": 5,
- "margin-bottom": 0,
- "margin-top": 5,
- "margin-left": 10,
- "margin-right": 10,
+ "margin": "5 10 0 10",
+ // Workspace and Window Management
"sway/workspaces": {
"disable-scroll": true,
"format": "{name} {icon}",
@@ -32,10 +29,28 @@
"(.*) - zsh": "> [$1]"
}
},
+ // System Tray
"tray": {
"icon-size": 18,
"spacing": 5
},
+ "group/tray-expander": {
+ "orientation": "inherit",
+ "drawer": {
+ "transition-duration": 600,
+ "children-class": "tray-group-item"
+ },
+ "modules": [
+ "custom/expand-icon",
+ "tray",
+ "custom/notification"
+ ]
+ },
+ "custom/expand-icon": {
+ "format": " ",
+ "tooltip": false
+ },
+ // Date and Time
"clock": {
// DD-MM-YYYY
"format": " {0:%H:%M:%S %Z} {0:%d/%m/%Y}",
@@ -63,8 +78,9 @@
"weekdays": "{}",
"today": "{}"
}
- },
+ }
},
+ // Hardware Controls
"backlight": {
"device": "intel_backlight",
"format": "{icon} {percent}%",
@@ -78,43 +94,83 @@
"scroll-step": 0.2,
"min-length": 6
},
- // "pulseaudio": {
- // "format": "{icon} {volume}%",
- // "tooltip": false,
- // "format-muted": " Muted",
- // "on-click": "wpctl set-mute @DEFAULT_SINK@ toggle",
- // "on-click-right": "pavucontrol",
- // "scroll-step": 0.5,
- // "format-icons": {
- // "headphone": "",
- // "hands-free": "",
- // "headset": "",
- // "phone": "",
- // "portable": "",
- // "car": "",
- // "default": [
- // "",
- // "",
- // " "
- // ]
- // }
- // },
- // "pulseaudio#microphone": {
- // "format": "{format_source}",
- // "format-source": " {volume}%",
- // "format-source-muted": " Muted",
- // "on-click": "wpctl set-mute @DEFAULT_SOURCE@ toggle",
- // "on-click-right": "pavucontrol",
- // "on-scroll-up": "wpctl set-volume -l 1 @DEFAULT_SOURCE@ 5%+",
- // "on-scroll-down": "wpctl set-volume -l 1 @DEFAULT_SOURCE@ 5%-",
- // "scroll-step": 5
- // },
"temperature": {
"thermal-zone": 1,
"format": " {temperatureC}°C",
"critical-threshold": 80,
"format-critical": "{temperatureC}°C "
},
+ "cpu": {
+ "interval": 10,
+ "format": " {}%",
+ "max-length": 10
+ },
+ "memory": {
+ "interval": 30,
+ "format": " {used:0.1f}/{total:0.1f} GiB"
+ },
+ "disk": {
+ "interval": 30,
+ "format": " {used}/{total}",
+ "unit": "GiB",
+ "path": "/home"
+ },
+ "battery": {
+ "format": "{capacity}% {icon}",
+ "format-discharging": "{icon}",
+ "format-charging": "{icon}",
+ "format-plugged": "",
+ "format-icons": {
+ "charging": [
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ ""
+ ],
+ "default": [
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ ""
+ ]
+ },
+ "format-full": "",
+ "tooltip-format-discharging": "{power:>1.0f}W↓ {capacity}%",
+ "tooltip-format-charging": "{power:>1.0f}W↑ {capacity}%",
+ "interval": 5,
+ "states": {
+ "warning": 20,
+ "critical": 10
+ }
+ },
+ "pulseaudio": {
+ "format": "{icon}",
+ "on-click": "$TERMINAL --class=Wiremix -e wiremix",
+ "on-click-right": "pamixer -t",
+ "tooltip-format": "Playing at {volume}%",
+ "scroll-step": 5,
+ "format-muted": "",
+ "format-icons": {
+ "default": [
+ "",
+ "",
+ ""
+ ]
+ }
+ },
+ // Network and Connectivity
"network": {
"format-wifi": " {signalStrength}%",
"format-ethernet": "{ipaddr}/{cidr}",
@@ -132,6 +188,7 @@
"tooltip-format-enumerate-connected": "{device_alias}",
"on-click": "bluetoothctl toggle"
},
+ // Media Controls
"custom/playerctl": {
"format": "{icon}",
"return-type": "json",
@@ -157,6 +214,13 @@
"Paused": " "
}
},
+ // Notifications and Utilities
+ "custom/wf-recorder": {
+ "format": "",
+ "tooltip": false,
+ "on-click": "wf-recorder -f ~/Videos/$(date +%Y%m%d_%H%M%S).mp4",
+ "on-click-right": "pkill -f wf-recorder"
+ },
"custom/notification": {
"tooltip": false,
"format": "{icon}",
diff --git a/waybar/.config/waybar/config.jsonc b/waybar/.config/waybar/config.jsonc
index 2c0dde5..b9e1ae8 100644
--- a/waybar/.config/waybar/config.jsonc
+++ b/waybar/.config/waybar/config.jsonc
@@ -13,22 +13,7 @@
],
"output": [
"DP-1"
- ],
- "cpu": {
- "interval": 10,
- "format": " {}%",
- "max-length": 10
- },
- "memory": {
- "interval": 30,
- "format": " {used:0.1f}/{total:0.1f} GiB"
- },
- "disk": {
- "interval": 30,
- "format": " {used}/{total}",
- "unit": "GiB",
- "path": "/home"
- }
+ ]
},
{
"include": [
@@ -42,24 +27,13 @@
"custom/playerlabel"
],
"modules-right": [
- "custom/wf-recorder",
"custom/randwall",
- // "pulseaudio",
- // "custom/vpn",
- "custom/notification",
- "tray",
- "clock"
+ "clock",
+ "group/tray-expander"
],
"output": [
"HDMI-A-1"
]
- // "custom/vpn": {
- // "format": "{}",
- // "return-type": "json",
- // "interval": 1,
- // "exec": "/home/forbi/.local/bin/vpn",
- // "on-click": "/home/forbi/.local/bin/vpn toggle"
- // }
},
{
"include": [
@@ -73,105 +47,14 @@
"custom/playerlabel"
],
"modules-right": [
- // "custom/microphone",
"custom/randwall",
"pulseaudio",
"backlight",
"battery",
- // "tray",
- // "clock",
"group/tray-expander"
],
"output": [
"eDP-1"
- ],
- "group/tray-expander": {
- "orientation": "inherit",
- "drawer": {
- "transition-duration": 600,
- "children-class": "tray-group-item"
- },
- "modules": [
- "custom/expand-icon",
- "tray",
- "custom/notification",
- ]
- },
- "custom/expand-icon": {
- "format": " ",
- "tooltip": false
- },
- "tray": {
- "spacing": 12
- },
- "pulseaudio": {
- "format": "{icon}",
- "on-click": "$TERMINAL --class=Wiremix -e wiremix",
- "on-click-right": "pamixer -t",
- "tooltip-format": "Playing at {volume}%",
- "scroll-step": 5,
- "format-muted": "",
- "format-icons": {
- "default": [
- "",
- "",
- ""
- ]
- }
- },
- "battery": {
- "format": "{capacity}% {icon}",
- "format-discharging": "{icon}",
- "format-charging": "{icon}",
- "format-plugged": "",
- "format-icons": {
- "charging": [
- "",
- "",
- "",
- "",
- "",
- "",
- "",
- "",
- "",
- ""
- ],
- "default": [
- "",
- "",
- "",
- "",
- "",
- "",
- "",
- "",
- "",
- ""
- ]
- },
- "format-full": "",
- "tooltip-format-discharging": "{power:>1.0f}W↓ {capacity}%",
- "tooltip-format-charging": "{power:>1.0f}W↑ {capacity}%",
- "interval": 5,
- "states": {
- "warning": 20,
- "critical": 10
- }
- }
- // "custom/vpn": {
- // "format": "{}",
- // "return-type": "json",
- // "interval": 1,
- // "exec": "/home/forbi/.local/bin/vpn",
- // "on-click": "/home/forbi/.local/bin/vpn toggle"
- // }
- // "custom/microphone": {
- // "format": "{}",
- // "return-type": "json",
- // "exec": "~/.config/waybar/scripts/mic-status.sh --monitor",
- // "restart-interval": 1,
- // "on-click": "pavucontrol -t 4"
- // }
+ ]
}
-]
+]
\ No newline at end of file
diff --git a/waybar/.config/waybar/style.css b/waybar/.config/waybar/style.css
index b8ed5c4..4d51731 100644
--- a/waybar/.config/waybar/style.css
+++ b/waybar/.config/waybar/style.css
@@ -1,4 +1,3 @@
-/* General Reset and Base Styles */
* {
border: none;
border-radius: 0;
diff --git a/zsh/.config/zsh/zsh_history_fw b/zsh/.config/zsh/zsh_history_fw
index dd56703..9ddd226 100644
Binary files a/zsh/.config/zsh/zsh_history_fw and b/zsh/.config/zsh/zsh_history_fw differ
diff --git a/zsh/.config/zsh/zsh_history_main b/zsh/.config/zsh/zsh_history_main
new file mode 100644
index 0000000..7027593
Binary files /dev/null and b/zsh/.config/zsh/zsh_history_main differ