Waybar: remove window module and enable systemd again

Add output movement binds from Hyprland

home/sway/default.nix

@@ -68,7 +68,6 @@
       startup = [
         {command = "${pkgs.swaynotificationcenter}/bin/swaync";}
         {command = "${pkgs.swaybg}/bin/swaybg -i ${../../wallpapers/waves/cat-waves.png}";}
-        {command = "${pkgs.waybar}/bin/waybar";}
         {command = "${pkgs.libsForQt5.polkit-kde-agent}/libexec/polkit-kde-authentication-agent-1";}
         {command = "${pkgs.protonmail-bridge}/bin/protonmail-bridge -n";}
       ];
@@ -123,6 +122,10 @@
         }: "${package}/bin/${term} -T ${progname} -e ${progname} ${args}";
       in
         lib.mkOptionDefault {
+          # Movement
+          "${modifier}+bracketleft" = "move workspace to output left";
+          "${modifier}+bracketright" = "move workspace to output right";
+
           # Function keys
           ## Sound
           "XF86AudioMute" = "exec ${services.avizo.package}/bin/volumectl %";
@@ -144,16 +147,12 @@
           "${modifier}+F1" = "exec ${programs.swaylock.package}/bin/swaylock --screenshots --clock --indicator --grace-no-mouse";
           "${modifier}+z" = "exec ${pkgs.swaynotificationcenter}/bin/swaync-client -t -sw";
           "${modifier}+Shift+z" = "exec ${pkgs.swaynotificationcenter}/bin/swaync-client -d -sw";
+          "${modifier}+Shift+Return" = "exec ${programs.emacs.finalPackage}/bin/emacsclient -c";
           # "${modifier}+s" = "exec ${withTerm {
           #   progname = "btm";
           #   args = "--autohide_time --battery --celsius --enable_cache_memory --enable_gpu_memory --group --hide_avg_cpu --hide_table_gap --retention=3m --show_table_scroll_position";
           # }}";
           # "${modifier}+c" = "exec ${withTerm {progname = "cava";}}"
-
-          # Program shortcuts
-          "${modifier}+e" = "exec ${programs.emacs.finalPackage}/bin/emacsclient -c";
-          "${modifier}+w" = "exec ${programs.firefox.package}/bin/firefox";
-          "${modifier}+f" = "exec ${pkgs.xfce.thunar}/bin/thunar";
         };
     };
     extraConfig = ''

home/waybar/default.nix

@@ -12,17 +12,16 @@
   };
   programs.waybar = {
     enable = true;
+    systemd = {
+      enable = true;
+      target = "sway-session.target";
+    };
     settings.main = {
       layer = "top";
       position = "top";
       # Layout
-      "modules-left" = [
-        "sway/workspaces"
-        "sway/window"
-      ];
-      "modules-center" = [
-        "mpris"
-      ];
+      "modules-left" = ["sway/workspaces"];
+      "modules-center" = ["mpris"];
       "modules-right" = [
         "custom/notification"
         "pulseaudio"