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

Merge branch 'upstream-main' into fcitx5

Browse Source
This commit is contained in:
wyj
2024-06-05 05:50:50 -04:00
parent b9025fbfb1 973e77cb30
commit c2d2d45546
172 changed files with 2603 additions and 926 deletions
Download Patch File Download Diff File Expand all files Collapse all files
waybar/themes/assets/hyprland-icon-20.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.7 KiB

waybar/themes/assets/hyprland-icon.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.1 KiB

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
+4 -3
View File
@@ -24,8 +24,9 @@
// Modules Left
"modules-left": [
"custom/appmenu",
"group/links",
"group/settings",
"wlr/taskbar",
//"wlr/taskbar",
"group/quicklinks",
"hyprland/window",
"custom/empty"
@@ -44,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
+4 -2
View File
@@ -24,8 +24,9 @@
// Modules Left
"modules-left": [
"custom/appmenu",
"group/links",
"group/settings",
"wlr/taskbar",
//"wlr/taskbar",
"group/quicklinks",
"hyprland/window",
"custom/empty"
@@ -45,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
+33 -7
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;
}
@@ -184,15 +202,23 @@ window#waybar.empty #window {
}
#custom-ml4w-welcome {
margin-right: 15px;
margin-right: 12px;
background-image: url("../assets/ml4w-icon.png");
background-repeat: no-repeat;
background-position: center;
padding-right: 24px;
}
#custom-ml4w-hyprland-settings {
margin-right: 12px;
background-image: url("../assets/hyprland-icon.png");
background-repeat: no-repeat;
background-position: center;
padding-right: 16px;
}
#custom-chatgpt {
margin-right: 15px;
margin-right: 12px;
background-image: url("../assets/ai-icon-20.png");
background-repeat: no-repeat;
background-position: center;
@@ -204,8 +230,8 @@ window#waybar.empty #window {
* ----------------------------------------------------- */
#idle_inhibitor {
margin-right: 15px;
font-size: 22px;
margin-right: 17px;
font-size: 20px;
font-weight: bold;
opacity: 0.8;
color: @iconcolor;
@@ -229,7 +255,7 @@ window#waybar.empty #window {
color: @textcolor1;
border-radius: 15px;
padding: 0px 10px 0px 10px;
margin: 6px 15px 6px 14px;
margin: 8px 14px 8px 14px;
opacity:0.8;
border:3px solid @bordercolor;
}
@@ -312,7 +338,7 @@ window#waybar.empty #window {
color: @textcolor1;
border-radius: 15px;
padding: 1px 10px 0px 10px;
margin: 6px 15px 6px 0px;
margin: 8px 15px 8px 0px;
opacity:0.8;
border:3px solid @bordercolor;
}
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
+4 -2
View File
@@ -24,8 +24,9 @@
// Modules Left
"modules-left": [
"custom/appmenu",
"group/links",
"group/settings",
"wlr/taskbar",
//"wlr/taskbar",
"group/quicklinks",
"hyprland/window"
],
@@ -45,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
+3 -1
View File
@@ -24,6 +24,7 @@
"modules-left": [
"custom/appmenuicon",
"hyprland/workspaces",
"group/links",
"group/settings",
"group/quicklinks"
],
@@ -43,7 +44,8 @@
"network",
"group/hardware",
"custom/cliphist",
"idle_inhibitor",
"custom/hypridle",
"custom/hyprshade",
"custom/exit",
"clock",
"tray",
waybar/themes/ml4w-minimal/style.css
+37 -3
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,13 +143,36 @@ window#waybar.empty #window {
color: @iconcolor;
}
#custom-settings {
margin-right: 15;
#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;
}
#custom-browser {
margin-right: 16px;
}
#custom-wallpaper {
margin-right: 14px;
}
#custom-chatgpt {
margin-right: 15px;
margin-right: 10px;
background-image: url("../assets/ai-icon-20.png");
background-repeat: no-repeat;
background-position: center;
@@ -167,6 +192,15 @@ window#waybar.empty #window {
padding-right: 24px;
}
#custom-ml4w-hyprland-settings {
margin-right: 12px;
background-image: url("../assets/hyprland-icon-20.png");
background-repeat: no-repeat;
background-position: center;
padding-right: 16px;
}
/* -----------------------------------------------------
* Idle Inhibator
* ----------------------------------------------------- */
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
+4 -2
View File
@@ -24,8 +24,9 @@
// Modules Left
"modules-left": [
"custom/appmenu",
"group/links",
"group/settings",
"wlr/taskbar",
//"wlr/taskbar",
"group/quicklinks",
"hyprland/window",
"custom/empty"
@@ -45,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
+28 -2
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;
}
@@ -185,7 +203,7 @@ window#waybar.empty #window {
}
#custom-chatgpt {
margin-right: 15px;
margin-right: 12px;
background-image: url("../assets/ai-icon.png");
background-repeat: no-repeat;
background-position: center;
@@ -193,13 +211,21 @@ window#waybar.empty #window {
}
#custom-ml4w-welcome {
margin-right: 15px;
margin-right: 12px;
background-image: url("../assets/ml4w-icon.png");
background-repeat: no-repeat;
background-position: center;
padding-right: 24px;
}
#custom-ml4w-hyprland-settings {
margin-right: 12px;
background-image: url("../assets/hyprland-icon.png");
background-repeat: no-repeat;
background-position: center;
padding-right: 16px;
}
/* -----------------------------------------------------
* Idle Inhibator
* ----------------------------------------------------- */
waybar/themes/starter/config
+3 -2
View File
@@ -34,7 +34,7 @@
"custom/settings",
"custom/waybarthemes",
"custom/wallpaper",
// "wlr/taskbar",
//"wlr/taskbar",
"group/quicklinks",
"hyprland/window",
"custom/starter"
@@ -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 {