Merge branch 'upstream-custom' into dev
This commit is contained in:
commit
6a943e7e61
@ -9,9 +9,11 @@ packagesPacman=(
|
|||||||
"cliphist"
|
"cliphist"
|
||||||
"hyprlock"
|
"hyprlock"
|
||||||
"hypridle"
|
"hypridle"
|
||||||
|
"kitty"
|
||||||
);
|
);
|
||||||
|
|
||||||
packagesYay=(
|
packagesYay=(
|
||||||
|
"pyprland"
|
||||||
"swww"
|
"swww"
|
||||||
"wlogout"
|
"wlogout"
|
||||||
"nwg-look"
|
"nwg-look"
|
||||||
|
@ -7,6 +7,6 @@ plugins = [
|
|||||||
|
|
||||||
[scratchpads.term]
|
[scratchpads.term]
|
||||||
animation = "fromTop"
|
animation = "fromTop"
|
||||||
command = "alacritty --class alacritty-dropterm"
|
command = "kitty --class kitty-dropterm"
|
||||||
class = "alacritty-dropterm"
|
class = "kitty-dropterm"
|
||||||
size = "75% 60%"
|
size = "75% 60%"
|
||||||
|
@ -8,9 +8,9 @@
|
|||||||
@define-color workspacesbackground1 @color5;
|
@define-color workspacesbackground1 @color5;
|
||||||
@define-color workspacesbackground2 @color11;
|
@define-color workspacesbackground2 @color11;
|
||||||
@define-color bordercolor @color11;
|
@define-color bordercolor @color11;
|
||||||
@define-color textcolor1 #FFFFFF;
|
@define-color textcolor1 @foreground;
|
||||||
@define-color textcolor2 #FFFFFF;
|
@define-color textcolor2 @foreground;
|
||||||
@define-color textcolor3 #FFFFFF;
|
@define-color textcolor3 @foreground;
|
||||||
@define-color iconcolor #FFFFFF;
|
@define-color iconcolor @foreground;
|
||||||
|
|
||||||
@import '../style.css';
|
@import '../style.css';
|
||||||
|
@ -45,10 +45,10 @@
|
|||||||
//"bluetooth",
|
//"bluetooth",
|
||||||
"battery",
|
"battery",
|
||||||
"battery#charging",
|
"battery#charging",
|
||||||
"network",
|
// "network",
|
||||||
"cpu",
|
// "cpu",
|
||||||
"memory",
|
// "memory",
|
||||||
//"group/hardware",
|
"group/hardware",
|
||||||
//"custom/cliphist",
|
//"custom/cliphist",
|
||||||
"tray",
|
"tray",
|
||||||
"idle_inhibitor",
|
"idle_inhibitor",
|
||||||
|
@ -216,6 +216,18 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
||||||
|
"group/tray": {
|
||||||
|
"orientation": "inherit",
|
||||||
|
"drawer": {
|
||||||
|
"transition-duration": 300,
|
||||||
|
"children-class": "not-memory",
|
||||||
|
"transition-left-to-right": false
|
||||||
|
},
|
||||||
|
"modules": [
|
||||||
|
"tray"
|
||||||
|
]
|
||||||
|
},
|
||||||
|
|
||||||
// System tray
|
// System tray
|
||||||
"tray": {
|
"tray": {
|
||||||
"icon-size": 21,
|
"icon-size": 21,
|
||||||
@ -267,17 +279,10 @@
|
|||||||
// Group Hardware
|
// Group Hardware
|
||||||
"group/hardware": {
|
"group/hardware": {
|
||||||
"orientation": "inherit",
|
"orientation": "inherit",
|
||||||
"drawer": {
|
|
||||||
"transition-duration": 300,
|
|
||||||
"children-class": "not-memory",
|
|
||||||
"transition-left-to-right": false
|
|
||||||
},
|
|
||||||
"modules": [
|
"modules": [
|
||||||
"custom/system",
|
|
||||||
"disk",
|
|
||||||
"cpu",
|
"cpu",
|
||||||
"memory",
|
"memory",
|
||||||
"hyprland/language"
|
"network"
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
|
|
||||||
|
@ -285,7 +285,7 @@ window#waybar.empty #window {
|
|||||||
* Hardware Group
|
* Hardware Group
|
||||||
* ----------------------------------------------------- */
|
* ----------------------------------------------------- */
|
||||||
|
|
||||||
#disk,#memory,#cpu,#language {
|
/* #disk,#memory,#cpu,#language {
|
||||||
background-color: @backgroundlight;
|
background-color: @backgroundlight;
|
||||||
font-size: 16px;
|
font-size: 16px;
|
||||||
color: @textcolor2;
|
color: @textcolor2;
|
||||||
@ -293,7 +293,9 @@ window#waybar.empty #window {
|
|||||||
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;
|
||||||
}
|
} */
|
||||||
|
|
||||||
|
#groups
|
||||||
|
|
||||||
#language {
|
#language {
|
||||||
margin-right:10px;
|
margin-right:10px;
|
||||||
@ -337,7 +339,7 @@ window#waybar.empty #window {
|
|||||||
* Network
|
* Network
|
||||||
* ----------------------------------------------------- */
|
* ----------------------------------------------------- */
|
||||||
|
|
||||||
#network {
|
/* #network {
|
||||||
background-color: @backgroundlight;
|
background-color: @backgroundlight;
|
||||||
font-size: 16px;
|
font-size: 16px;
|
||||||
color: @textcolor2;
|
color: @textcolor2;
|
||||||
@ -355,7 +357,7 @@ window#waybar.empty #window {
|
|||||||
#network.wifi {
|
#network.wifi {
|
||||||
background-color: @backgroundlight;
|
background-color: @backgroundlight;
|
||||||
color: @textcolor2;
|
color: @textcolor2;
|
||||||
}
|
} */
|
||||||
|
|
||||||
/* -----------------------------------------------------
|
/* -----------------------------------------------------
|
||||||
* Bluetooth
|
* Bluetooth
|
||||||
|
Loading…
Reference in New Issue
Block a user