diff --git a/system/global/home.nix b/system/global/home.nix index 1bb64f1..03c47a3 100644 --- a/system/global/home.nix +++ b/system/global/home.nix @@ -177,12 +177,12 @@ layer = "top"; position = "top"; height = 36; - modules-left = [ "wlr/taskbar" "hyprland/window" ]; - modules-right = [ "mpris" "wireplumber" "clock" "tray" ]; + modules-left = [ "hyprland/window" ]; + modules-right = [ "mpris" "pulseaudio" "clock" "tray" "battery" ]; clock = { format = "📅 {:%a %b-%d %I:%M %p}"; }; - wireplumber = { + pulseaudio = { format-muted = "🔇 {volume}%"; format = "{icon} {volume}"; format-icons.default = ["🔈" "🔉" "🔊"]; @@ -200,6 +200,14 @@ }; on-click = "~/.local/scripts/play-pause"; }; + battery = { + format = "{icon} {capacity}%"; + format-icons = ["🤏" "đŸĒĢ" "🔋"]; + states = { + warning = 30; + critical = 15; + }; + }; }; }; programs.waybar.systemd = { diff --git a/system/work/home.nix b/system/work/home.nix index d22d113..86eeba5 100644 --- a/system/work/home.nix +++ b/system/work/home.nix @@ -28,20 +28,10 @@ primary = true; }; - programs.waybar.settings.mainBar = { - modules-right = ["battery"]; - battery = { - format = "{icon} {capacity}%"; - format-icons = ["🤏" "đŸĒĢ" "🔋"]; - states = { - warning = 30; - critical = 15; - }; - }; - }; - wayland.windowManager.hyprland = { extraConfig = '' + exec-once = swaybg -o eDP-1 -i ~/Pictures/backgrounds/nix-wallpaper-simple-red.png & + monitor = ,preferred,auto, 1.2 input { kb_variant = dvorak