diff --git a/flake.lock b/flake.lock index 30eeaba..b7aae70 100644 --- a/flake.lock +++ b/flake.lock @@ -11,11 +11,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1704157128, - "narHash": "sha256-BAna+70nf43RJ5wOOl4grL4W/o4FRNtgWZtwt/LTZvE=", + "lastModified": 1705222228, + "narHash": "sha256-qa3WIBN2+J0VZRId88CatjROob41nyMz4dQ4q82h3xs=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "575fcd2ddb0e7c40611ba68d4a977e0cdc729669", + "rev": "8a3a40fdad4a0fa56f98bf0b53db631a9367680b", "type": "github" }, "original": { @@ -32,11 +32,11 @@ ] }, "locked": { - "lastModified": 1701473968, - "narHash": "sha256-YcVE5emp1qQ8ieHUnxt1wCZCC3ZfAS+SRRWZ2TMda7E=", + "lastModified": 1704152458, + "narHash": "sha256-DS+dGw7SKygIWf9w4eNBUZsK+4Ug27NwEWmn2tnbycg=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "34fed993f1674c8d06d58b37ce1e0fe5eebcb9f5", + "rev": "88a2cd8166694ba0b6cb374700799cec53aef527", "type": "github" }, "original": { @@ -75,11 +75,11 @@ ] }, "locked": { - "lastModified": 1701009247, - "narHash": "sha256-GuX16rzRze2y7CsewJLTV6qXkXWyEwp6VCZXi8HLruU=", + "lastModified": 1704029560, + "narHash": "sha256-a4Iu7x1OP+uSYpqadOu8VCPY+MPF3+f6KIi+MAxlgyw=", "owner": "hercules-ci", "repo": "hercules-ci-effects", - "rev": "31b6cd7569191bfcd0a548575b0e2ef953ed7d09", + "rev": "d5cbf433a6ae9cae05400189a8dbc6412a03ba16", "type": "github" }, "original": { @@ -95,11 +95,11 @@ ] }, "locked": { - "lastModified": 1704100519, - "narHash": "sha256-SgZC3cxquvwTN07vrYYT9ZkfvuhS5Y1k1F4+AMsuflc=", + "lastModified": 1705169127, + "narHash": "sha256-j9OEtNxOIPWZWjbECVMkI1TO17SzlpHMm0LnVWKOR/g=", "owner": "nix-community", "repo": "home-manager", - "rev": "6e91c5df192395753d8e6d55a0352109cb559790", + "rev": "f2942f3385f1b35cc8a1abb03a45e29c9cb4d3c8", "type": "github" }, "original": { @@ -140,11 +140,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1704146726, - "narHash": "sha256-MS/VO4Bv2N0yAUrWxCmwTU7+g5GhI6lEMy7R3ZzmswU=", + "lastModified": 1705070596, + "narHash": "sha256-Xq3JOddIH7AnACEHGaSKg71IF8CATE1zSTzdgR4pnlo=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "1607e967041fd3311411de0def8cdc0610274f98", + "rev": "c4da4b026deefd58f532353b64e9f17130e760ca", "type": "github" }, "original": { @@ -160,11 +160,11 @@ ] }, "locked": { - "lastModified": 1704027000, - "narHash": "sha256-sMJguaGNfwmzkyRLwBuQhyFBs2CB08O6dIUwJ51eoJU=", + "lastModified": 1705229512, + "narHash": "sha256-Ygj3lZPpynwqPEAlUyN73/mi25+Gp4KU0tJSQXMUZFg=", "owner": "outfoxxed", "repo": "hy3", - "rev": "a92314b57a1c611e3e24cfa31c14c4dc3ea638e5", + "rev": "d247317a38b0ab9cb82504ee62516082e63a862a", "type": "github" }, "original": { @@ -198,16 +198,53 @@ "type": "github" } }, - "hyprpaper": { + "hyprlang": { "inputs": { "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1703524093, - "narHash": "sha256-qqF3NyarX6ZSCBmhzO4r0BEcy6FHj6DsvF0hIMkwz/Q=", + "lastModified": 1704287638, + "narHash": "sha256-TuRXJGwtK440AXQNl5eiqmQqY4LZ/9+z/R7xC0ie3iA=", + "owner": "hyprwm", + "repo": "hyprlang", + "rev": "6624f2bb66d4d27975766e81f77174adbe58ec97", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprlang", + "type": "github" + } + }, + "hyprlang_2": { + "inputs": { + "nixpkgs": "nixpkgs_2" + }, + "locked": { + "lastModified": 1704230242, + "narHash": "sha256-S8DM+frECqmAdaUb3y5n3RjY73ajZcL5rnmx5YO+CkY=", + "owner": "hyprwm", + "repo": "hyprlang", + "rev": "db5e1399b90d5a339330bdd49c5bca6fe58d6f60", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprlang", + "type": "github" + } + }, + "hyprpaper": { + "inputs": { + "hyprlang": "hyprlang_2", + "nixpkgs": "nixpkgs_3" + }, + "locked": { + "lastModified": 1704406943, + "narHash": "sha256-d18gWmdMtkW06LvnkSADe69J2po20NsAEVfacyN1IOc=", "owner": "hyprwm", "repo": "Hyprpaper", - "rev": "ef0e051255af1b96155b222da94c94ecad1f7708", + "rev": "43b6e9d2e24294a2d07e15717c501736697afb11", "type": "github" }, "original": { @@ -255,11 +292,11 @@ ] }, "locked": { - "lastModified": 1703730102, - "narHash": "sha256-oXEu4FYhIgS0+qMMf1YfnseMmOStK/45S4k6XUcGi4M=", + "lastModified": 1704939631, + "narHash": "sha256-JlcyZVdsr1haV0SNgKgYY1yrc3dNWr1C47Hy6RVEZ9k=", "owner": "nixpak", "repo": "nixpak", - "rev": "39e3350f9d473422c8cf9e7cb362241f8ed2b974", + "rev": "c9d0aac8356c4eb7e0b710545dd7196c9333c77b", "type": "github" }, "original": { @@ -286,11 +323,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1703992652, - "narHash": "sha256-C0o8AUyu8xYgJ36kOxJfXIroy9if/G6aJbNOpA5W0+M=", + "lastModified": 1704874635, + "narHash": "sha256-YWuCrtsty5vVZvu+7BchAxmcYzTMfolSPP5io8+WYCg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "32f63574c85fbc80e4ba1fbb932cde9619bad25e", + "rev": "3dc440faeee9e889fe2d1b4d25ad0f430d449356", "type": "github" }, "original": { @@ -302,11 +339,43 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1703961334, - "narHash": "sha256-M1mV/Cq+pgjk0rt6VxoyyD+O8cOUiai8t9Q6Yyq4noY=", + "lastModified": 1702645756, + "narHash": "sha256-qKI6OR3TYJYQB3Q8mAZ+DG4o/BR9ptcv9UnRV2hzljc=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "40c3c94c241286dd2243ea34d3aef8a488f9e4d0", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_3": { + "locked": { + "lastModified": 1703637592, + "narHash": "sha256-8MXjxU0RfFfzl57Zy3OfXCITS0qWDNLzlBAdwxGZwfY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b0d36bd0a420ecee3bc916c91886caca87c894e9", + "rev": "cfc3698c31b1fb9cdcf10f36c9643460264d0ca8", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_4": { + "locked": { + "lastModified": 1705133751, + "narHash": "sha256-rCIsyE80jgiOU78gCWN3A0wE0tR2GI5nH6MlS+HaaSQ=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "9b19f5e77dd906cb52dade0b7bd280339d2a1f3d", "type": "github" }, "original": { @@ -317,11 +386,11 @@ }, "nur": { "locked": { - "lastModified": 1704160731, - "narHash": "sha256-EKeiL8TgXcoOVfbc0QUpY0nCw1IIiQtWNWB57/dMAx4=", + "lastModified": 1705226420, + "narHash": "sha256-Dl/FgtiJAf19CyHDBawZY5GU4jmleWu03kqUhCj3/+8=", "owner": "nix-community", "repo": "NUR", - "rev": "820a4b9b2f9111fb71d41794b38ffd46bb7e81ed", + "rev": "91262c64a5aae06d91dd5690261d17b8a54d22b7", "type": "github" }, "original": { @@ -341,7 +410,7 @@ "hyprpaper": "hyprpaper", "impurity": "impurity", "nixpak": "nixpak", - "nixpkgs": "nixpkgs_2", + "nixpkgs": "nixpkgs_4", "nur": "nur", "rust-overlay": "rust-overlay", "stable": "stable" @@ -357,11 +426,11 @@ ] }, "locked": { - "lastModified": 1704075545, - "narHash": "sha256-L3zgOuVKhPjKsVLc3yTm2YJ6+BATyZBury7wnhyc8QU=", + "lastModified": 1705198720, + "narHash": "sha256-/pzqqQQ1aU4llyaCDVjhPjQWIWpcRxFCsiDzl0lcAIk=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "a0df72e106322b67e9c6e591fe870380bd0da0d5", + "rev": "71d1d01578272b2294f6993b1860dfb22e4baac3", "type": "github" }, "original": { @@ -372,11 +441,11 @@ }, "stable": { "locked": { - "lastModified": 1704018918, - "narHash": "sha256-erjg/HrpC9liEfm7oLqb8GXCqsxaFwIIPqCsknW5aFY=", + "lastModified": 1704290814, + "narHash": "sha256-LWvKHp7kGxk/GEtlrGYV68qIvPHkU9iToomNFGagixU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "2c9c58e98243930f8cb70387934daa4bc8b00373", + "rev": "70bdadeb94ffc8806c0570eb5c2695ad29f0e421", "type": "github" }, "original": { @@ -440,6 +509,7 @@ "hyprland", "hyprland-protocols" ], + "hyprlang": "hyprlang", "nixpkgs": [ "hyprland", "nixpkgs" @@ -450,11 +520,11 @@ ] }, "locked": { - "lastModified": 1703514399, - "narHash": "sha256-VRr5Xc4S/VPr/gU3fiOD3vSIL2+GJ+LUrmFTWTwnTz4=", + "lastModified": 1704400467, + "narHash": "sha256-IsEAKBCorRlN53FwFAMbyGLRsPVu/ZrWEJtCwykPds8=", "owner": "hyprwm", "repo": "xdg-desktop-portal-hyprland", - "rev": "0a318a7a217a6402b0b705837cd5b50b0e94b31b", + "rev": "1c802128f6cc3db29a8ef01552b1a22f894eeefd", "type": "github" }, "original": { diff --git a/modules/hyprland/hyprland.conf b/modules/hyprland/hyprland.conf index 8f7e991..4cf0a39 100644 --- a/modules/hyprland/hyprland.conf +++ b/modules/hyprland/hyprland.conf @@ -214,26 +214,26 @@ bind = $mod, F8, workspace, 18 bind = $mod, F9, workspace, 19 bind = $mod, F10, workspace, 20 -bind = $mod+SHIFT, 1, movetoworkspacesilent, 01 -bind = $mod+SHIFT, 2, movetoworkspacesilent, 02 -bind = $mod+SHIFT, 3, movetoworkspacesilent, 03 -bind = $mod+SHIFT, 4, movetoworkspacesilent, 04 -bind = $mod+SHIFT, 5, movetoworkspacesilent, 05 -bind = $mod+SHIFT, 6, movetoworkspacesilent, 06 -bind = $mod+SHIFT, 7, movetoworkspacesilent, 07 -bind = $mod+SHIFT, 8, movetoworkspacesilent, 08 -bind = $mod+SHIFT, 9, movetoworkspacesilent, 09 -bind = $mod+SHIFT, 0, movetoworkspacesilent, 10 -bind = $mod+SHIFT, F1, movetoworkspacesilent, 11 -bind = $mod+SHIFT, F2, movetoworkspacesilent, 12 -bind = $mod+SHIFT, F3, movetoworkspacesilent, 13 -bind = $mod+SHIFT, F4, movetoworkspacesilent, 14 -bind = $mod+SHIFT, F5, movetoworkspacesilent, 15 -bind = $mod+SHIFT, F6, movetoworkspacesilent, 16 -bind = $mod+SHIFT, F7, movetoworkspacesilent, 17 -bind = $mod+SHIFT, F8, movetoworkspacesilent, 18 -bind = $mod+SHIFT, F9, movetoworkspacesilent, 19 -bind = $mod+SHIFT, F10, movetoworkspacesilent, 20 +bind = $mod+SHIFT, 1, hy3:movetoworkspace, 01 +bind = $mod+SHIFT, 2, hy3:movetoworkspace, 02 +bind = $mod+SHIFT, 3, hy3:movetoworkspace, 03 +bind = $mod+SHIFT, 4, hy3:movetoworkspace, 04 +bind = $mod+SHIFT, 5, hy3:movetoworkspace, 05 +bind = $mod+SHIFT, 6, hy3:movetoworkspace, 06 +bind = $mod+SHIFT, 7, hy3:movetoworkspace, 07 +bind = $mod+SHIFT, 8, hy3:movetoworkspace, 08 +bind = $mod+SHIFT, 9, hy3:movetoworkspace, 09 +bind = $mod+SHIFT, 0, hy3:movetoworkspace, 10 +bind = $mod+SHIFT, F1, hy3:movetoworkspace, 11 +bind = $mod+SHIFT, F2, hy3:movetoworkspace, 12 +bind = $mod+SHIFT, F3, hy3:movetoworkspace, 13 +bind = $mod+SHIFT, F4, hy3:movetoworkspace, 14 +bind = $mod+SHIFT, F5, hy3:movetoworkspace, 15 +bind = $mod+SHIFT, F6, hy3:movetoworkspace, 16 +bind = $mod+SHIFT, F7, hy3:movetoworkspace, 17 +bind = $mod+SHIFT, F8, hy3:movetoworkspace, 18 +bind = $mod+SHIFT, F9, hy3:movetoworkspace, 19 +bind = $mod+SHIFT, F10, hy3:movetoworkspace, 20 bind = $mod+CONTROL, 1, hy3:focustab, index, 01 bind = $mod+CONTROL, 2, hy3:focustab, index, 02