diff --git a/waybar/themes/ml4w-blur-custom/config b/waybar/themes/ml4w-blur-custom/config
index fdc9278..53151cf 100644
--- a/waybar/themes/ml4w-blur-custom/config
+++ b/waybar/themes/ml4w-blur-custom/config
@@ -19,11 +19,13 @@
"spacing": 0,
// Load Modules
- "include": ["~/dotfiles/waybar/modules.json"],
+ "include": ["~/dotfiles/waybar/themes/ml4w-blur-custom/modules.json"],
// Modules Left
"modules-left": [
- "custom/appmenu",
+ "custom/appmenuicon",
+ "hyprland/workspaces",
+ //"custom/appmenu",
//"group/settings",
"wlr/taskbar",
//"group/quicklinks",
@@ -32,9 +34,9 @@
],
// Modules Center
- "modules-center": [
- "hyprland/workspaces"
- ],
+ //"modules-center": [
+ // "hyprland/workspaces"
+ //],
// Modules Right
"modules-right": [
@@ -43,9 +45,11 @@
//"bluetooth",
//"battery",
"network",
- "group/hardware",
+ "cpu",
+ "memory",
+ //"group/hardware",
//"custom/cliphist",
- "idle_inhibitor",
+ //"idle_inhibitor",
"tray",
"custom/exit",
//"custom/ml4w-welcome",
diff --git a/waybar/themes/ml4w-blur-custom/modules.json b/waybar/themes/ml4w-blur-custom/modules.json
new file mode 100644
index 0000000..68b75ae
--- /dev/null
+++ b/waybar/themes/ml4w-blur-custom/modules.json
@@ -0,0 +1,382 @@
+// __ __ _ _
+// | \/ | ___ __| |_ _| | ___ ___
+// | |\/| |/ _ \ / _` | | | | |/ _ \/ __|
+// | | | | (_) | (_| | |_| | | __/\__ \
+// |_| |_|\___/ \__,_|\__,_|_|\___||___/
+//
+//
+// by Stephan Raabe (2023)
+// -----------------------------------------------------
+//
+{
+ // Workspaces
+ "hyprland/workspaces" : {
+ "on-click": "activate",
+ "active-only": false,
+ "all-outputs": true,
+ "format": "{}",
+ "format-icons": {
+ "urgent": "",
+ "active": "",
+ "default": ""
+ },
+ "persistent-workspaces": {
+ // START WORKSPACES
+ "*": 3
+ // END WORKSPACES
+ }
+ },
+
+ // Taskbar
+ "wlr/taskbar": {
+ "format": "{icon}",
+ "icon-size": 18,
+ "tooltip-format": "{title}",
+ "on-click": "activate",
+ "on-click-middle": "close",
+ "ignore-list": [
+ "Alacritty"
+ ],
+ "app_ids-mapping": {
+ "firefoxdeveloperedition": "firefox-developer-edition"
+ },
+ "rewrite": {
+ "Firefox Web Browser": "Firefox",
+ "Foot Server": "Terminal"
+ }
+ },
+
+ // Hyprland Window
+ "hyprland/window": {
+ "rewrite": {
+ "(.*) - Brave": "$1",
+ "(.*) - Chromium": "$1",
+ "(.*) - Brave Search": "$1",
+ "(.*) - Outlook": "$1",
+ "(.*) Microsoft Teams": "$1"
+ },
+ "separate-outputs": true
+ },
+
+ // ML4W Welcome App
+ "custom/ml4w-welcome": {
+ "on-click": "~/dotfiles/apps/ML4W_Welcome-x86_64.AppImage",
+ "format": " ",
+ "tooltip": false
+ },
+
+ // Empty
+ "custom/empty": {
+ "format": ""
+ },
+
+ // Youtube Subscriber Count
+ "custom/youtube": {
+ "format": " {}",
+ "exec": "python ~/private/youtube.py",
+ "restart-interval": 600,
+ "on-click": "chromium https://studio.youtube.com",
+ "tooltip": false
+ },
+
+ // Cliphist
+ "custom/cliphist": {
+ "format": "",
+ "on-click": "sleep 0.1 && ~/dotfiles/scripts/cliphist.sh",
+ "on-click-right": "sleep 0.1 && ~/dotfiles/scripts/cliphist.sh d",
+ "on-click-middle": "sleep 0.1 && ~/dotfiles/scripts/cliphist.sh w",
+ "tooltip": false
+ },
+
+ // Updates Count
+ "custom/updates": {
+ "format": " {}",
+ "tooltip-format": "{}",
+ "escape": true,
+ "return-type": "json",
+ "exec": "~/dotfiles/scripts/updates.sh",
+ "restart-interval": 60,
+ "on-click": "alacritty --class dotfiles-floating -e ~/dotfiles/scripts/installupdates.sh",
+ "on-click-right": "~/dotfiles/.settings/software.sh",
+ "tooltip": false
+ },
+
+ // Wallpaper
+ "custom/wallpaper": {
+ "format": "",
+ "on-click": "~/dotfiles/hypr/scripts/wallpaper.sh select",
+ "on-click-right": "~/dotfiles/hypr/scripts/wallpaper.sh",
+ "tooltip": false
+ },
+
+ // Waybar Themes
+ "custom/waybarthemes": {
+ "format": "",
+ "on-click": "~/dotfiles/waybar/themeswitcher.sh",
+ "tooltip": false
+ },
+
+ // Settings
+ "custom/settings": {
+ "format": "",
+ "on-click": "~/dotfiles/apps/ML4W_Dotfiles_Settings-x86_64.AppImage",
+ "tooltip": false
+ },
+
+ // Keybindings
+ "custom/keybindings": {
+ "format": "",
+ "on-click": "~/dotfiles/hypr/scripts/keybindings.sh",
+ "tooltip": false
+ },
+
+ // Filemanager Launcher
+ "custom/filemanager": {
+ "format": "",
+ "on-click": "~/dotfiles/.settings/filemanager.sh",
+ "tooltip": false
+ },
+
+ // Outlook Launcher
+ "custom/outlook": {
+ "format": "",
+ "on-click": "chromium --app=https://outlook.office.com/mail/",
+ "tooltip": false
+ },
+
+ // Teams Launcher
+ "custom/teams": {
+ "format": "",
+ "on-click": "chromium --app=https://teams.microsoft.com/go",
+ "tooltip": false
+ },
+
+ // Browser Launcher
+ "custom/browser": {
+ "format": "",
+ "on-click": "~/dotfiles/.settings/browser.sh",
+ "tooltip": false
+ },
+
+ // ChatGPT Launcher
+ "custom/chatgpt": {
+ "format": " ",
+ "on-click": "chromium --app=https://chat.openai.com",
+ "tooltip": false
+ },
+
+ // Calculator
+ "custom/calculator": {
+ "format": "",
+ "on-click": "qalculate-gtk",
+ "tooltip": false
+ },
+
+ // Windows VM
+ "custom/windowsvm": {
+ "format": "",
+ "on-click": "~/dotfiles/scripts/launchvm.sh",
+ "tooltip": false
+ },
+
+ // Rofi Application Launcher
+ "custom/appmenu": {
+ // START APPS LABEL
+ "format": "Apps",
+ // END APPS LABEL
+ "on-click": "sleep 0.2;rofi -show drun -replace",
+ "on-click-right": "~/dotfiles/hypr/scripts/keybindings.sh",
+ "tooltip": false
+ },
+
+ // Rofi Application Launcher
+ "custom/appmenuicon": {
+ "format": "",
+ "on-click": "rofi -show drun -replace",
+ "on-click-right": "~/dotfiles/hypr/scripts/keybindings.sh",
+ "tooltip": false
+ },
+
+ // Power Menu
+ "custom/exit": {
+ "format": "",
+ "on-click": "wlogout",
+ "tooltip": false
+ },
+
+ // Keyboard State
+ "keyboard-state": {
+ "numlock": true,
+ "capslock": true,
+ "format": "{name} {icon}",
+ "format-icons": {
+ "locked": "",
+ "unlocked": ""
+ }
+ },
+
+ // System tray
+ "tray": {
+ "icon-size": 21,
+ "spacing": 10
+ },
+
+ // Clock
+ "clock": {
+ // TIMEDATEFORMAT
+ "format": "{:%H:%M - %a}",
+ // "timezone": "America/New_York",
+ "tooltip-format": "{:%Y %B}\n{calendar}",
+ // START CLOCK FORMAT
+ "format-alt": "{:%Y-%m-%d}"
+ // END CLOCK FORMAT
+ },
+
+ // System
+ "custom/system": {
+ "format": "",
+ "tooltip": false
+ },
+
+ // CPU
+ "cpu": {
+ "format": " {usage}%",
+ "on-click": "alacritty -e htop"
+ },
+
+ // Memory
+ "memory": {
+ "format": " {used}G",
+ "on-click": "alacritty -e htop"
+ },
+
+ // Harddisc space used
+ "disk": {
+ "interval": 30,
+ "format": "D {percentage_used}% ",
+ "path": "/",
+ "on-click": "alacritty -e htop"
+ },
+
+ "hyprland/language": {
+ "format": "/ K {short}"
+ },
+
+ // Group Hardware
+ "group/hardware": {
+ "orientation": "inherit",
+ "drawer": {
+ "transition-duration": 300,
+ "children-class": "not-memory",
+ "transition-left-to-right": false
+ },
+ "modules": [
+ "custom/system",
+ "disk",
+ "cpu",
+ "memory",
+ "hyprland/language"
+ ]
+ },
+
+ // Group Settings
+ "group/settings": {
+ "orientation": "horizontal",
+ "modules": [
+ // START CHATGPT TOOGLE
+ "custom/chatgpt",
+ // END CHATGPT TOOGLE
+ "custom/settings",
+ "custom/waybarthemes",
+ "custom/wallpaper"
+ ]
+ },
+
+ // Group Quicklinks
+ "group/quicklinks": {
+ "orientation": "horizontal",
+ "modules": [
+ "custom/browser",
+ "custom/filemanager",
+ ]
+ },
+
+ // Network
+ "network": {
+ "format": "{ifname}",
+ "format-wifi": " {signalStrength}%",
+ "format-ethernet": " {ifname}",
+ "format-disconnected": "Disconnected",
+ "tooltip-format": " {ifname} via {gwaddri}",
+ "tooltip-format-wifi": " {ifname} @ {essid}\nIP: {ipaddr}\nStrength: {signalStrength}%\nFreq: {frequency}MHz\nUp: {bandwidthUpBits} Down: {bandwidthDownBits}",
+ "tooltip-format-ethernet": " {ifname}\nIP: {ipaddr}\n up: {bandwidthUpBits} down: {bandwidthDownBits}",
+ "tooltip-format-disconnected": "Disconnected",
+ "max-length": 50,
+ "on-click": "~/dotfiles/.settings/networkmanager.sh"
+ },
+
+ // Battery
+ "battery": {
+ "states": {
+ // "good": 95,
+ "warning": 30,
+ "critical": 15
+ },
+ "format": "{icon} {capacity}%",
+ "format-charging": " {capacity}%",
+ "format-plugged": " {capacity}%",
+ "format-alt": "{icon} {time}",
+ // "format-good": "", // An empty format will hide the module
+ // "format-full": "",
+ "format-icons": [" ", " ", " ", " ", " "]
+ },
+
+ // Pulseaudio
+ "pulseaudio": {
+ // "scroll-step": 1, // %, can be a float
+ "format": "{icon} {volume}%",
+ "format-bluetooth": "{volume}% {icon} {format_source}",
+ "format-bluetooth-muted": " {icon} {format_source}",
+ "format-muted": " {format_source}",
+ "format-source": "{volume}% ",
+ "format-source-muted": "",
+ "format-icons": {
+ "headphone": "",
+ "hands-free": "",
+ "headset": "",
+ "phone": "",
+ "portable": "",
+ "car": "",
+ "default": ["", "", ""]
+ },
+ "on-click": "pavucontrol"
+ },
+
+ // Bluetooth
+ "bluetooth": {
+ "format": " {status}",
+ "format-disabled": "",
+ "format-off": "",
+ "interval": 30,
+ "on-click": "blueman-manager",
+ "format-no-controller": ""
+ },
+
+ // Other
+ "user": {
+ "format": "{user}",
+ "interval": 60,
+ "icon": false,
+ },
+
+ // Idle Inhibator
+ "idle_inhibitor": {
+ "format": "{icon}",
+ "tooltip": true,
+ "format-icons":{
+ "activated": "",
+ "deactivated": ""
+ },
+ "on-click-right": "hyprlock"
+ }
+}
diff --git a/waybar/themes/ml4w-blur-custom/style.css b/waybar/themes/ml4w-blur-custom/style.css
index 8fa90c8..306d427 100644
--- a/waybar/themes/ml4w-blur-custom/style.css
+++ b/waybar/themes/ml4w-blur-custom/style.css
@@ -39,7 +39,7 @@ window#waybar {
#workspaces {
background: @workspacesbackground1;
- margin: 5px 1px 6px 1px;
+ margin: 5px 10px 6px 0px;
padding: 0px 1px;
border-radius: 15px;
border: 0px;
@@ -99,9 +99,9 @@ tooltip label {
#window {
background: @backgroundlight;
- margin: 8px 15px 8px 0px;
- padding: 2px 10px 0px 10px;
- border-radius: 12px;
+ margin: 6px 15px 6px 0px;
+ padding: 0px 10px 0px 10px;
+ border-radius: 15px;
color:@textcolor2;
font-size:16px;
font-weight:normal;
@@ -118,7 +118,7 @@ window#waybar.empty #window {
#taskbar {
background: @backgroundlight;
- margin: 6px 15px 6px 0px;
+ margin: 6px 10px 6px 0px;
padding:0px;
border-radius: 15px;
font-weight: normal;
@@ -133,17 +133,6 @@ window#waybar.empty #window {
padding: 0px 5px 0px 5px;
}
-/* -----------------------------------------------------
- * Modules
- * ----------------------------------------------------- */
-
-.modules-left > widget:first-child > #workspaces {
- margin-left: 0;
-}
-
-.modules-right > widget:last-child > #workspaces {
- margin-right: 0;
-}
/* -----------------------------------------------------
* Custom Quicklinks
@@ -223,23 +212,28 @@ window#waybar.empty #window {
* Custom Modules
* ----------------------------------------------------- */
-#custom-appmenu {
+#custom-appmenu, #custom-appmenuicon {
background-color: @backgrounddark;
font-size: 16px;
color: @textcolor1;
border-radius: 15px;
padding: 0px 10px 0px 10px;
- margin: 6px 15px 6px 14px;
+ margin: 6px 10px 6px 10px;
opacity:0.8;
border:3px solid @bordercolor;
}
+#custom-appmenuicon {
+ padding-right: 12px;
+ padding-left: 8px;
+}
+
/* -----------------------------------------------------
* Custom Exit
* ----------------------------------------------------- */
#custom-exit {
- margin: 0px 20px 0px 0px;
+ margin: 0px 15px 0px 0px;
padding:0px;
font-size:20px;
color: @iconcolor;
@@ -255,7 +249,7 @@ window#waybar.empty #window {
color: @textcolor2;
border-radius: 15px;
padding: 2px 10px 0px 10px;
- margin: 8px 15px 8px 0px;
+ margin: 8px 10px 8px 0px;
opacity:0.8;
}
@@ -292,10 +286,13 @@ window#waybar.empty #window {
* ----------------------------------------------------- */
#disk,#memory,#cpu,#language {
- margin:0px;
- padding:0px;
- font-size:16px;
- color:@iconcolor;
+ background-color: @backgroundlight;
+ font-size: 16px;
+ color: @textcolor2;
+ border-radius: 15px;
+ padding: 2px 10px 0px 10px;
+ margin: 8px 10px 8px 0px;
+ opacity:0.8;
}
#language {
@@ -312,7 +309,7 @@ window#waybar.empty #window {
color: @textcolor1;
border-radius: 15px;
padding: 1px 10px 0px 10px;
- margin: 6px 15px 6px 0px;
+ margin: 6px 10px 6px 0px;
opacity:0.8;
border:3px solid @bordercolor;
}
@@ -327,7 +324,7 @@ window#waybar.empty #window {
color: @textcolor2;
border-radius: 15px;
padding: 2px 10px 0px 10px;
- margin: 8px 15px 8px 0px;
+ margin: 8px 10px 8px 0px;
opacity:0.8;
}
@@ -346,7 +343,7 @@ window#waybar.empty #window {
color: @textcolor2;
border-radius: 15px;
padding: 2px 10px 0px 10px;
- margin: 8px 15px 8px 0px;
+ margin: 8px 10px 8px 0px;
opacity:0.8;
}
@@ -370,7 +367,7 @@ window#waybar.empty #window {
color: @textcolor2;
border-radius: 15px;
padding: 2px 10px 0px 10px;
- margin: 8px 15px 8px 0px;
+ margin: 8px 10px 8px 0px;
opacity:0.8;
}
@@ -390,7 +387,7 @@ window#waybar.empty #window {
color: @textcolor2;
border-radius: 15px;
padding: 2px 15px 0px 10px;
- margin: 8px 15px 8px 0px;
+ margin: 8px 10px 8px 0px;
opacity:0.8;
}
@@ -421,7 +418,7 @@ window#waybar.empty #window {
* ----------------------------------------------------- */
#tray {
- padding: 0px 15px 0px 0px;
+ padding: 0px 10px 0px 0px;
color: @textcolor3;
}