upstream-main 2.9.2 #6

Open
wyj wants to merge 34 commits from upstream-main into upstream-custom
12 changed files with 90 additions and 29 deletions
Showing only changes of commit 5027ad2902 - Show all commits

View File

@ -0,0 +1,26 @@
{
"custom/quicklink1": {
"format": "",
"on-click": "~/dotfiles/.settings/browser.sh",
"tooltip-format": "Open browser"
},
/*
"custom/quicklink1": {
"format": "",
"on-click": "firefox",
"tooltip-format": "Open Firefox"
},
*/
"custom/quicklink2": {
"format": "",
"on-click": "~/dotfiles/.settings/filemanager.sh",
"tooltip-format": "Open filemanager"
},
"group/quicklinks": {
"orientation": "horizontal",
"modules": [
"custom/quicklink1",
"custom/quicklink2"
]
}
}

View File

@ -136,20 +136,6 @@
"tooltip": false "tooltip": false
}, },
// Filemanager Launcher
"custom/filemanager": {
"format": "",
"on-click": "~/dotfiles/.settings/filemanager.sh",
"tooltip-format": "Open filemanager"
},
// Browser Launcher
"custom/browser": {
"format": "",
"on-click": "~/dotfiles/.settings/browser.sh",
"tooltip-format": "Open browser"
},
// ChatGPT Launcher // ChatGPT Launcher
"custom/chatgpt": { "custom/chatgpt": {
"format": " ", "format": " ",
@ -315,15 +301,6 @@
] ]
}, },
// Group Quicklinks
"group/quicklinks": {
"orientation": "horizontal",
"modules": [
"custom/browser",
"custom/filemanager",
]
},
// Network // Network
"network": { "network": {
"format": "{ifname}", "format": "{ifname}",

View File

@ -19,7 +19,10 @@
"spacing": 0, "spacing": 0,
// Load Modules // Load Modules
"include": ["~/dotfiles/waybar/modules.json"], "include": [
"~/dotfiles/.settings/waybar-quicklinks.json",
"~/dotfiles/waybar/modules.json"
],
// Modules Left // Modules Left
"modules-left": [ "modules-left": [

View File

@ -19,7 +19,10 @@
"spacing": 0, "spacing": 0,
// Load Modules // Load Modules
"include": ["~/dotfiles/waybar/modules.json"], "include": [
"~/dotfiles/.settings/waybar-quicklinks.json",
"~/dotfiles/waybar/modules.json"
],
// Modules Left // Modules Left
"modules-left": [ "modules-left": [

View File

@ -165,6 +165,16 @@ window#waybar.empty #window {
#custom-system, #custom-system,
#custom-hyprshade, #custom-hyprshade,
#custom-hypridle, #custom-hypridle,
#custom-quicklink1,
#custom-quicklink2,
#custom-quicklink3,
#custom-quicklink4,
#custom-quicklink5,
#custom-quicklink6,
#custom-quicklink7,
#custom-quicklink8,
#custom-quicklink9,
#custom-quicklink10,
#custom-waybarthemes { #custom-waybarthemes {
margin-right: 23px; margin-right: 23px;
font-size: 20px; font-size: 20px;

View File

@ -19,7 +19,10 @@
"spacing": 0, "spacing": 0,
// Load Modules // Load Modules
"include": ["~/dotfiles/waybar/modules.json"], "include": [
"~/dotfiles/.settings/waybar-quicklinks.json",
"~/dotfiles/waybar/modules.json"
],
// Modules Left // Modules Left
"modules-left": [ "modules-left": [

View File

@ -18,7 +18,10 @@
"spacing": 0, "spacing": 0,
// Load Modules // Load Modules
"include": ["~/dotfiles/waybar/modules.json"], "include": [
"~/dotfiles/.settings/waybar-quicklinks.json",
"~/dotfiles/waybar/modules.json"
],
// Modules Left // Modules Left
"modules-left": [ "modules-left": [

View File

@ -136,6 +136,16 @@ window#waybar.empty #window {
#custom-system, #custom-system,
#custom-hyprshade, #custom-hyprshade,
#custom-hypridle, #custom-hypridle,
#custom-quicklink1,
#custom-quicklink2,
#custom-quicklink3,
#custom-quicklink4,
#custom-quicklink5,
#custom-quicklink6,
#custom-quicklink7,
#custom-quicklink8,
#custom-quicklink9,
#custom-quicklink10,
#custom-waybarthemes { #custom-waybarthemes {
margin-right: 23px; margin-right: 23px;
font-size: 14px; font-size: 14px;

View File

@ -19,7 +19,10 @@
"spacing": 0, "spacing": 0,
// Load Modules // Load Modules
"include": ["~/dotfiles/waybar/modules.json"], "include": [
"~/dotfiles/.settings/waybar-quicklinks.json",
"~/dotfiles/waybar/modules.json"
],
// Modules Left // Modules Left
"modules-left": [ "modules-left": [

View File

@ -166,6 +166,16 @@ window#waybar.empty #window {
#custom-system, #custom-system,
#custom-hyprshade, #custom-hyprshade,
#custom-hypridle, #custom-hypridle,
#custom-quicklink1,
#custom-quicklink2,
#custom-quicklink3,
#custom-quicklink4,
#custom-quicklink5,
#custom-quicklink6,
#custom-quicklink7,
#custom-quicklink8,
#custom-quicklink9,
#custom-quicklink10,
#custom-waybarthemes { #custom-waybarthemes {
margin-right: 23px; margin-right: 23px;
font-size: 20px; font-size: 20px;

View File

@ -26,7 +26,10 @@
"spacing": 0, "spacing": 0,
// Load Modules // Load Modules
"include": ["~/dotfiles/waybar/themes/starter/modules.json"], "include": [
"~/dotfiles/.settings/waybar-quicklinks.json",
"~/dotfiles/waybar/themes/starter/modules.json"
],
// Modules Left // Modules Left
"modules-left": [ "modules-left": [

View File

@ -166,6 +166,16 @@ window#waybar.empty #window {
#custom-system, #custom-system,
#custom-hyprshade, #custom-hyprshade,
#custom-hypridle, #custom-hypridle,
#custom-quicklink1,
#custom-quicklink2,
#custom-quicklink3,
#custom-quicklink4,
#custom-quicklink5,
#custom-quicklink6,
#custom-quicklink7,
#custom-quicklink8,
#custom-quicklink9,
#custom-quicklink10,
#custom-waybarthemes { #custom-waybarthemes {
margin-right: 23px; margin-right: 23px;
font-size: 20px; font-size: 20px;