fix(monitors): fix multi-monitor setup

apps/hyprland/default.nix

@@ -1,4 +1,4 @@
-{pkgs, ...}: {
+{
   imports = [
     ./hypr/binds.nix
     ./hypr/general.nix
@@ -12,7 +12,4 @@
   ];
   wayland.windowManager.hyprland.enable = true;
   wayland.windowManager.hyprland.systemd.enable = false; # for UWSM support...
-  wayland.windowManager.hyprland.plugins = [
-    pkgs.hyprlandPlugins.hyprsplit
-  ];
 }

apps/hyprland/hypr/binds.nix

@@ -71,18 +71,22 @@
         "SUPER, Tab, Cycle workspaces, workspace, previous"
       ]
       ++ (
-        # Generate binds for Super + [1-5] to switch workspaces on current monitor
+        # Generate binds for Super + [1-10] to switch workspaces
-        # and Super + Shift + [1-5] to move window to workspace on current monitor
+        # and Super + Shift + [1-10] to move window to workspace
         builtins.concatLists (builtins.genList (
             i: let
               ws = i + 1;
-              key = toString ws;
+              key = toString (
+                if ws == 10
+                then 0
+                else ws
+              );
             in [
-              "SUPER, ${key}, Switch to workspace ${toString ws}, split:workspace, ${toString ws}"
+              "SUPER, ${key}, Switch to workspace ${toString ws}, exec, hakase-workspace-switch-force ${toString ws}"
-              "SUPER SHIFT, ${key}, Move window to workspace ${toString ws}, split:movetoworkspace, ${toString ws}"
+              "SUPER SHIFT, ${key}, Move window to workspace ${toString ws}, movetoworkspace, ${toString ws}"
             ]
           )
-          5)
+          10)
       );
   };
 }

apps/hyprland/hypr/exec.nix

@@ -8,7 +8,6 @@
       "killall -SIGUSR2 .ghostty-wrappe"
     ];
     exec-once = [
-      "hyprpm reload -n"
       "[workspace special:preload silent] uwsm app -- firefox"
       "[workspace special:preload silent] uwsm app -- firefox -P YouTube"
       "[workspace special:preload silent] uwsm app -- xdg-terminal-exec"

apps/hyprland/hypr/misc.nix

@@ -18,12 +18,5 @@
       direct_scanout = true;
       cm_enabled = true;
     };
-
-    plugin = {
-      hyprsplit = {
-        num_workspaces = 5;
-        persistent_workspaces = false;
-      };
-    };
   };
 }

flake.lock

@@ -333,11 +333,11 @@
         "xdph": "xdph"
       },
       "locked": {
-        "lastModified": 1767201430,
+        "lastModified": 1766498696,
-        "narHash": "sha256-4BUM06GqP5YAVnWvxkdeYuweMF6n+oKdxJI5S9TmA1E=",
+        "narHash": "sha256-74qO6ynwUav+QqNhBVn/4yoBCpU6r3/eCkX/V11uL+E=",
         "ref": "refs/heads/main",
-        "rev": "48a024e0322bbd7c4c88126498ec478444ec4cb2",
+        "rev": "f7f357f15f83612078eb0919ca08b71cac01c25e",
-        "revCount": 6763,
+        "revCount": 6741,
         "submodules": true,
         "type": "git",
         "url": "https://github.com/hyprwm/Hyprland"
@@ -448,26 +448,6 @@
         "type": "github"
       }
     },
-    "hyprsplit": {
-      "inputs": {
-        "hyprland": [
-          "hyprland"
-        ]
-      },
-      "locked": {
-        "lastModified": 1766546378,
-        "narHash": "sha256-GSoSLHErh1mRfgXM57W98L67MMBHKCemHzxoZPrejSI=",
-        "owner": "shezdy",
-        "repo": "hyprsplit",
-        "rev": "9a8b55f4269bfa5c59d03ed9f4502f433572c616",
-        "type": "github"
-      },
-      "original": {
-        "owner": "shezdy",
-        "repo": "hyprsplit",
-        "type": "github"
-      }
-    },
     "hyprtoolkit": {
       "inputs": {
         "aquamarine": [
@@ -784,7 +764,6 @@
         "elephant": "elephant",
         "home-manager": "home-manager_2",
         "hyprland": "hyprland",
-        "hyprsplit": "hyprsplit",
         "nixovim": "nixovim",
         "nixpkgs": "nixpkgs_2",
         "nur": "nur",

flake.nix

@@ -27,10 +27,6 @@
       url = "git+https://github.com/hyprwm/Hyprland?submodules=1";
       inputs.nixpkgs.follows = "nixpkgs";
     };
-    hyprsplit = {
-      url = "github:shezdy/hyprsplit";
-      inputs.hyprland.follows = "hyprland";
-    };
     nixovim = {
       # FIXME: treesitter does not install automatically (disabled due to read-only problems)
       url = "git+https://git.sakamoto.dev/kenji/nixovim.git";

modules/home/apps-optional.nix

@@ -4,6 +4,5 @@
     ../../apps/jellyfin
     ../../apps/tickrs
     ../../apps/claude
-    ../../apps/delfin
   ];
 }

modules/nixos/hyprland.nix

@@ -1,11 +1,13 @@
 {
   myConfig,
+  inputs,
   pkgs,
   ...
 }: {
   programs.hyprland = {
     enable = true;
-    # Use nixpkgs Hyprland for ABI compatibility with plugins
+    package = inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.hyprland;
+    portalPackage = inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.xdg-desktop-portal-hyprland;
     withUWSM = true;
   };