From d14db5a303261820919f869c2964a26eefda8bba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20Av=C3=A9?= <email@thomasave.be>
Date: Thu, 13 Jun 2024 11:50:46 +0200
Subject: [PATCH] Switch to branch of split-monitor-workspaces
---
flake.lock | 39 ++++++++++++++++++++-------------------
flake.nix | 4 +++-
home/hyprland/default.nix | 10 +++++-----
3 files changed, 28 insertions(+), 25 deletions(-)
diff --git a/flake.lock b/flake.lock
index fc44051..5b22ee2 100644
--- a/flake.lock
+++ b/flake.lock
@@ -23,11 +23,11 @@
]
},
"locked": {
- "lastModified": 1718141734,
- "narHash": "sha256-cA+6l8ZCZ7MXGijVuY/1f55+wF/RT4PlTR9+g4bx86w=",
+ "lastModified": 1718243258,
+ "narHash": "sha256-abBpj2VU8p6qlRzTU8o22q68MmOaZ4v8zZ4UlYl5YRU=",
"owner": "nix-community",
"repo": "home-manager",
- "rev": "892f76bd0aa09a0f7f73eb41834b8a904b6d0fad",
+ "rev": "8d5e27b4807d25308dfe369d5a923d87e7dbfda3",
"type": "github"
},
"original": {
@@ -76,11 +76,11 @@
"xdph": "xdph"
},
"locked": {
- "lastModified": 1718139749,
- "narHash": "sha256-VcWBqYRI82PuyqD5jZrmSkvVKGq4Ax0iNO5HI0aFRV0=",
+ "lastModified": 1718271227,
+ "narHash": "sha256-Hxhfto9rd4Cf5Y5W6LGnAR0VrBpfuVM9fQOkikVMGV0=",
"ref": "refs/heads/main",
- "rev": "8412ffcc42012888757cd00a004871e8bc353cf2",
- "revCount": 4805,
+ "rev": "a54f98c20301a71efe5e73a8fc5e1bcd66f2bd34",
+ "revCount": 4817,
"submodules": true,
"type": "git",
"url": "https://github.com/hyprwm/Hyprland"
@@ -262,11 +262,11 @@
},
"nur": {
"locked": {
- "lastModified": 1718189173,
- "narHash": "sha256-PVau5Ijdz6DNjUUBpZ5QwygfyqiK+imr62q4+kxJkzo=",
+ "lastModified": 1718270519,
+ "narHash": "sha256-IyuJZKTLtaDtiX03QhPKzxs/gkhkYNfhTc7aAYaJZU4=",
"owner": "nix-community",
"repo": "NUR",
- "rev": "a881f3b94209d231585fba2c435ebe0437a6b217",
+ "rev": "c2df46777b3908e9b11eacb4f576308e5467812b",
"type": "github"
},
"original": {
@@ -293,17 +293,18 @@
"nix-filter": "nix-filter"
},
"locked": {
- "lastModified": 1718131642,
- "narHash": "sha256-kSxes9PQWJjUSSWq2VAEFvUQtmxJ4bvmx8jEpeupGbk=",
- "owner": "Duckonaut",
- "repo": "split-monitor-workspaces",
- "rev": "342de8a2cddf8143d7ce9c13c10613af8aa78c6e",
- "type": "github"
+ "lastModified": 1718131658,
+ "narHash": "sha256-bvEPsdXwHv//dmzptxCAOPQ0fzsMWXFejAbUrwk+1Q8=",
+ "ref": "fix/hyprutils",
+ "rev": "70d64da45f7bbd777cd43f2bf65ee40d40266da3",
+ "revCount": 72,
+ "type": "git",
+ "url": "https://github.com/Duckonaut/split-monitor-workspaces"
},
"original": {
- "owner": "Duckonaut",
- "repo": "split-monitor-workspaces",
- "type": "github"
+ "ref": "fix/hyprutils",
+ "type": "git",
+ "url": "https://github.com/Duckonaut/split-monitor-workspaces"
}
},
"systems": {
diff --git a/flake.nix b/flake.nix
index 939271e..672dd4f 100644
--- a/flake.nix
+++ b/flake.nix
@@ -16,8 +16,10 @@
submodules = true;
};
split-monitor-workspaces = {
- url = "github:Duckonaut/split-monitor-workspaces";
+ type = "git";
+ url = "https://github.com/Duckonaut/split-monitor-workspaces";
inputs.hyprland.follows = "hyprland";
+ ref = "fix/hyprutils";
};
nur.url = "github:nix-community/NUR";
};
diff --git a/home/hyprland/default.nix b/home/hyprland/default.nix
index 4d1599b..b611774 100644
--- a/home/hyprland/default.nix
+++ b/home/hyprland/default.nix
@@ -19,12 +19,12 @@ let
echo -n "''${code[-1]}" | ${pkgs.wl-clipboard}/bin/wl-copy;
'';
- # Enable split-monitor-workspaces
- # workspace_command_prefix = "split-";
- # hyprland_plugins = [inputs.split-monitor-workspaces.packages.${pkgs.system}.split-monitor-workspaces];
+ workspace_command_prefix = "split-";
+ hyprland_plugins = [inputs.split-monitor-workspaces.packages.${pkgs.system}.split-monitor-workspaces];
- workspace_command_prefix = "";
- hyprland_plugins = [];
+ # Disable split-monitor-workspaces
+ # workspace_command_prefix = "";
+ # hyprland_plugins = [];
launch_alacritty = pkgs.writeShellScriptBin "launch_alacritty" ''
RUNNING_WAYPIPE=false