Tweak waybar style and config, change colour order for new bar order, add Hyprland env vars
This commit is contained in:
parent
73c0e3d5a9
commit
d98ef18f68
|
|
@ -103,7 +103,7 @@
|
|||
},
|
||||
"network#compact": {
|
||||
"format-wifi": "({signalStrength}%) ",
|
||||
"format-ethernet": "{ifname} ",
|
||||
"format-ethernet": "",
|
||||
"tooltip-format": "{essid}",
|
||||
"format-linked": "(No IP) ",
|
||||
"format-disconnected": ""
|
||||
|
|
@ -151,9 +151,9 @@
|
|||
"format": "{name}:{icon}",
|
||||
"format-icons": {
|
||||
"1": "",
|
||||
"2": "",
|
||||
"3": "",
|
||||
"4": "",
|
||||
"2": "",
|
||||
"3": "",
|
||||
"4": "",
|
||||
"urgent": "",
|
||||
"focused": "",
|
||||
"default": ""
|
||||
|
|
@ -173,9 +173,9 @@
|
|||
"format": "{name}:{icon}",
|
||||
"format-icons": {
|
||||
"1": "",
|
||||
"2": "",
|
||||
"3": "",
|
||||
"4": "",
|
||||
"2": "",
|
||||
"3": "",
|
||||
"4": "",
|
||||
"urgent": "",
|
||||
"focused": "",
|
||||
"default": ""
|
||||
|
|
|
|||
|
|
@ -1,115 +1,122 @@
|
|||
@import 'macchiato.css';
|
||||
|
||||
* {
|
||||
border: none;
|
||||
border-radius: 10px;
|
||||
font-family: "FiraCode Nerd Font";
|
||||
font-size: 18px;
|
||||
border: none;
|
||||
border-radius: 10px;
|
||||
font-family: "FiraCode Nerd Font";
|
||||
font-size: 18px;
|
||||
}
|
||||
|
||||
window#waybar {
|
||||
background: transparent;
|
||||
background: transparent;
|
||||
}
|
||||
window#waybar.hidden {
|
||||
opacity: 0.2;
|
||||
opacity: 0.2;
|
||||
}
|
||||
#window {
|
||||
margin-top: 6px;
|
||||
padding-left: 10px;
|
||||
padding-right: 10px;
|
||||
border-radius: 10px;
|
||||
transition: none;
|
||||
color: transparent;
|
||||
background: transparent;
|
||||
margin-top: 6px;
|
||||
padding-left: 10px;
|
||||
padding-right: 10px;
|
||||
border-radius: 10px;
|
||||
transition: none;
|
||||
color: transparent;
|
||||
background: transparent;
|
||||
}
|
||||
|
||||
#workspaces button {
|
||||
transition: none;
|
||||
color: @overlay0;
|
||||
box-shadow: inset 0 -3px transparent;
|
||||
border-radius: 2px;
|
||||
transition: none;
|
||||
color: @overlay0;
|
||||
box-shadow: inset 0 -3px transparent;
|
||||
border-radius: 2px;
|
||||
}
|
||||
#workspaces button.active,
|
||||
#workspaces button.focused {
|
||||
color: @base;
|
||||
color: @base;
|
||||
}
|
||||
#workspaces button:hover {
|
||||
transition: none;
|
||||
box-shadow: inherit;
|
||||
text-shadow: inherit;
|
||||
color: @base;
|
||||
border-color: #e8a2af;
|
||||
color: @base;
|
||||
transition: none;
|
||||
box-shadow: inherit;
|
||||
text-shadow: inherit;
|
||||
color: @base;
|
||||
border-color: #e8a2af;
|
||||
color: @base;
|
||||
}
|
||||
#workspaces button.focused:hover {
|
||||
color: @base;
|
||||
color: @base;
|
||||
}
|
||||
|
||||
/* left section */
|
||||
#workspaces,
|
||||
#cpu,
|
||||
#memory,
|
||||
#temperature,
|
||||
/* centre section */
|
||||
#clock,
|
||||
/* right section */
|
||||
#pulseaudio,
|
||||
#bluetooth,
|
||||
#network,
|
||||
#backlight,
|
||||
#battery,
|
||||
#clock,
|
||||
#tray {
|
||||
margin-top: 0px;
|
||||
margin-bottom: 0px;
|
||||
margin-left: 0px;
|
||||
margin-right: 0px;
|
||||
padding-left: 10px;
|
||||
padding-right: 10px;
|
||||
transition: none;
|
||||
color: @crust;
|
||||
background: @lavender;
|
||||
margin-top: 0px;
|
||||
margin-bottom: 0px;
|
||||
margin-left: 0px;
|
||||
margin-right: 0px;
|
||||
padding-left: 10px;
|
||||
padding-right: 10px;
|
||||
transition: none;
|
||||
color: @crust;
|
||||
background: @lavender;
|
||||
}
|
||||
|
||||
#clock {
|
||||
background: @pink;
|
||||
#workspaces {
|
||||
background: @lavender;
|
||||
}
|
||||
|
||||
#cpu {
|
||||
background: @mauve;
|
||||
background: @pink;
|
||||
}
|
||||
#memory {
|
||||
background: @red;
|
||||
background: @mauve;
|
||||
}
|
||||
#temperature {
|
||||
background: @yellow;
|
||||
background: @red;
|
||||
}
|
||||
#clock {
|
||||
background: @yellow;
|
||||
}
|
||||
#pulseaudio {
|
||||
background: @green;
|
||||
background: @green;
|
||||
}
|
||||
#bluetooth {
|
||||
background: @teal;
|
||||
background: @teal;
|
||||
}
|
||||
#network {
|
||||
background: @sky;
|
||||
background: @sky;
|
||||
}
|
||||
#backlight {
|
||||
background: @sapphire;
|
||||
background: @sapphire;
|
||||
}
|
||||
#battery {
|
||||
background: @blue;
|
||||
background: @blue;
|
||||
}
|
||||
#battery.charging,
|
||||
#battery.plugged {
|
||||
background-color: @blue;
|
||||
background-color: @blue;
|
||||
}
|
||||
#battery.critical:not(.charging) {
|
||||
background-color: @blue;
|
||||
animation-name: blink;
|
||||
animation-duration: 0.5s;
|
||||
animation-timing-function: linear;
|
||||
animation-iteration-count: infinite;
|
||||
animation-direction: alternate;
|
||||
background-color: @blue;
|
||||
animation-name: blink;
|
||||
animation-duration: 0.5s;
|
||||
animation-timing-function: linear;
|
||||
animation-iteration-count: infinite;
|
||||
animation-direction: alternate;
|
||||
}
|
||||
@keyframes blink {
|
||||
to {
|
||||
to {
|
||||
color: @red;
|
||||
}
|
||||
}
|
||||
}
|
||||
#tray {
|
||||
color: @base;
|
||||
|
|
|
|||
|
|
@ -30,6 +30,7 @@ in {
|
|||
programs.rofi.package = pkgs.rofi-wayland;
|
||||
wayland.windowManager.hyprland = {
|
||||
enable = true;
|
||||
package = null; # Use package from nixpkgs
|
||||
xwayland = {
|
||||
enable = true;
|
||||
hidpi = true;
|
||||
|
|
@ -37,10 +38,16 @@ in {
|
|||
extraConfig = lib.mkDefault ''source=./common.conf '';
|
||||
};
|
||||
xdg.configFile."hypr/common.conf".text = ''
|
||||
monitor=,preferred,auto,auto
|
||||
exec-once = waybar & hyprpaper & dunst & eww daemon
|
||||
monitor = ,preferred,auto,auto
|
||||
exec-once = waybar & hyprpaper & dunst
|
||||
source = ./macchiato.conf
|
||||
|
||||
env = XDG_CURRENT_DESKTOP=Hyprland
|
||||
env = XDG_SESSION_TYPE=wayland
|
||||
env = XDG_SESSION_DESKTOP=Hyprland
|
||||
env = GDK_BACKEND=wayland,x11
|
||||
env = GTK_THEME,Sweet-Dark
|
||||
env = XCURSOR_THEME,Catppuccin-Macchiato-Dark-Cursors
|
||||
env = XCURSOR_SIZE,24
|
||||
|
||||
input {
|
||||
|
|
@ -99,7 +106,7 @@ in {
|
|||
bind = SUPER, Space, exec, rofi -show drun
|
||||
bind = SUPER, S, exec, grim -g "$(slurp)"
|
||||
bind = SUPER, F1, exec, swaylock
|
||||
bind = SUPER, W, exec, chromium
|
||||
bind = SUPER, W, exec, firefox
|
||||
bind = SUPER, F, exec, thunar
|
||||
bind = SUPER, M, fullscreen, 1
|
||||
bind = SUPER, A, bringactivetotop
|
||||
|
|
@ -180,15 +187,15 @@ in {
|
|||
windowrule = float, ^(pavucontrol)$
|
||||
windowrule = float, ^(.blueman-manager-wrapped)$
|
||||
windowrule = float, ^(otpclient)$
|
||||
windowrule = float, ^(thunar)$
|
||||
|
||||
windowrule = center, ^(foot)$
|
||||
windowrule = center, ^(pavucontrol)$
|
||||
windowrule = center, ^(.blueman-manager-wrapped)$
|
||||
windowrule = move 2% 6%, ^(otpclient)$
|
||||
|
||||
windowrule = workspace 2, ^(chromium-browser)$
|
||||
windowrule = workspace 3, ^(thunar|libreoffice).*$
|
||||
windowrule = workspace 4 silent, ^(Element|Signal|discord)$
|
||||
windowrule = workspace 2, ^(firefox)$
|
||||
windowrule = workspace 3 silent, ^(Element|Signal|discord)$
|
||||
'';
|
||||
xdg.configFile."hypr/macchiato.conf".text = ''
|
||||
$rosewaterAlpha = f4dbd6
|
||||
|
|
|
|||
Loading…
Reference in a new issue