From f0943839a84693700a725c10cdd73745cb41b353 Mon Sep 17 00:00:00 2001 From: Alexander Date: Wed, 24 Jun 2026 18:59:02 +0200 Subject: [PATCH] Migrated off the split-workspaces For some reason split-workspaces were not found by hyprland, I assume thats because of ongoing migration of hyprland to lua --- flake.lock | 60 ++++++++++++------------- flake.nix | 2 +- modules/window-manager/hypr/default.nix | 51 +++++++++++---------- 3 files changed, 58 insertions(+), 55 deletions(-) diff --git a/flake.lock b/flake.lock index b9c643c..4b4b49c 100644 --- a/flake.lock +++ b/flake.lock @@ -166,11 +166,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1781810104, - "narHash": "sha256-spDsaagbhZSDA86NchqxouC4H4IituH6TR7b8mYIic8=", + "lastModified": 1782301008, + "narHash": "sha256-GxQhjwF6eNDhP43Yup1LPmjKS1lZaTRvmqgYPOwv3Zs=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "6b6fef1565727983e1626009929c37204147abd5", + "rev": "05d06425c4e17fdf1cbc5cdbf744e5d635993245", "type": "github" }, "original": { @@ -532,11 +532,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1781803280, - "narHash": "sha256-LvjQLSOAdnJAh1ShfljgZDJE49xhvyDlcIDrhh0Wzk8=", + "lastModified": 1782315209, + "narHash": "sha256-xKpodJ++lnLqRpmcH5OSimuo874wmgm3rD85J3GDmUw=", "ref": "refs/heads/main", - "rev": "7a75ce5f209d8142c40dfe6dd8bb03749987e11d", - "revCount": 7483, + "rev": "87cd2a5f6697a5923c4f427e9b399d79a354a7b8", + "revCount": 7499, "type": "git", "url": "https://github.com/hyprwm/Hyprland" }, @@ -900,11 +900,11 @@ "nixpkgs": "nixpkgs_7" }, "locked": { - "lastModified": 1781622756, - "narHash": "sha256-JrPh4M6S7aPsEE9tOENuZrxC6o2szSLlK+t4+nLke9s=", + "lastModified": 1782166108, + "narHash": "sha256-/EtnQBcKbsaCAGQ5VRcplrHRkR4ryqyLMpBfkVuG9Xw=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "08018c72174a4df5657f8d94178ac69fb9c243e5", + "rev": "875776f0252fcb8618bb948640a0d1f7a5b362be", "type": "github" }, "original": { @@ -947,11 +947,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1781216227, - "narHash": "sha256-9mUW6gNwoN2SWc/l0fW4svPNOulXLl8ijqKyeSOGgJE=", + "lastModified": 1782116945, + "narHash": "sha256-G3tw/IXmaH6IQ2upZvhuN9sG8CkuX+BLuJDpE8hz0Ds=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a0374025a863d007d98e3297f6aa46cc3141c2f0", + "rev": "34268251cf5547d39063f2c5ea9a196246f7f3a6", "type": "github" }, "original": { @@ -1243,11 +1243,11 @@ ] }, "locked": { - "lastModified": 1780547341, - "narHash": "sha256-Gq8KNx5A7hBB3uGJaj6eQfLDIz5YdLu92gqBcvHvoUo=", + "lastModified": 1782165805, + "narHash": "sha256-478kKQBvK6SYTOdN2h9jhKJv94nbXRbFMfuL1WshErg=", "owner": "Mic92", "repo": "sops-nix", - "rev": "9ed65852b6257fbeae4355bc24ecfea307ca759a", + "rev": "56b24064fdcaedca53553b1a6d607fd23b613a24", "type": "github" }, "original": { @@ -1264,15 +1264,15 @@ "nix-filter": "nix-filter" }, "locked": { - "lastModified": 1781280597, - "narHash": "sha256-FuIe4c/XEfFx27T7/IzdGI1VQKSfpJ0yw2Sw6XmdNDI=", - "owner": "Duckonaut", + "lastModified": 1782237065, + "narHash": "sha256-Oxtr8k+qu4Kd/7BJ5eo8Pfoje8PDIO1YK2+mhCkHRhQ=", + "owner": "zjeffer", "repo": "split-monitor-workspaces", - "rev": "5924e6baa7bd3753d071aa404df0c5225e274150", + "rev": "968a6a603cabf8ab8f5ce5a402e8ed3bfcae69ce", "type": "github" }, "original": { - "owner": "Duckonaut", + "owner": "zjeffer", "repo": "split-monitor-workspaces", "type": "github" } @@ -1297,11 +1297,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1781018772, - "narHash": "sha256-C+cGIUaC6dqfwTbI+BwCd572PbESGA3WYxR1sLTqxkY=", + "lastModified": 1782310521, + "narHash": "sha256-vsxcG0i8e4EPfdnhMTKMVzD1825H2vG1BBslzom9wxg=", "owner": "nix-community", "repo": "stylix", - "rev": "a378e4c09031fb15a4d65da88aa628f71fc52f6b", + "rev": "e084d011e7ee9302aceaaf6c1fc28a9ace09e16a", "type": "github" }, "original": { @@ -1479,11 +1479,11 @@ ] }, "locked": { - "lastModified": 1781810163, - "narHash": "sha256-dk8lIk0UnO8GD3e7e3HM1vSYXpbEDmhy67w7KztfdCg=", + "lastModified": 1782233665, + "narHash": "sha256-h/xOtrByoA/Ak1lWHn0O1lVZz4qWYbwOSLQ8YSwQO0I=", "owner": "nix-community", "repo": "home-manager", - "rev": "c8f0b8ed441c95bfeaf33555e7631044bb09f384", + "rev": "062581938b4a378a82dfbb294b494808157153a1", "type": "github" }, "original": { @@ -1584,11 +1584,11 @@ "nixpkgs": "nixpkgs_11" }, "locked": { - "lastModified": 1781800395, - "narHash": "sha256-4KcqyzR0WmTJ0eTVUdebUttX2VnA1AzMKgwzll8cEyc=", + "lastModified": 1782144240, + "narHash": "sha256-RgCWSv7AJZCwPhCzz+J0lvwp1WBz9ouvCnnlmvu0xfw=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "16bfb23384a96dca523ab38a0536c3ae4a7d1af1", + "rev": "d1693556428967f8b4eef128feb090421ddcaf15", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 6de4637..02bb2a6 100644 --- a/flake.nix +++ b/flake.nix @@ -60,7 +60,7 @@ }; split-monitor-workspaces = { - url = "github:Duckonaut/split-monitor-workspaces"; + url = "github:zjeffer/split-monitor-workspaces"; inputs.hyprland.follows = "hyprland"; }; diff --git a/modules/window-manager/hypr/default.nix b/modules/window-manager/hypr/default.nix index dc37c1b..5fcdffb 100644 --- a/modules/window-manager/hypr/default.nix +++ b/modules/window-manager/hypr/default.nix @@ -63,9 +63,12 @@ in { wayland.windowManager.hyprland = { enable = true; xwayland.enable = true; - package = inputs.hyprland.packages.${pkgs.system}.hyprland; + package = null; + portalPackage = null; + configType = "hyprlang"; + plugins = [ - inputs.split-monitor-workspaces.packages.${pkgs.system}.split-monitor-workspaces + #inputs.split-monitor-workspaces.packages.${pkgs.stdenv.hostPlatform.system}.split-monitor-workspaces ]; settings = { @@ -142,32 +145,32 @@ in { "$mainMod, j, movefocus, d" # Switch workspaces with mainMod + [0-9] - "$mainMod, 1, split-workspace, 1" - "$mainMod, 2, split-workspace, 2" - "$mainMod, 3, split-workspace, 3" - "$mainMod, 4, split-workspace, 4" - "$mainMod, 5, split-workspace, 5" - "$mainMod, 6, split-workspace, 6" - "$mainMod, 7, split-workspace, 7" - "$mainMod, 8, split-workspace, 8" - "$mainMod, 9, split-workspace, 9" - "$mainMod, 0, split-workspace, 10" + "$mainMod, 1, workspace, 1" + "$mainMod, 2, workspace, 2" + "$mainMod, 3, workspace, 3" + "$mainMod, 4, workspace, 4" + "$mainMod, 5, workspace, 5" + "$mainMod, 6, workspace, 6" + "$mainMod, 7, workspace, 7" + "$mainMod, 8, workspace, 8" + "$mainMod, 9, workspace, 9" + "$mainMod, 0, workspace, 10" # Move active window to a workspace with mainMod + SHIFT + [0-9] - "$mainMod SHIFT, 1, split-movetoworkspace, 1" - "$mainMod SHIFT, 2, split-movetoworkspace, 2" - "$mainMod SHIFT, 3, split-movetoworkspace, 3" - "$mainMod SHIFT, 4, split-movetoworkspace, 4" - "$mainMod SHIFT, 5, split-movetoworkspace, 5" - "$mainMod SHIFT, 6, split-movetoworkspace, 6" - "$mainMod SHIFT, 7, split-movetoworkspace, 7" - "$mainMod SHIFT, 8, split-movetoworkspace, 8" - "$mainMod SHIFT, 9, split-movetoworkspace, 9" - "$mainMod SHIFT, 0, split-movetoworkspace, 10" + "$mainMod SHIFT, 1, movetoworkspace, 1" + "$mainMod SHIFT, 2, movetoworkspace, 2" + "$mainMod SHIFT, 3, movetoworkspace, 3" + "$mainMod SHIFT, 4, movetoworkspace, 4" + "$mainMod SHIFT, 5, movetoworkspace, 5" + "$mainMod SHIFT, 6, movetoworkspace, 6" + "$mainMod SHIFT, 7, movetoworkspace, 7" + "$mainMod SHIFT, 8, movetoworkspace, 8" + "$mainMod SHIFT, 9, movetoworkspace, 9" + "$mainMod SHIFT, 0, movetoworkspace, 10" # Scroll through existing workspaces with mainMod + scroll - "$mainMod, mouse_down, split-workspace, e+1" - "$mainMod, mouse_up, split-workspace, e-1" + "$mainMod, mouse_down, workspace, e+1" + "$mainMod, mouse_up, workspace, e-1" "$mainMod,SPACE, exec, hyprctl switchxkblayout at-translated-set-2-keyboard next" ] ++ lib.optionals hm-cfg.launcher.wofi.enable