diff --git a/.install/packages/general-packages.sh b/.install/packages/general-packages.sh
index 039019c..badf97e 100644
--- a/.install/packages/general-packages.sh
+++ b/.install/packages/general-packages.sh
@@ -22,7 +22,8 @@ packagesPacman=(
"noto-fonts"
"otf-font-awesome"
"ttf-fira-sans"
- "ttf-fira-code"
+ "ttf-fira-code"
+ "ttf-firacode-nerd"
"ttf-firacode-nerd"
"figlet"
"vlc"
diff --git a/waybar/themes/ml4w-blur-custom/config b/waybar/themes/ml4w-blur-custom/config
index 0d6bf53..fa494dd 100644
--- a/waybar/themes/ml4w-blur-custom/config
+++ b/waybar/themes/ml4w-blur-custom/config
@@ -8,14 +8,15 @@
// by Stephan Raabe (2023)
// -----------------------------------------------------
//
-{
+[{
// General Settings
"layer": "top",
+ "output": ["eDP-1", "DP-1"],
"margin-top": 0,
"margin-bottom": 0,
"layer": "top",
"margin-left": 0,
- "margin-right": 0,
+ "margin-right": 0,
"spacing": 0,
// Load Modules
@@ -34,26 +35,51 @@
],
// Modules Center
- //"modules-center": [
- // "hyprland/workspaces"
- //],
+ "modules-center": [
+ "clock"
+ ],
- // Modules Right
+ // Modules Right
"modules-right": [
"custom/updates",
- "pulseaudio",
- //"bluetooth",
+ "group/hardware",
+ "group/hardware2",
"battery",
"battery#charging",
- // "network",
- // "cpu",
- // "memory",
- "group/hardware",
- //"custom/cliphist",
"tray",
- "idle_inhibitor",
- "custom/exit",
- //"custom/ml4w-welcome",
+ "custom/exit"
+ ]
+}, {
+ // General Settings
+ "layer": "top",
+ "output": ["HDMI-A-1"],
+ "margin-top": 0,
+ "margin-bottom": 0,
+ "layer": "top",
+ "margin-left": 0,
+ "margin-right": 0,
+ "spacing": 0,
+
+ // Load Modules
+ "include": ["~/dotfiles/waybar/themes/ml4w-blur-custom/modules.json"],
+
+ // Modules Left
+ "modules-left": [
+ "custom/appmenuicon",
+ "hyprland/workspaces",
+ "wlr/taskbar",
+ "hyprland/window",
+ "custom/empty"
+ ],
+
+ // Modules Center
+ // "modules-center": [
+ // "clock"
+ // ],
+
+ // Modules Right
+ "modules-right": [
"clock"
]
-}
+}]
+
diff --git a/waybar/themes/ml4w-blur-custom/modules.json b/waybar/themes/ml4w-blur-custom/modules.json
index 2228c41..f84ac40 100644
--- a/waybar/themes/ml4w-blur-custom/modules.json
+++ b/waybar/themes/ml4w-blur-custom/modules.json
@@ -1,12 +1,12 @@
-// __ __ _ _
-// | \/ | ___ __| |_ _| | ___ ___
-// | |\/| |/ _ \ / _` | | | | |/ _ \/ __|
-// | | | | (_) | (_| | |_| | | __/\__ \
-// |_| |_|\___/ \__,_|\__,_|_|\___||___/
-//
-//
-// by Stephan Raabe (2023)
-// -----------------------------------------------------
+// __ __ _ _
+// | \/ | ___ __| |_ _| | ___ ___
+// | |\/| |/ _ \ / _` | | | | |/ _ \/ __|
+// | | | | (_) | (_| | |_| | | __/\__ \
+// |_| |_|\___/ \__,_|\__,_|_|\___||___/
+//
+//
+// by Stephan Raabe (2023)
+// -----------------------------------------------------
//
{
// Workspaces
@@ -24,13 +24,13 @@
// START WORKSPACES
"*": 3
// END WORKSPACES
- }
+ }
},
// Taskbar
"wlr/taskbar": {
"format": "{icon}",
- "icon-size": 18,
+ "icon-size": 16,
"tooltip-format": "{title}",
"on-click": "activate",
"on-click-middle": "close",
@@ -54,7 +54,9 @@
"(.*) - Chromium": "$1",
"(.*) - Brave Search": "$1",
"(.*) - Outlook": "$1",
- "(.*) Microsoft Teams": "$1"
+ "(.*) Microsoft Teams": "$1",
+ "(.*) - Google Chrome": "$1",
+ "(.*) - Visual Studio Code": "$1"
},
"separate-outputs": true
},
@@ -79,7 +81,7 @@
"on-click": "chromium https://studio.youtube.com",
"tooltip": false
},
-
+
// Cliphist
"custom/cliphist": {
"format": "",
@@ -91,17 +93,17 @@
// Updates Count
"custom/updates": {
- "format": " {}",
+ "format": " {}",
"tooltip-format": "{}",
"escape": true,
- "return-type": "json",
+ "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": "",
@@ -116,7 +118,7 @@
"on-click": "~/dotfiles/waybar/themeswitcher.sh",
"tooltip": false
},
-
+
// Settings
"custom/settings": {
"format": "",
@@ -157,7 +159,7 @@
"format": "",
"on-click": "~/dotfiles/.settings/browser.sh",
"tooltip": false
- },
+ },
// ChatGPT Launcher
"custom/chatgpt": {
@@ -196,7 +198,7 @@
"on-click": "rofi -show drun -replace",
"on-click-right": "~/dotfiles/hypr/scripts/keybindings.sh",
"tooltip": false
- },
+ },
// Power Menu
"custom/exit": {
@@ -230,17 +232,30 @@
// System tray
"tray": {
- "icon-size": 21,
- "spacing": 10,
+ "icon-size": 16,
+ "spacing": 8,
"verse-direction": true
},
// Clock
"clock": {
+ "calendar": {
+ "mode" : "year",
+ "mode-mon-col" : 3,
+ "weeks-pos" : "right",
+ "on-scroll" : 1,
+ "format": {
+ "months": "{}",
+ "days": "{}",
+ "weeks": "W{}",
+ "weekdays": "{}",
+ "today": "{}"
+ }
+ },
// TIMEDATEFORMAT
- "format": "{:%H:%M - %a}",
+ "format": "{:%B %d %H:%M %a}",
// "timezone": "America/New_York",
- "tooltip-format": "{:%Y %B}\n{calendar}",
+ "tooltip-format": "{:%Y %B %d}\n{calendar}",
// START CLOCK FORMAT
"format-alt": "{:%Y-%m-%d}"
// END CLOCK FORMAT
@@ -254,20 +269,37 @@
// div
"custom/div": {
- "format": " | ",
+ "format": "",
"tooltip": false
},
// CPU
"cpu": {
- "format": " {usage}% ",
- "on-click": "alacritty -e htop"
+ "format": " {usage}%",
+ "on-click": "alacritty -e htop",
+ "interval": 5,
+ "states": {
+ "warning": 50,
+ "critical": 90
+ }
},
+ // "cpu#bar": {
+ // "format": "{icon}",
+ // "format-icons":[
+ // "▏ ","▎ ","▍ ","▌ ","▋ ","▊ ","▉ ","█ ","█▏","█▎","█▍","█▌","█▋","█▊","█▉","██"
+ // ]
+ // },
+
// Memory
"memory": {
- "format": " {used:0.1f}G ",
- "on-click": "alacritty -e htop"
+ "format": " {used:0.1f}G",
+ "on-click": "alacritty -e htop",
+ "interval": 10,
+ "states": {
+ "warning": 50,
+ "critical": 80
+ }
},
// Harddisc space used
@@ -276,7 +308,7 @@
"format": "D {percentage_used}% ",
"path": "/",
"on-click": "alacritty -e htop"
- },
+ },
"hyprland/language": {
"format": "/ K {short}"
@@ -286,14 +318,35 @@
"group/hardware": {
"orientation": "inherit",
"modules": [
+ "network#speed",
+ "custom/div",
"cpu",
- "div",
- "memory",
- "div",
- "network"
+ "custom/div",
+ "memory"
]
},
-
+
+ "group/hardware2": {
+ "orientation": "inherit",
+ "modules": [
+ "pulseaudio",
+ "custom/div",
+ "network"
+ // "custom/div",
+ // "battery",
+ // "battery#charging"
+ ]
+ },
+
+ // Group system settings
+ "group/systems": {
+ "orientation": "inherit",
+ "modules": [
+ // "user",
+ "clock"
+ ]
+ },
+
// Group Settings
"group/settings": {
"orientation": "horizontal",
@@ -319,9 +372,9 @@
// Network
"network": {
"format": "{ifname}",
- "format-wifi": "{icon} {signalStrength}%",
- "format-ethernet": " {ifname}",
- "format-disconnected": "Disconnected",
+ "format-wifi": "{icon} {signalStrength}%",
+ "format-ethernet": " wired",
+ "format-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}",
@@ -330,6 +383,10 @@
"on-click": "~/dotfiles/.settings/networkmanager.sh",
"format-icons": ["","","","",""]
},
+ "network#speed": {
+ "format": " {bandwidthTotalBits}",
+ "interval": 5
+ },
// Battery
"battery": {
@@ -369,7 +426,7 @@
// Pulseaudio
"pulseaudio": {
// "scroll-step": 1, // %, can be a float
- "format": "{icon}",
+ "format": "{icon} {volume}%",
"format-bluetooth": "{icon} {format_source}",
"format-bluetooth-muted": " {icon} {format_source}",
"format-muted": " {format_source}",
@@ -412,6 +469,6 @@
"activated": "",
"deactivated": ""
},
- "on-click-right": "hyprlock"
+ "on-click-right": "hyprlock"
}
}
diff --git a/waybar/themes/ml4w-blur-custom/style.css b/waybar/themes/ml4w-blur-custom/style.css
index f206c5e..e56c4a6 100644
--- a/waybar/themes/ml4w-blur-custom/style.css
+++ b/waybar/themes/ml4w-blur-custom/style.css
@@ -1,32 +1,33 @@
/*
- * __ __ _ ____ _ _
- * \ \ / /_ _ _ _| |__ __ _ _ __ / ___|| |_ _ _| | ___
- * \ \ /\ / / _` | | | | '_ \ / _` | '__| \___ \| __| | | | |/ _ \
- * \ V V / (_| | |_| | |_) | (_| | | ___) | |_| |_| | | __/
- * \_/\_/ \__,_|\__, |_.__/ \__,_|_| |____/ \__|\__, |_|\___|
- * |___/ |___/
- *
- * by Stephan Raabe (2023)
- * -----------------------------------------------------
+ * __ __ _ ____ _ _
+ * \ \ / /_ _ _ _| |__ __ _ _ __ / ___|| |_ _ _| | ___
+ * \ \ /\ / / _` | | | | '_ \ / _` | '__| \___ \| __| | | | |/ _ \
+ * \ V V / (_| | |_| | |_) | (_| | | ___) | |_| |_| | | __/
+ * \_/\_/ \__,_|\__, |_.__/ \__,_|_| |____/ \__|\__, |_|\___|
+ * |___/ |___/
+ *
+ * by Stephan Raabe (2023)
+ * -----------------------------------------------------
*/
/* -----------------------------------------------------
- * Import Pywal colors
+ * Import Pywal colors
* ----------------------------------------------------- */
/* @import 'style-light.css'; */
/* -----------------------------------------------------
- * General
+ * General
* ----------------------------------------------------- */
* {
- font-family: "Fira Sans Semibold", FontAwesome, Roboto, Helvetica, Arial, sans-serif;
+ font-family: "Fira Code Nerd Font";
+ font-weight: 700;
border: none;
border-radius: 0px;
}
window#waybar {
- background-color: rgba(0,0,0,0.2);
+ background-color: rgba(0,0,0,0.1);
border-bottom: 0px solid #ffffff;
/* color: #FFFFFF; */
transition-property: background-color;
@@ -34,29 +35,29 @@ window#waybar {
}
/* -----------------------------------------------------
- * Workspaces
+ * Workspaces
* ----------------------------------------------------- */
#workspaces {
background: @workspacesbackground1;
- margin: 5px 10px 6px 0px;
+ margin: 8px 10px 8px 0px;
padding: 0px 1px;
- border-radius: 15px;
+ border-radius: 10px;
border: 0px;
font-weight: bold;
font-style: normal;
opacity: 0.8;
- font-size: 16px;
+ font-size: 14px;
color: @textcolor1;
}
#workspaces button {
padding: 0px 5px;
- margin: 4px 3px;
- border-radius: 15px;
+ margin: 3px;
+ border-radius: 10px;
border: 0px;
color: @textcolor1;
- background-color: @workspacesbackground2;
+ background: @workspacesbackground2;
transition: all 0.3s ease-in-out;
opacity: 0.4;
}
@@ -64,16 +65,25 @@ window#waybar {
#workspaces button.active {
color: @textcolor1;
background: @workspacesbackground2;
- border-radius: 15px;
- min-width: 40px;
+ border-radius: 10px;
+ min-width: 30px;
transition: all 0.3s ease-in-out;
opacity:1.0;
}
+#workspaces button.empty {
+ border-radius: 10px;
+ border: 0px;
+ color: @textcolor1;
+ background: transparent;
+ transition: all 0.3s ease-in-out;
+ opacity: 0.5;
+}
+
#workspaces button:hover {
color: @textcolor1;
background: @workspacesbackground2;
- border-radius: 15px;
+ border-radius: 10px;
opacity:0.7;
}
@@ -98,12 +108,13 @@ tooltip label {
* ----------------------------------------------------- */
#window {
+ font-family: "Fira Code Semibold";
background: @backgroundlight;
- margin: 6px 15px 6px 0px;
- padding: 0px 10px 0px 10px;
- border-radius: 15px;
+ margin: 8px 10px 8px 0px;
+ padding: 0px 8px 0px 8px;
+ border-radius: 10px;
color:@textcolor2;
- font-size:16px;
+ font-size: 14px;
font-weight:normal;
opacity:0.8;
}
@@ -118,9 +129,9 @@ window#waybar.empty #window {
#taskbar {
background: @backgroundlight;
- margin: 6px 10px 6px 0px;
+ margin: 8px 10px 8px 0px;
padding:0px;
- border-radius: 15px;
+ border-radius: 10px;
font-weight: normal;
font-style: normal;
opacity:0.8;
@@ -129,8 +140,15 @@ window#waybar.empty #window {
#taskbar button {
margin:0;
- border-radius: 15px;
+ border-radius: 10px;
padding: 0px 5px 0px 5px;
+ opacity: 0.7;
+}
+
+#taskbar button.active {
+ background: @workspacesbackground2;
+ border-radius: 10px;
+ opacity:1.0;
}
@@ -138,19 +156,19 @@ window#waybar.empty #window {
* Custom Quicklinks
* ----------------------------------------------------- */
-#custom-brave,
-#custom-browser,
-#custom-keybindings,
-#custom-outlook,
-#custom-filemanager,
-#custom-teams,
-#custom-chatgpt,
-#custom-calculator,
-#custom-windowsvm,
-#custom-cliphist,
-#custom-wallpaper,
-#custom-settings,
-#custom-wallpaper,
+#custom-brave,
+#custom-browser,
+#custom-keybindings,
+#custom-outlook,
+#custom-filemanager,
+#custom-teams,
+#custom-chatgpt,
+#custom-calculator,
+#custom-windowsvm,
+#custom-cliphist,
+#custom-wallpaper,
+#custom-settings,
+#custom-wallpaper,
#custom-system,
#custom-waybarthemes {
margin-right: 23px;
@@ -159,7 +177,7 @@ window#waybar.empty #window {
opacity: 0.8;
color: @iconcolor;
}
-
+
#custom-system {
margin-right:15px;
}
@@ -194,7 +212,7 @@ window#waybar.empty #window {
#idle_inhibitor {
margin-right: 15px;
- font-size: 22px;
+ font-size: 16px;
font-weight: bold;
opacity: 0.8;
color: @iconcolor;
@@ -214,13 +232,13 @@ window#waybar.empty #window {
#custom-appmenu, #custom-appmenuicon {
background-color: @backgrounddark;
- font-size: 16px;
+ font-size: 14px;
color: @textcolor1;
- border-radius: 15px;
+ border-radius: 10px;
padding: 0px 10px 0px 10px;
- margin: 6px 10px 6px 10px;
+ margin: 8px 10px 8px 10px;
opacity:0.8;
- border:3px solid @bordercolor;
+ /* border:3px solid @bordercolor; */
}
#custom-appmenuicon {
@@ -233,10 +251,13 @@ window#waybar.empty #window {
* ----------------------------------------------------- */
#custom-exit {
- margin: 0px 15px 0px 0px;
- padding:0px;
- font-size:20px;
+ margin: 8px 10px 8px 0px;
+ padding:0px 14px 0px 10px;
+ font-size: 14px;
color: @iconcolor;
+ background: @backgrounddark;
+ border-radius: 10px;
+ opacity: 0.8;
}
/* -----------------------------------------------------
@@ -245,9 +266,9 @@ window#waybar.empty #window {
#custom-updates {
background-color: @backgroundlight;
- font-size: 16px;
+ font-size: 14px;
color: @textcolor2;
- border-radius: 15px;
+ border-radius: 10px;
padding: 2px 10px 0px 10px;
margin: 8px 10px 8px 0px;
opacity:0.8;
@@ -273,9 +294,9 @@ window#waybar.empty #window {
#custom-youtube {
background-color: @backgroundlight;
- font-size: 16px;
+ font-size: 14px;
color: @textcolor2;
- border-radius: 15px;
+ border-radius: 10px;
padding: 2px 10px 0px 10px;
margin: 8px 15px 8px 0px;
opacity:0.8;
@@ -287,24 +308,43 @@ window#waybar.empty #window {
/* #disk,#memory,#cpu,#language {
background-color: @backgroundlight;
- font-size: 16px;
+ font-size: 14px;
color: @textcolor2;
- border-radius: 15px;
+ border-radius: 10px;
padding: 2px 10px 0px 10px;
margin: 8px 10px 8px 0px;
opacity:0.8;
} */
-#hardware {
+/* #cpu {
+ color: @color2;
+} */
+
+#cpu.warning,#memory.warning{
+ color: #ff9800;
+}
+
+#cpu.critical,#memory.warning{
+ color: #f44336;
+}
+
+#hardware,#hardware2 {
background-color: @backgroundlight;
- font-size: 16px;
+ font-size: 14px;
color: @textcolor2;
- border-radius: 15px;
- padding: 2px 10px 0px 10px;
+ border-radius: 10px;
+ padding: 0px 10px 0px 10px;
margin: 8px 10px 8px 0px;
opacity:0.8;
}
+#custom-div {
+ font-weight: 900;
+ padding: 0px 2px;
+ color: @color2;
+ font-size: 18px;
+}
+
#language {
margin-right:10px;
}
@@ -314,14 +354,14 @@ window#waybar.empty #window {
* ----------------------------------------------------- */
#clock {
- background-color: @backgrounddark;
- font-size: 16px;
+ background-color: @backgroundlight;
+ font-size: 14px;
color: @textcolor1;
- border-radius: 15px;
- padding: 1px 10px 0px 10px;
- margin: 6px 10px 6px 0px;
+ border-radius: 10px;
+ padding: 0px 8px 0px 8px;
+ margin: 8px 10px 8px 0px;
opacity:0.8;
- border:3px solid @bordercolor;
+ /* border:3px solid @bordercolor; */
}
/* -----------------------------------------------------
@@ -329,43 +369,53 @@ window#waybar.empty #window {
* ----------------------------------------------------- */
#pulseaudio {
- background-color: @backgroundlight;
- font-size: 16px;
+ /* background-color: @backgroundlight; */
+ font-size: 14px;
color: @textcolor2;
- border-radius: 15px;
- padding: 2px 10px 0px 10px;
- margin: 8px 10px 8px 0px;
- opacity:0.8;
+ /* border-radius: 10px; */
+ /* padding: 0px 10px 0px 10px; */
+ /* margin: 8px 10px 8px 0px; */
+ /* opacity:0.8; */
}
#pulseaudio.muted {
- background-color: @backgrounddark;
+ /* background-color: @backgrounddark; */
color: @textcolor1;
}
+#systems {
+ background-color: @backgroundlight;
+ font-size: 14px;
+ color: @textcolor2;
+ border-radius: 10px;
+ padding: 0px 10px 0px 10px;
+ margin: 8px 10px 8px 0px;
+ opacity:0.8;
+}
+
/* -----------------------------------------------------
* Network
* ----------------------------------------------------- */
-/* #network {
- background-color: @backgroundlight;
- font-size: 16px;
+#network {
+ /* background-color: @backgroundlight; */
+ font-size: 14px;
color: @textcolor2;
- border-radius: 15px;
- padding: 2px 10px 0px 10px;
- margin: 8px 10px 8px 0px;
- opacity:0.8;
+ /* border-radius: 10px; */
+ /* padding: 2px 2px 0px 10px; */
+ /* margin: 8px 10px 8px 0px; */
+ /* opacity:0.8; */
}
#network.ethernet {
- background-color: @backgroundlight;
+ /* background-color: @backgroundlight; */
color: @textcolor2;
}
#network.wifi {
- background-color: @backgroundlight;
+ /* background-color: @backgroundlight; */
color: @textcolor2;
-} */
+}
/* -----------------------------------------------------
* Bluetooth
@@ -373,12 +423,12 @@ window#waybar.empty #window {
#bluetooth, #bluetooth.on, #bluetooth.connected {
background-color: @backgroundlight;
- font-size: 16px;
+ font-size: 14px;
color: @textcolor2;
- border-radius: 15px;
+ border-radius: 10px;
padding: 2px 10px 0px 10px;
margin: 8px 10px 8px 0px;
- opacity:0.8;
+ /* opacity:0.8; */
}
#bluetooth.off {
@@ -393,9 +443,9 @@ window#waybar.empty #window {
#battery {
background-color: @backgroundlight;
- font-size: 16px;
+ font-size: 14px;
color: @textcolor2;
- border-radius: 15px;
+ border-radius: 10px;
padding: 2px 15px 0px 10px;
margin: 8px 10px 8px 0px;
opacity:0.8;
@@ -428,8 +478,13 @@ window#waybar.empty #window {
* ----------------------------------------------------- */
#tray {
- padding: 0px 10px 0px 0px;
+ padding: 0px 10px 0px 10px;
color: @textcolor3;
+ background-color: @backgroundlight;
+ font-size: 14px;
+ border-radius: 10px;
+ margin: 8px 10px 8px 0px;
+ opacity:0.8;
}
#tray > .passive {