diff --git a/modules/gui/hypr/land.nix b/modules/gui/hypr/land.nix
index fb14f6c..af603f1 100644
--- a/modules/gui/hypr/land.nix
+++ b/modules/gui/hypr/land.nix
@@ -155,14 +155,6 @@ in {
                 enable = true;
                 package = hyprland;
                 plugins = cfg.extraPlugins;
-                # TODO make these work with the config below (infinite recursion)
-                # and make this file stop hanging my neovim every 2 seconds
-                # and figure out why it triggers E79 every single time I edit something
-                extraConfig = ''
-                    bind=$mainMod, W, exec, ${removeSuffix " %U" hmCfg.xdg.desktopEntries.firefox-schizo.exec}
-                    bind=$mainMod SHIFT, W, exec, ${removeSuffix " %U" hmCfg.xdg.desktopEntries.firefox-unschizo.exec}
-                    ${if (cfg.startupSound != null) then "exec-once=${mpv} --no-video --volume=100 ${hmCfg.xdg.dataHome}/hypr/startup_sound" else ""}
-                '';
                 settings = {
                     "$mainMod" = "SUPER";
 
@@ -355,6 +347,8 @@ in {
                         "$mainMod SHIFT, 8, ${if smwPresent then "split-" else ""}movetoworkspacesilent, 8"
                         "$mainMod SHIFT, 9, ${if smwPresent then "split-" else ""}movetoworkspacesilent, 9"
                         "$mainMod SHIFT, 0, ${if smwPresent then "split-" else ""}movetoworkspacesilent, 10"
+                        "$mainMod, W, exec, ${removeSuffix " %U" hmCfg.xdg.desktopEntries.firefox-schizo.exec}"
+                        "$mainMod SHIFT, W, exec, ${removeSuffix " %U" hmCfg.xdg.desktopEntries.firefox-unschizo.exec}"
                         # screenshots
                         "$mainMod, S, exec, ${grimblast} save area - | ${tee} \"$(${xdg-user-dir} PICTURES)/Screenshots/$(date +'screenshot-%Y%m%d%H%M%S.png')\" | ${wl-copy} && ${notify-send} \"Screenshot taken\""
                         "$mainMod SHIFT, S, exec, ${grimblast} save area - | ${shadower} | ${tee} \"$(${xdg-user-dir} PICTURES)/Screenshots/$(date +'screenshot-%Y%m%d%H%M%S.png')\" | ${wl-copy} && ${notify-send} \"Screenshot taken (shadower)\""
@@ -504,6 +498,7 @@ in {
                         "${systemctl} --user import-environment WAYLAND_DISPLAY XDG_CURRENT_DESKTOP"
                         "${dbus-update-activation-environment} --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP=$XDG_CURRENT_DESKTOP"
                         "${handle_hyprland_events}"
+                        (mkIf (cfg.startupSound != null) "${mpv} --no-video --volume=100 ${hmCfg.xdg.dataHome}/hypr/startup_sound")
                     ] ++ cfg.extraSettings.exec-once;
 
                     exec = [