pixelifytica/nixos
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Tweak waybar style and config, change colour order for new bar order, add Hyprland env vars

Browse source
This commit is contained in:
Evie Litherland-Smith 2023-06-19 10:27:05 +01:00
parent 73c0e3d5a9
commit d98ef18f68
3 changed files with 81 additions and 67 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
home/desktop/config/waybar/modules.json
View file

@ -103,7 +103,7 @@
}, },
"network#compact": { "network#compact": {
"format-wifi": "({signalStrength}%) 󰖩", "format-wifi": "({signalStrength}%) 󰖩",
"format-ethernet": "{ifname} 󰈁", "format-ethernet": "󰈁",
"tooltip-format": "{essid}", "tooltip-format": "{essid}",
"format-linked": "(No IP) 󰈁", "format-linked": "(No IP) 󰈁",
"format-disconnected": "󰈂" "format-disconnected": "󰈂"
@ -151,9 +151,9 @@
"format": "{name}:{icon}", "format": "{name}:{icon}",
"format-icons": { "format-icons": {
"1": "󰅴", "1": "󰅴",
"2": "󰊯", "2": "󰈹",
"3": "󰷏", "3": "󰻞",
"4": "󰻞", "4": "󰒍",
"urgent": "", "urgent": "",
"focused": "", "focused": "",
"default": "" "default": ""
@ -173,9 +173,9 @@
"format": "{name}:{icon}", "format": "{name}:{icon}",
"format-icons": { "format-icons": {
"1": "󰅴", "1": "󰅴",
"2": "󰊯", "2": "󰈹",
"3": "󰷏", "3": "󰻞",
"4": "󰻞", "4": "󰒍",
"urgent": "", "urgent": "",
"focused": "", "focused": "",
"default": "" "default": ""

115
home/desktop/config/waybar/style.css
View file

@ -1,115 +1,122 @@
@import 'macchiato.css'; @import 'macchiato.css';
* { * {
border: none; border: none;
border-radius: 10px; border-radius: 10px;
font-family: "FiraCode Nerd Font"; font-family: "FiraCode Nerd Font";
font-size: 18px; font-size: 18px;
} }
window#waybar { window#waybar {
background: transparent; background: transparent;
} }
window#waybar.hidden { window#waybar.hidden {
opacity: 0.2; opacity: 0.2;
} }
#window { #window {
margin-top: 6px; margin-top: 6px;
padding-left: 10px; padding-left: 10px;
padding-right: 10px; padding-right: 10px;
border-radius: 10px; border-radius: 10px;
transition: none; transition: none;
color: transparent; color: transparent;
background: transparent; background: transparent;
} }
#workspaces button { #workspaces button {
transition: none; transition: none;
color: @overlay0; color: @overlay0;
box-shadow: inset 0 -3px transparent; box-shadow: inset 0 -3px transparent;
border-radius: 2px; border-radius: 2px;
} }
#workspaces button.active, #workspaces button.active,
#workspaces button.focused { #workspaces button.focused {
color: @base; color: @base;
} }
#workspaces button:hover { #workspaces button:hover {
transition: none; transition: none;
box-shadow: inherit; box-shadow: inherit;
text-shadow: inherit; text-shadow: inherit;
color: @base; color: @base;
border-color: #e8a2af; border-color: #e8a2af;
color: @base; color: @base;
} }
#workspaces button.focused:hover { #workspaces button.focused:hover {
color: @base; color: @base;
} }
/* left section */
#workspaces, #workspaces,
#cpu, #cpu,
#memory, #memory,
#temperature, #temperature,
/* centre section */
#clock,
/* right section */
#pulseaudio, #pulseaudio,
#bluetooth, #bluetooth,
#network, #network,
#backlight, #backlight,
#battery, #battery,
#clock,
#tray { #tray {
margin-top: 0px; margin-top: 0px;
margin-bottom: 0px; margin-bottom: 0px;
margin-left: 0px; margin-left: 0px;
margin-right: 0px; margin-right: 0px;
padding-left: 10px; padding-left: 10px;
padding-right: 10px; padding-right: 10px;
transition: none; transition: none;
color: @crust; color: @crust;
background: @lavender; background: @lavender;
} }
#clock { #workspaces {
background: @pink; background: @lavender;
} }
#cpu { #cpu {
background: @mauve; background: @pink;
} }
#memory { #memory {
background: @red; background: @mauve;
} }
#temperature { #temperature {
background: @yellow; background: @red;
}
#clock {
background: @yellow;
} }
#pulseaudio { #pulseaudio {
background: @green; background: @green;
} }
#bluetooth { #bluetooth {
background: @teal; background: @teal;
} }
#network { #network {
background: @sky; background: @sky;
} }
#backlight { #backlight {
background: @sapphire; background: @sapphire;
} }
#battery { #battery {
background: @blue; background: @blue;
} }
#battery.charging, #battery.charging,
#battery.plugged { #battery.plugged {
background-color: @blue; background-color: @blue;
} }
#battery.critical:not(.charging) { #battery.critical:not(.charging) {
background-color: @blue; background-color: @blue;
animation-name: blink; animation-name: blink;
animation-duration: 0.5s; animation-duration: 0.5s;
animation-timing-function: linear; animation-timing-function: linear;
animation-iteration-count: infinite; animation-iteration-count: infinite;
animation-direction: alternate; animation-direction: alternate;
} }
@keyframes blink { @keyframes blink {
to { to {
color: @red; color: @red;
} }
} }
#tray { #tray {
color: @base; color: @base;

19
home/desktop/hyprland.nix
View file

@ -30,6 +30,7 @@ in {
programs.rofi.package = pkgs.rofi-wayland; programs.rofi.package = pkgs.rofi-wayland;
wayland.windowManager.hyprland = { wayland.windowManager.hyprland = {
enable = true; enable = true;
package = null; # Use package from nixpkgs
xwayland = { xwayland = {
enable = true; enable = true;
hidpi = true; hidpi = true;
@ -37,10 +38,16 @@ in {
extraConfig = lib.mkDefault ''source=./common.conf ''; extraConfig = lib.mkDefault ''source=./common.conf '';
}; };
xdg.configFile."hypr/common.conf".text = '' xdg.configFile."hypr/common.conf".text = ''
monitor=,preferred,auto,auto monitor = ,preferred,auto,auto
exec-once = waybar & hyprpaper & dunst & eww daemon exec-once = waybar & hyprpaper & dunst
source = ./macchiato.conf 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 env = XCURSOR_SIZE,24
input { input {
@ -99,7 +106,7 @@ in {
bind = SUPER, Space, exec, rofi -show drun bind = SUPER, Space, exec, rofi -show drun
bind = SUPER, S, exec, grim -g "$(slurp)" bind = SUPER, S, exec, grim -g "$(slurp)"
bind = SUPER, F1, exec, swaylock bind = SUPER, F1, exec, swaylock
bind = SUPER, W, exec, chromium bind = SUPER, W, exec, firefox
bind = SUPER, F, exec, thunar bind = SUPER, F, exec, thunar
bind = SUPER, M, fullscreen, 1 bind = SUPER, M, fullscreen, 1
bind = SUPER, A, bringactivetotop bind = SUPER, A, bringactivetotop
@ -180,15 +187,15 @@ in {
windowrule = float, ^(pavucontrol)$ windowrule = float, ^(pavucontrol)$
windowrule = float, ^(.blueman-manager-wrapped)$ windowrule = float, ^(.blueman-manager-wrapped)$
windowrule = float, ^(otpclient)$ windowrule = float, ^(otpclient)$
windowrule = float, ^(thunar)$
windowrule = center, ^(foot)$ windowrule = center, ^(foot)$
windowrule = center, ^(pavucontrol)$ windowrule = center, ^(pavucontrol)$
windowrule = center, ^(.blueman-manager-wrapped)$ windowrule = center, ^(.blueman-manager-wrapped)$
windowrule = move 2% 6%, ^(otpclient)$ windowrule = move 2% 6%, ^(otpclient)$
windowrule = workspace 2, ^(chromium-browser)$ windowrule = workspace 2, ^(firefox)$
windowrule = workspace 3, ^(thunar|libreoffice).*$ windowrule = workspace 3 silent, ^(Element|Signal|discord)$
windowrule = workspace 4 silent, ^(Element|Signal|discord)$
''; '';
xdg.configFile."hypr/macchiato.conf".text = '' xdg.configFile."hypr/macchiato.conf".text = ''
$rosewaterAlpha = f4dbd6 $rosewaterAlpha = f4dbd6