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

Merge branch 'upstream-custom' into dev

Browse Source
This commit is contained in:
Yingjie Wang 2024-05-26 18:34:53 -04:00
commit a6ee6ced28
4 changed files with 287 additions and 148 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.install/packages/general-packages.sh
View File

@ -24,6 +24,7 @@ packagesPacman=(
"ttf-fira-sans" "ttf-fira-sans"
"ttf-fira-code" "ttf-fira-code"
"ttf-firacode-nerd" "ttf-firacode-nerd"
"ttf-firacode-nerd"
"figlet" "figlet"
"vlc" "vlc"
"eza" "eza"

56
waybar/themes/ml4w-blur-custom/config
View File

@ -8,9 +8,10 @@
// by Stephan Raabe (2023) // by Stephan Raabe (2023)
// ----------------------------------------------------- // -----------------------------------------------------
// //
{ [{
// General Settings // General Settings
"layer": "top", "layer": "top",
"output": ["eDP-1", "DP-1"],
"margin-top": 0, "margin-top": 0,
"margin-bottom": 0, "margin-bottom": 0,
"layer": "top", "layer": "top",
@ -34,26 +35,51 @@
], ],
// Modules Center // Modules Center
//"modules-center": [ "modules-center": [
// "hyprland/workspaces" "clock"
//], ],
// Modules Right // Modules Right
"modules-right": [ "modules-right": [
"custom/updates", "custom/updates",
"pulseaudio", "group/hardware",
//"bluetooth", "group/hardware2",
"battery", "battery",
"battery#charging", "battery#charging",
// "network",
// "cpu",
// "memory",
"group/hardware",
//"custom/cliphist",
"tray", "tray",
"idle_inhibitor", "custom/exit"
"custom/exit", ]
//"custom/ml4w-welcome", }, {
// 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" "clock"
] ]
} }]

95
waybar/themes/ml4w-blur-custom/modules.json
View File

@ -30,7 +30,7 @@
// Taskbar // Taskbar
"wlr/taskbar": { "wlr/taskbar": {
"format": "{icon}", "format": "{icon}",
"icon-size": 18, "icon-size": 16,
"tooltip-format": "{title}", "tooltip-format": "{title}",
"on-click": "activate", "on-click": "activate",
"on-click-middle": "close", "on-click-middle": "close",
@ -54,7 +54,9 @@
"(.*) - Chromium": "$1", "(.*) - Chromium": "$1",
"(.*) - Brave Search": "$1", "(.*) - Brave Search": "$1",
"(.*) - Outlook": "$1", "(.*) - Outlook": "$1",
"(.*) Microsoft Teams": "$1" "(.*) Microsoft Teams": "$1",
"(.*) - Google Chrome": "$1",
"(.*) - Visual Studio Code": "$1"
}, },
"separate-outputs": true "separate-outputs": true
}, },
@ -91,7 +93,7 @@
// Updates Count // Updates Count
"custom/updates": { "custom/updates": {
"format": " {}", "format": " {}",
"tooltip-format": "{}", "tooltip-format": "{}",
"escape": true, "escape": true,
"return-type": "json", "return-type": "json",
@ -230,17 +232,30 @@
// System tray // System tray
"tray": { "tray": {
"icon-size": 21, "icon-size": 16,
"spacing": 10, "spacing": 8,
"verse-direction": true "verse-direction": true
}, },
// Clock // Clock
"clock": { "clock": {
"calendar": {
"mode" : "year",
"mode-mon-col" : 3,
"weeks-pos" : "right",
"on-scroll" : 1,
"format": {
"months": "<span color='#ffead3'><b>{}</b></span>",
"days": "<span color='#ecc6d9'><b>{}</b></span>",
"weeks": "<span color='#99ffdd'><b>W{}</b></span>",
"weekdays": "<span color='#ffcc66'><b>{}</b></span>",
"today": "<span color='#ff6699'><b><u>{}</u></b></span>"
}
},
// TIMEDATEFORMAT // TIMEDATEFORMAT
"format": "{:%H:%M - %a}", "format": "{:%B %d %H:%M %a}",
// "timezone": "America/New_York", // "timezone": "America/New_York",
"tooltip-format": "<big>{:%Y %B}</big>\n<tt><small>{calendar}</small></tt>", "tooltip-format": "<big>{:%Y %B %d}</big>\n<tt><small>{calendar}</small></tt>",
// START CLOCK FORMAT // START CLOCK FORMAT
"format-alt": "{:%Y-%m-%d}" "format-alt": "{:%Y-%m-%d}"
// END CLOCK FORMAT // END CLOCK FORMAT
@ -254,20 +269,37 @@
// div // div
"custom/div": { "custom/div": {
"format": " | ", "format": "",
"tooltip": false "tooltip": false
}, },
// CPU // CPU
"cpu": { "cpu": {
"format": "󰒇 {usage}% ", "format": "󰒇 {usage}%",
"on-click": "alacritty -e htop" "on-click": "alacritty -e htop",
"interval": 5,
"states": {
"warning": 50,
"critical": 90
}
}, },
// "cpu#bar": {
// "format": "{icon}",
// "format-icons":[
// "▏ ","▎ ","▍ ","▌ ","▋ ","▊ ","▉ ","█ ","█▏","█▎","█▍","█▌","█▋","█▊","█▉","██"
// ]
// },
// Memory // Memory
"memory": { "memory": {
"format": " {used:0.1f}G ", "format": " {used:0.1f}G",
"on-click": "alacritty -e htop" "on-click": "alacritty -e htop",
"interval": 10,
"states": {
"warning": 50,
"critical": 80
}
}, },
// Harddisc space used // Harddisc space used
@ -286,11 +318,32 @@
"group/hardware": { "group/hardware": {
"orientation": "inherit", "orientation": "inherit",
"modules": [ "modules": [
"network#speed",
"custom/div",
"cpu", "cpu",
"div", "custom/div",
"memory", "memory"
"div", ]
},
"group/hardware2": {
"orientation": "inherit",
"modules": [
"pulseaudio",
"custom/div",
"network" "network"
// "custom/div",
// "battery",
// "battery#charging"
]
},
// Group system settings
"group/systems": {
"orientation": "inherit",
"modules": [
// "user",
"clock"
] ]
}, },
@ -319,9 +372,9 @@
// Network // Network
"network": { "network": {
"format": "{ifname}", "format": "{ifname}",
"format-wifi": "{icon} {signalStrength}%", "format-wifi": "{icon} {signalStrength}%",
"format-ethernet": " {ifname}", "format-ethernet": " wired",
"format-disconnected": "Disconnected", "format-disconnected": "󰌙",
"tooltip-format": " {ifname} via {gwaddri}", "tooltip-format": " {ifname} via {gwaddri}",
"tooltip-format-wifi": " {ifname} @ {essid}\nIP: {ipaddr}\nStrength: {signalStrength}%\nFreq: {frequency}MHz\nUp: {bandwidthUpBits} Down: {bandwidthDownBits}", "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-ethernet": " {ifname}\nIP: {ipaddr}\n up: {bandwidthUpBits} down: {bandwidthDownBits}",
@ -330,6 +383,10 @@
"on-click": "~/dotfiles/.settings/networkmanager.sh", "on-click": "~/dotfiles/.settings/networkmanager.sh",
"format-icons": ["󰤯","󰤟","󰤢","󰤥","󰤨"] "format-icons": ["󰤯","󰤟","󰤢","󰤥","󰤨"]
}, },
"network#speed": {
"format": " {bandwidthTotalBits}",
"interval": 5
},
// Battery // Battery
"battery": { "battery": {
@ -369,7 +426,7 @@
// Pulseaudio // Pulseaudio
"pulseaudio": { "pulseaudio": {
// "scroll-step": 1, // %, can be a float // "scroll-step": 1, // %, can be a float
"format": "{icon}", "format": "{icon} {volume}%",
"format-bluetooth": "{icon} {format_source}", "format-bluetooth": "{icon} {format_source}",
"format-bluetooth-muted": " {icon} {format_source}", "format-bluetooth-muted": " {icon} {format_source}",
"format-muted": " {format_source}", "format-muted": " {format_source}",

185
waybar/themes/ml4w-blur-custom/style.css
View File

@ -20,13 +20,14 @@
* ----------------------------------------------------- */ * ----------------------------------------------------- */
* { * {
font-family: "Fira Sans Semibold", FontAwesome, Roboto, Helvetica, Arial, sans-serif; font-family: "Fira Code Nerd Font";
font-weight: 700;
border: none; border: none;
border-radius: 0px; border-radius: 0px;
} }
window#waybar { window#waybar {
background-color: rgba(0,0,0,0.2); background-color: rgba(0,0,0,0.1);
border-bottom: 0px solid #ffffff; border-bottom: 0px solid #ffffff;
/* color: #FFFFFF; */ /* color: #FFFFFF; */
transition-property: background-color; transition-property: background-color;
@ -39,24 +40,24 @@ window#waybar {
#workspaces { #workspaces {
background: @workspacesbackground1; background: @workspacesbackground1;
margin: 5px 10px 6px 0px; margin: 8px 10px 8px 0px;
padding: 0px 1px; padding: 0px 1px;
border-radius: 15px; border-radius: 10px;
border: 0px; border: 0px;
font-weight: bold; font-weight: bold;
font-style: normal; font-style: normal;
opacity: 0.8; opacity: 0.8;
font-size: 16px; font-size: 14px;
color: @textcolor1; color: @textcolor1;
} }
#workspaces button { #workspaces button {
padding: 0px 5px; padding: 0px 5px;
margin: 4px 3px; margin: 3px;
border-radius: 15px; border-radius: 10px;
border: 0px; border: 0px;
color: @textcolor1; color: @textcolor1;
background-color: @workspacesbackground2; background: @workspacesbackground2;
transition: all 0.3s ease-in-out; transition: all 0.3s ease-in-out;
opacity: 0.4; opacity: 0.4;
} }
@ -64,16 +65,25 @@ window#waybar {
#workspaces button.active { #workspaces button.active {
color: @textcolor1; color: @textcolor1;
background: @workspacesbackground2; background: @workspacesbackground2;
border-radius: 15px; border-radius: 10px;
min-width: 40px; min-width: 30px;
transition: all 0.3s ease-in-out; transition: all 0.3s ease-in-out;
opacity:1.0; 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 { #workspaces button:hover {
color: @textcolor1; color: @textcolor1;
background: @workspacesbackground2; background: @workspacesbackground2;
border-radius: 15px; border-radius: 10px;
opacity:0.7; opacity:0.7;
} }
@ -98,12 +108,13 @@ tooltip label {
* ----------------------------------------------------- */ * ----------------------------------------------------- */
#window { #window {
font-family: "Fira Code Semibold";
background: @backgroundlight; background: @backgroundlight;
margin: 6px 15px 6px 0px; margin: 8px 10px 8px 0px;
padding: 0px 10px 0px 10px; padding: 0px 8px 0px 8px;
border-radius: 15px; border-radius: 10px;
color:@textcolor2; color:@textcolor2;
font-size:16px; font-size: 14px;
font-weight:normal; font-weight:normal;
opacity:0.8; opacity:0.8;
} }
@ -118,9 +129,9 @@ window#waybar.empty #window {
#taskbar { #taskbar {
background: @backgroundlight; background: @backgroundlight;
margin: 6px 10px 6px 0px; margin: 8px 10px 8px 0px;
padding:0px; padding:0px;
border-radius: 15px; border-radius: 10px;
font-weight: normal; font-weight: normal;
font-style: normal; font-style: normal;
opacity:0.8; opacity:0.8;
@ -129,8 +140,15 @@ window#waybar.empty #window {
#taskbar button { #taskbar button {
margin:0; margin:0;
border-radius: 15px; border-radius: 10px;
padding: 0px 5px 0px 5px; padding: 0px 5px 0px 5px;
opacity: 0.7;
}
#taskbar button.active {
background: @workspacesbackground2;
border-radius: 10px;
opacity:1.0;
} }
@ -194,7 +212,7 @@ window#waybar.empty #window {
#idle_inhibitor { #idle_inhibitor {
margin-right: 15px; margin-right: 15px;
font-size: 22px; font-size: 16px;
font-weight: bold; font-weight: bold;
opacity: 0.8; opacity: 0.8;
color: @iconcolor; color: @iconcolor;
@ -214,13 +232,13 @@ window#waybar.empty #window {
#custom-appmenu, #custom-appmenuicon { #custom-appmenu, #custom-appmenuicon {
background-color: @backgrounddark; background-color: @backgrounddark;
font-size: 16px; font-size: 14px;
color: @textcolor1; color: @textcolor1;
border-radius: 15px; border-radius: 10px;
padding: 0px 10px 0px 10px; padding: 0px 10px 0px 10px;
margin: 6px 10px 6px 10px; margin: 8px 10px 8px 10px;
opacity:0.8; opacity:0.8;
border:3px solid @bordercolor; /* border:3px solid @bordercolor; */
} }
#custom-appmenuicon { #custom-appmenuicon {
@ -233,10 +251,13 @@ window#waybar.empty #window {
* ----------------------------------------------------- */ * ----------------------------------------------------- */
#custom-exit { #custom-exit {
margin: 0px 15px 0px 0px; margin: 8px 10px 8px 0px;
padding:0px; padding:0px 14px 0px 10px;
font-size:20px; font-size: 14px;
color: @iconcolor; color: @iconcolor;
background: @backgrounddark;
border-radius: 10px;
opacity: 0.8;
} }
/* ----------------------------------------------------- /* -----------------------------------------------------
@ -245,9 +266,9 @@ window#waybar.empty #window {
#custom-updates { #custom-updates {
background-color: @backgroundlight; background-color: @backgroundlight;
font-size: 16px; font-size: 14px;
color: @textcolor2; color: @textcolor2;
border-radius: 15px; border-radius: 10px;
padding: 2px 10px 0px 10px; padding: 2px 10px 0px 10px;
margin: 8px 10px 8px 0px; margin: 8px 10px 8px 0px;
opacity:0.8; opacity:0.8;
@ -273,9 +294,9 @@ window#waybar.empty #window {
#custom-youtube { #custom-youtube {
background-color: @backgroundlight; background-color: @backgroundlight;
font-size: 16px; font-size: 14px;
color: @textcolor2; color: @textcolor2;
border-radius: 15px; border-radius: 10px;
padding: 2px 10px 0px 10px; padding: 2px 10px 0px 10px;
margin: 8px 15px 8px 0px; margin: 8px 15px 8px 0px;
opacity:0.8; opacity:0.8;
@ -287,24 +308,43 @@ window#waybar.empty #window {
/* #disk,#memory,#cpu,#language { /* #disk,#memory,#cpu,#language {
background-color: @backgroundlight; background-color: @backgroundlight;
font-size: 16px; font-size: 14px;
color: @textcolor2; color: @textcolor2;
border-radius: 15px; border-radius: 10px;
padding: 2px 10px 0px 10px; padding: 2px 10px 0px 10px;
margin: 8px 10px 8px 0px; margin: 8px 10px 8px 0px;
opacity:0.8; opacity:0.8;
} */ } */
#hardware { /* #cpu {
color: @color2;
} */
#cpu.warning,#memory.warning{
color: #ff9800;
}
#cpu.critical,#memory.warning{
color: #f44336;
}
#hardware,#hardware2 {
background-color: @backgroundlight; background-color: @backgroundlight;
font-size: 16px; font-size: 14px;
color: @textcolor2; color: @textcolor2;
border-radius: 15px; border-radius: 10px;
padding: 2px 10px 0px 10px; padding: 0px 10px 0px 10px;
margin: 8px 10px 8px 0px; margin: 8px 10px 8px 0px;
opacity:0.8; opacity:0.8;
} }
#custom-div {
font-weight: 900;
padding: 0px 2px;
color: @color2;
font-size: 18px;
}
#language { #language {
margin-right:10px; margin-right:10px;
} }
@ -314,14 +354,14 @@ window#waybar.empty #window {
* ----------------------------------------------------- */ * ----------------------------------------------------- */
#clock { #clock {
background-color: @backgrounddark; background-color: @backgroundlight;
font-size: 16px; font-size: 14px;
color: @textcolor1; color: @textcolor1;
border-radius: 15px; border-radius: 10px;
padding: 1px 10px 0px 10px; padding: 0px 8px 0px 8px;
margin: 6px 10px 6px 0px; margin: 8px 10px 8px 0px;
opacity:0.8; opacity:0.8;
border:3px solid @bordercolor; /* border:3px solid @bordercolor; */
} }
/* ----------------------------------------------------- /* -----------------------------------------------------
@ -329,43 +369,53 @@ window#waybar.empty #window {
* ----------------------------------------------------- */ * ----------------------------------------------------- */
#pulseaudio { #pulseaudio {
background-color: @backgroundlight; /* background-color: @backgroundlight; */
font-size: 16px; font-size: 14px;
color: @textcolor2; color: @textcolor2;
border-radius: 15px; /* border-radius: 10px; */
padding: 2px 10px 0px 10px; /* padding: 0px 10px 0px 10px; */
margin: 8px 10px 8px 0px; /* margin: 8px 10px 8px 0px; */
opacity:0.8; /* opacity:0.8; */
} }
#pulseaudio.muted { #pulseaudio.muted {
background-color: @backgrounddark; /* background-color: @backgrounddark; */
color: @textcolor1; 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
* ----------------------------------------------------- */ * ----------------------------------------------------- */
/* #network { #network {
background-color: @backgroundlight; /* background-color: @backgroundlight; */
font-size: 16px; font-size: 14px;
color: @textcolor2; color: @textcolor2;
border-radius: 15px; /* border-radius: 10px; */
padding: 2px 10px 0px 10px; /* padding: 2px 2px 0px 10px; */
margin: 8px 10px 8px 0px; /* margin: 8px 10px 8px 0px; */
opacity:0.8; /* opacity:0.8; */
} }
#network.ethernet { #network.ethernet {
background-color: @backgroundlight; /* background-color: @backgroundlight; */
color: @textcolor2; color: @textcolor2;
} }
#network.wifi { #network.wifi {
background-color: @backgroundlight; /* background-color: @backgroundlight; */
color: @textcolor2; color: @textcolor2;
} */ }
/* ----------------------------------------------------- /* -----------------------------------------------------
* Bluetooth * Bluetooth
@ -373,12 +423,12 @@ window#waybar.empty #window {
#bluetooth, #bluetooth.on, #bluetooth.connected { #bluetooth, #bluetooth.on, #bluetooth.connected {
background-color: @backgroundlight; background-color: @backgroundlight;
font-size: 16px; font-size: 14px;
color: @textcolor2; color: @textcolor2;
border-radius: 15px; border-radius: 10px;
padding: 2px 10px 0px 10px; padding: 2px 10px 0px 10px;
margin: 8px 10px 8px 0px; margin: 8px 10px 8px 0px;
opacity:0.8; /* opacity:0.8; */
} }
#bluetooth.off { #bluetooth.off {
@ -393,9 +443,9 @@ window#waybar.empty #window {
#battery { #battery {
background-color: @backgroundlight; background-color: @backgroundlight;
font-size: 16px; font-size: 14px;
color: @textcolor2; color: @textcolor2;
border-radius: 15px; border-radius: 10px;
padding: 2px 15px 0px 10px; padding: 2px 15px 0px 10px;
margin: 8px 10px 8px 0px; margin: 8px 10px 8px 0px;
opacity:0.8; opacity:0.8;
@ -428,8 +478,13 @@ window#waybar.empty #window {
* ----------------------------------------------------- */ * ----------------------------------------------------- */
#tray { #tray {
padding: 0px 10px 0px 0px; padding: 0px 10px 0px 10px;
color: @textcolor3; color: @textcolor3;
background-color: @backgroundlight;
font-size: 14px;
border-radius: 10px;
margin: 8px 10px 8px 0px;
opacity:0.8;
} }
#tray > .passive { #tray > .passive {