diff --git a/flake.nix b/flake.nix index 7a403d0..72c936e 100644 --- a/flake.nix +++ b/flake.nix @@ -90,6 +90,7 @@ ./modules/home-manager/starship.nix ./modules/home-manager/dconf-settings.nix ./modules/home-manager/syncthing.nix + ./modules/home-manager/waybar.nix ]; #extra modules to be loaded by home-manager }; }; diff --git a/modules/home-manager/hyprland.nix b/modules/home-manager/hyprland.nix index d7ffec8..84aaf56 100644 --- a/modules/home-manager/hyprland.nix +++ b/modules/home-manager/hyprland.nix @@ -31,7 +31,7 @@ bind = $mainMod SHIFT, 8, movetoworkspace, 8 bind = $mainMod SHIFT, 9, movetoworkspace, 9 bind = $mainMod SHIFT, 0, movetoworkspace, 10 - exec-once=waybar + exec-once=systemctl --user restart waybar.service exec-once=dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP exec-once=mako exec-once = swww init diff --git a/modules/home-manager/waybar.nix b/modules/home-manager/waybar.nix index daec355..a589dc9 100644 --- a/modules/home-manager/waybar.nix +++ b/modules/home-manager/waybar.nix @@ -5,7 +5,7 @@ package = pkgs.waybar; systemd = { enable = true; - target = "hyprland-session.target" + target = "hyprland-session.target"; }; settings = { main_bar = { @@ -26,12 +26,6 @@ "pulseaudio" "battery" ]; - river/tags = { - num-tags = 9; - }; - river/mode = { - format = "Mode: {}"; - }; clock = { format = "{:%H:%M}"; format-alt = "{:%Y-%m-%d}"; @@ -86,7 +80,7 @@ scroll-steps = 10; format-icons = { headphone = ""; - "hands-free" = ""; + hands-free = ""; headset = ""; phone = ""; portable = ""; @@ -103,11 +97,6 @@ icon-size = 20; spacing = 10; }; - custom/joljol = { - exec = "joljol"; - format = "{}"; - update-interval = 100; - }; }; style = '' @@ -185,10 +174,6 @@ color: #ebbcba; } - #custom-joljol { - color: #ebbcba; - margin: 10px 10px 0px 10px; - } #battery { background: #31748f; @@ -320,4 +305,5 @@ } ''; }; +}; } \ No newline at end of file