wyj/Hyprland-dotfiles
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'upstream-main' into upstream-custom

Browse Source
This commit is contained in:
Yingjie Wang
2024-06-05 05:50:17 -04:00
parent 245ab326fd 973e77cb30
commit ac677d9bb9
138 changed files with 1429 additions and 960 deletions
Download Patch File Download Diff File Expand all files Collapse all files
waybar/README.md
-44
View File
@@ -1,44 +0,0 @@
## Theme Switcher
Select a theme with SUPER + CTRL + T (custom Hyprland key binding) to execute the themeswitcher.sh script. The script will open rofi to show the themes in the folder ~/dotfiles/waybar/themes/
## Waybar Documentation
Waybar github: https://github.com/Alexays/Waybar
Waybar Wiki: https://github.com/Alexays/Waybar/wiki
## Define your own config and style.css for a ML4W theme
If you want to hide modules from the dotfiles ML4W themes or tweak the style, you can do this by creating a copy of the config file and name it config-custom or a copy of style.css and name it style-custom.css
The waybar loader will the use your copies instead of the default files.
With a personal config-custom you can also load a personal modules.json with additional modules.
You can reload the waybar theme with <kbd>SUPER</kbd> + <kbd>SHIFT</kbd> + <kbd>B</kbd>
## Create your own theme based on the starter theme
Please check the configurations of the folders in ~/dotfiles/waybar/themes/
A good starting point is to copy the the waybar starter theme.
Copy the folder ~/dotfiles/waybar/themes/starter and name the copy for example to mytheme.
Open the file ~/dotfiles/waybar/themes/mytheme/config.sh and give your theme a name
```
#!/bin/bash
theme_name="MyTheme"
```
Select your new theme by clicking in the ... icon or with <kbd>SUPER</kbd> + <kbd>CTRL</kbd> + <kbd>T</kbd>
To customize your theme, you can edit the files config, style.css and modules.json
You can reload the waybar theme with <kbd>SUPER</kbd> + <kbd>SHIFT</kbd> + <kbd>B</kbd>
## Waybar documentation
Waybar configuration: https://github.com/Alexays/Waybar/wiki/Configuration
Waybar Styling: https://github.com/Alexays/Waybar/wiki/Styling
waybar/modules.json
+37 -29
View File
@@ -62,14 +62,14 @@
"on-click": "sleep 0.1 && ~/dotfiles/eww/ml4w-sidebar/launch.sh",
"on-click-right": "sleep 0.1 && ~/dotfiles/apps/ML4W_Welcome-x86_64.AppImage",
"format": " ",
"tooltip": false
"tooltip-format": "Open Sidebar"
},
// ML4W Welcome App
"custom/ml4w-hyprland-settings": {
"on-click": "~/dotfiles/apps/ML4W_Hyprland_Settings-x86_64.AppImage",
"format": " ",
"tooltip": false
"tooltip-format": "ML4W Hyprland Settings"
},
// Empty
@@ -92,42 +92,40 @@
"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
"tooltip-format": "Clipboard Manager"
},
// 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
"on-click-right": "~/dotfiles/.settings/software.sh"
},
// Wallpaper
"custom/wallpaper": {
"format": "",
"on-click": "~/dotfiles/hypr/scripts/wallpaper.sh select",
"on-click-right": "~/dotfiles/hypr/scripts/wallpaper.sh",
"tooltip": false
"on-click-right": "~/dotfiles/hypr/scripts/wallpaper-effects.sh",
"tooltip-format": "Left: Select a wallpaper\nRight: Select wallpaper effect"
},
// Waybar Themes
"custom/waybarthemes": {
"format": "",
"on-click": "~/dotfiles/waybar/themeswitcher.sh",
"tooltip": false
"tooltip-format": "Select a waybar theme"
},
// Settings
"custom/settings": {
"format": "",
"on-click": "~/dotfiles/apps/ML4W_Dotfiles_Settings-x86_64.AppImage",
"tooltip": false
"tooltip-format": "ML4W Dotfiles Settings"
},
// Keybindings
@@ -141,21 +139,21 @@
"custom/filemanager": {
"format": "",
"on-click": "~/dotfiles/.settings/filemanager.sh",
"tooltip": false
"tooltip-format": "Open the filemanager"
},
// Browser Launcher
"custom/browser": {
"format": "",
"on-click": "~/dotfiles/.settings/browser.sh",
"tooltip": false
"tooltip-format": "Open the browser"
},
// ChatGPT Launcher
"custom/chatgpt": {
"format": " ",
"on-click": "chromium --app=https://chat.openai.com",
"tooltip": false
"tooltip-format": "Open ChatGPT"
},
// Calculator
@@ -179,7 +177,7 @@
// END APPS LABEL
"on-click": "sleep 0.2;rofi -show drun -replace",
"on-click-right": "~/dotfiles/hypr/scripts/keybindings.sh",
"tooltip": false
"tooltip-format": "Left: Open the application launcher\nRight: Show all keybindings"
},
// Rofi Application Launcher
@@ -187,14 +185,34 @@
"format": "",
"on-click": "rofi -show drun -replace",
"on-click-right": "~/dotfiles/hypr/scripts/keybindings.sh",
"tooltip": false
"tooltip-format": "Left: Open the application launcher\nRight: Show all keybindings"
},
// Power Menu
"custom/exit": {
"format": "",
"on-click": "wlogout",
"tooltip": false
"tooltip-format": "Power Menu"
},
// Hyprshade
"custom/hyprshade": {
"format": "",
"tooltip-format": "Toggle Screen Shader",
"on-click": "sleep 0.5; ~/dotfiles/hypr/scripts/hyprshade.sh",
"on-click-right": "sleep 0.5; ~/dotfiles/hypr/scripts/hyprshade.sh rofi"
},
// Hypridle inhibitor
"custom/hypridle": {
"format": "",
"return-type": "json",
"escape": true,
"exec-on-event": true,
"interval": 60,
"exec": "~/dotfiles/hypr/scripts/hypridle.sh status",
"on-click": "~/dotfiles/hypr/scripts/hypridle.sh toggle",
"on-click-right": "hyprlock"
},
// Keyboard State
@@ -286,7 +304,7 @@
"drawer": {
"transition-duration": 300,
"children-class": "not-memory",
"transition-left-to-right": false
"transition-left-to-right": true
},
"modules": [
"custom/settings",
@@ -316,7 +334,8 @@
"tooltip-format-ethernet": " {ifname}\nIP: {ipaddr}\n up: {bandwidthUpBits} down: {bandwidthDownBits}",
"tooltip-format-disconnected": "Disconnected",
"max-length": 50,
"on-click": "~/dotfiles/.settings/networkmanager.sh"
"on-click": "alacritty --class dotfiles-floating -e nmtui",
"on-click-right": "~/dotfiles/.settings/networkmanager.sh"
},
// Battery
@@ -371,16 +390,5 @@
"format": "{user}",
"interval": 60,
"icon": false,
},
// Idle Inhibator
"idle_inhibitor": {
"format": "{icon}",
"tooltip": true,
"format-icons":{
"activated": "",
"deactivated": ""
},
"on-click-right": "hyprlock"
}
}
waybar/themes/assets/ml4w-icon-dark.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 5.0 KiB

waybar/themes/ml4w-blur-bottom/black/style.css
+4
View File
@@ -18,3 +18,7 @@
window#waybar {
background-color: rgba(255,255,255,0.1);
}
#custom-ml4w-welcome {
background-image: url("../../assets/ml4w-icon-dark.png");
}
waybar/themes/ml4w-blur-bottom/config
+2 -2
View File
@@ -45,9 +45,9 @@
"battery",
"network",
"group/hardware",
"group/settings",
"custom/cliphist",
"idle_inhibitor",
"custom/hypridle",
"custom/hyprshade",
"tray",
"custom/exit",
"custom/ml4w-welcome",
waybar/themes/ml4w-blur/black/style.css
+4
View File
@@ -18,3 +18,7 @@
window#waybar {
background-color: rgba(255,255,255,0.1);
}
#custom-ml4w-welcome {
background-image: url("../../assets/ml4w-icon-dark.png");
}
waybar/themes/ml4w-blur/config
+2 -1
View File
@@ -46,7 +46,8 @@
"network",
"group/hardware",
"custom/cliphist",
"idle_inhibitor",
"custom/hypridle",
"custom/hyprshade",
"tray",
"custom/exit",
"custom/ml4w-welcome",
waybar/themes/ml4w-blur/style.css
+19 -1
View File
@@ -163,6 +163,8 @@ window#waybar.empty #window {
#custom-settings,
#custom-wallpaper,
#custom-system,
#custom-hyprshade,
#custom-hypridle,
#custom-waybarthemes {
margin-right: 23px;
font-size: 20px;
@@ -170,7 +172,23 @@ window#waybar.empty #window {
opacity: 0.8;
color: @iconcolor;
}
#custom-hyprshade {
margin-right:12px;
}
#custom-hypridle {
margin-right:18px;
}
#custom-hypridle.active {
color: @iconcolor;
}
#custom-hypridle.notactive {
color: #dc2f2f;
}
#custom-system {
margin-right:15px;
}
waybar/themes/ml4w-bottom/black/style.css
+4
View File
@@ -14,3 +14,7 @@
@define-color iconcolor #000000;
@import '../../ml4w/style.css';
#custom-ml4w-welcome {
background-image: url("../../assets/ml4w-icon-dark.png");
}
waybar/themes/ml4w-bottom/config
+2 -1
View File
@@ -46,7 +46,8 @@
"network",
"group/hardware",
"custom/cliphist",
"idle_inhibitor",
"custom/hypridle",
"custom/hyprshade",
"tray",
"custom/exit",
"custom/ml4w-welcome",
waybar/themes/ml4w-minimal/config
+2 -1
View File
@@ -44,7 +44,8 @@
"network",
"group/hardware",
"custom/cliphist",
"idle_inhibitor",
"custom/hypridle",
"custom/hyprshade",
"custom/exit",
"clock",
"tray",
waybar/themes/ml4w-minimal/style.css
+18
View File
@@ -134,6 +134,8 @@ window#waybar.empty #window {
#custom-settings,
#custom-wallpaper,
#custom-system,
#custom-hyprshade,
#custom-hypridle,
#custom-waybarthemes {
margin-right: 23px;
font-size: 14px;
@@ -141,6 +143,22 @@ window#waybar.empty #window {
color: @iconcolor;
}
#custom-hyprshade {
margin-right:12px;
}
#custom-hypridle {
margin-right:16px;
}
#custom-hypridle.active {
color: @iconcolor;
}
#custom-hypridle.notactive {
color: #dc2f2f;
}
#custom-settings {
margin-right: 15px;
}
waybar/themes/ml4w/black/style.css
+4 -1
View File
@@ -14,4 +14,7 @@
@define-color iconcolor #000000;
@import '../style.css';
#custom-ml4w-welcome {
background-image: url("../../assets/ml4w-icon-dark.png");
}
waybar/themes/ml4w/config
+2 -1
View File
@@ -46,7 +46,8 @@
"network",
"group/hardware",
"custom/cliphist",
"idle_inhibitor",
"custom/hypridle",
"custom/hyprshade",
"tray",
"custom/exit",
"custom/ml4w-welcome",
waybar/themes/ml4w/style.css
+18
View File
@@ -164,6 +164,8 @@ window#waybar.empty #window {
#custom-settings,
#custom-wallpaper,
#custom-system,
#custom-hyprshade,
#custom-hypridle,
#custom-waybarthemes {
margin-right: 23px;
font-size: 20px;
@@ -172,6 +174,22 @@ window#waybar.empty #window {
color: @iconcolor;
}
#custom-hyprshade {
margin-right:12px;
}
#custom-hypridle {
margin-right:18px;
}
#custom-hypridle.active {
color: @iconcolor;
}
#custom-hypridle.notactive {
color: #dc2f2f;
}
#custom-system {
margin-right:15px;
}
waybar/themes/starter/config
+2 -1
View File
@@ -54,7 +54,8 @@
"network",
"group/hardware",
"custom/cliphist",
"idle_inhibitor",
"custom/hypridle",
"custom/hyprshade",
"tray",
"custom/exit",
"custom/ml4w-welcome",
waybar/themes/starter/modules.json
+23 -3
View File
@@ -65,9 +65,29 @@
"tooltip": false
},
// Hyprshade
"custom/hyprshade": {
"format": "",
"on-click": "sleep 0.1; ~/dotfiles/hypr/scripts/hyprshade.sh",
"on-click-right": "sleep 0.1; ~/dotfiles/hypr/scripts/hyprshade.sh rofi",
"tooltip": false
},
// Hypridle inhibitor
"custom/hypridle": {
"format": "",
"return-type": "json",
"escape": true,
"exec-on-event": true,
"interval": 60,
"exec": "~/dotfiles/hypr/scripts/hypridle.sh status",
"on-click": "~/dotfiles/hypr/scripts/hypridle.sh toggle",
"on-click-right": "hyprlock"
},
// Updates Count
"custom/updates": {
"format": " {}",
"format": " {}",
"tooltip-format": "{}",
"escape": true,
"return-type": "json",
@@ -87,7 +107,7 @@
"custom/wallpaper": {
"format": "",
"on-click": "~/dotfiles/hypr/scripts/wallpaper.sh select",
"on-click-right": "~/dotfiles/hypr/scripts/wallpaper.sh",
"on-click-right": "~/dotfiles/hypr/scripts/wallpaper-effects.sh",
"tooltip": false
},
@@ -283,7 +303,7 @@
// Pulseaudio
"pulseaudio": {
// "scroll-step": 1, // %, can be a float
"format": "{icon} {volume}%",
"format": "{icon} {volume}%",
"format-bluetooth": "{volume}% {icon} {format_source}",
"format-bluetooth-muted": " {icon} {format_source}",
"format-muted": " {format_source}",
waybar/themes/starter/style.css
+22 -5
View File
@@ -164,6 +164,8 @@ window#waybar.empty #window {
#custom-settings,
#custom-wallpaper,
#custom-system,
#custom-hyprshade,
#custom-hypridle,
#custom-waybarthemes {
margin-right: 23px;
font-size: 20px;
@@ -171,12 +173,27 @@ window#waybar.empty #window {
color: @iconcolor;
}
#custom-waybarthemes,#custom-system {
#custom-hyprshade {
margin-right:12px;
}
#custom-hypridle {
margin-right:16px;
}
#custom-hypridle.active {
color: @iconcolor;
}
#custom-hypridle.notactive {
color: #dc2f2f;
}
#custom-waybarthemes,#custom-system {
margin-right:15px;
}
}
#custom-ml4w-welcome {
#custom-ml4w-welcome {
margin-right: 15px;
background-image: url("../assets/ml4w-icon.png");
background-repeat: no-repeat;
@@ -396,7 +413,7 @@ window#waybar.empty #window {
* ----------------------------------------------------- */
#tray {
background-color: #2980b9;
margin:0px 10px 0px 0px;
}
#tray > .passive {
waybar/toggle.sh
Executable
+15
View File
@@ -0,0 +1,15 @@
#!/bin/bash
# _____ _ __ __ _
# |_ _|__ __ _ __ _| | ___ \ \ / /_ _ _ _| |__ __ _ _ __
# | |/ _ \ / _` |/ _` | |/ _ \ \ \ /\ / / _` | | | | '_ \ / _` | '__|
# | | (_) | (_| | (_| | | __/ \ V V / (_| | |_| | |_) | (_| | |
# |_|\___/ \__, |\__, |_|\___| \_/\_/ \__,_|\__, |_.__/ \__,_|_|
# |___/ |___/ |___/
#
if [ -f ~/.cache/waybar-disabled ] ;then
rm ~/.cache/waybar-disabled
else
touch ~/.cache/waybar-disabled
fi
~/dotfiles/waybar/launch.sh &