From f6851984dbb03229c1f86ffb0441be3ca40f9f3d Mon Sep 17 00:00:00 2001 From: outfoxxed Date: Sun, 27 Aug 2023 13:03:29 -0700 Subject: [PATCH] Update system --- flake.lock | 118 ++++++++++++++++++++------------- modules/hyprland/hyprland.conf | 12 +++- 2 files changed, 81 insertions(+), 49 deletions(-) diff --git a/flake.lock b/flake.lock index 5b10d60..3bdecdf 100644 --- a/flake.lock +++ b/flake.lock @@ -35,11 +35,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1691722951, - "narHash": "sha256-V6ERc3gVbITjNDljQsfFRz/s68717aPjK+e94uZbLvQ=", + "lastModified": 1693105704, + "narHash": "sha256-j1SSgP2K1iv9G7dc3yX2ulsB4mV3K231L8xNmuDS8WM=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "f6a346762491a4655c3b43da5f2f154b57237a44", + "rev": "123ac69d1d430562dd1a266a2f50296eaac7d65d", "type": "github" }, "original": { @@ -69,11 +69,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1689068808, - "narHash": "sha256-6ixXo3wt24N/melDWjq70UuHQLxGV8jZvooRanIHXw0=", + "lastModified": 1692799911, + "narHash": "sha256-3eihraek4qL744EvQXsK1Ha6C3CR7nnT8X2qWap4RNk=", "owner": "numtide", "repo": "flake-utils", - "rev": "919d646de7be200f3bf08cb76ae1f09402b6f9b4", + "rev": "f9e7cf818399d17d347f847525c5a5a8032e4e44", "type": "github" }, "original": { @@ -84,7 +84,7 @@ }, "flake-utils_2": { "inputs": { - "systems": "systems_2" + "systems": "systems_3" }, "locked": { "lastModified": 1687709756, @@ -107,11 +107,11 @@ ] }, "locked": { - "lastModified": 1691672736, - "narHash": "sha256-HNPA/dKHerA0p4OsToEcW/DtTSXBcK5gFRsy/yPgV/Y=", + "lastModified": 1692763155, + "narHash": "sha256-qMrGKZ8c/q/mHO3ZdrcBPwiVVXPLLgXjY98Ejqb5kAA=", "owner": "nix-community", "repo": "home-manager", - "rev": "6e1eff9aac0e8d84bda7f2d60ba6108eea9b7e79", + "rev": "6a20e40acaebf067da682661aa67da8b36812606", "type": "github" }, "original": { @@ -126,15 +126,16 @@ "nixpkgs": [ "nixpkgs" ], + "systems": "systems_2", "wlroots": "wlroots", "xdph": "xdph" }, "locked": { - "lastModified": 1691697694, - "narHash": "sha256-Z4zAxYxEJ0/3S5DAvxNAdvkZlwpDSvUJ1jFxtU1wkzY=", + "lastModified": 1693062741, + "narHash": "sha256-pdGlEXIHH2aoo+x0tgG4MzTMsbqQ+We9KBgORwHsX0U=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "e4e8ae8f885104bb948afa24f1cd9fc3bdb450e9", + "rev": "4a41d013a27c9919ed41a50c43c4224d8443a415", "type": "github" }, "original": { @@ -150,11 +151,11 @@ ] }, "locked": { - "lastModified": 1691652733, - "narHash": "sha256-BxUPTu/fIGe6DKMJclP0URrAVHWXfh9wSe1tSRinKdc=", + "lastModified": 1692526388, + "narHash": "sha256-qoInYvmI79039odUa2glEq7wW9khOGbOZtr64u9G7Ts=", "owner": "outfoxxed", "repo": "hy3", - "rev": "febcd88794ab2c4204e4c3785b9dea208b508bb5", + "rev": "0cc5af9e607c0abccc8e87c5a15991340f008a3a", "type": "github" }, "original": { @@ -168,14 +169,18 @@ "nixpkgs": [ "hyprland", "nixpkgs" + ], + "systems": [ + "hyprland", + "systems" ] }, "locked": { - "lastModified": 1684265364, - "narHash": "sha256-AxNnWbthsuNx73HDQr0eBxrcE3+yfl/WsaXZqUFmkpQ=", + "lastModified": 1691753796, + "narHash": "sha256-zOEwiWoXk3j3+EoF3ySUJmberFewWlagvewDRuWYAso=", "owner": "hyprwm", "repo": "hyprland-protocols", - "rev": "8c279b9fb0f2b031427dc5ef4eab53f2ed835530", + "rev": "0c2ce70625cb30aef199cb388f99e19a61a6ce03", "type": "github" }, "original": { @@ -191,11 +196,11 @@ ] }, "locked": { - "lastModified": 1691060455, - "narHash": "sha256-V5ulB9CkGh1ghiC4BKvRdoYKZzpaiOKzAOUmJIFkgM0=", + "lastModified": 1692480535, + "narHash": "sha256-3Q0Uz/JPW9USHyAmrzRl6KhZLqMYTWkmtL3RA+oAeVY=", "owner": "hyprwm", "repo": "Hyprpaper", - "rev": "e498c438b1e16dcf32ecb3030b20b83f7ed9ff6d", + "rev": "5e73eb60552d48d55541c60f9a8da2b666003fe6", "type": "github" }, "original": { @@ -231,11 +236,11 @@ ] }, "locked": { - "lastModified": 1691611150, - "narHash": "sha256-0Jx7RQ236n6O9NIx8iUvGFVo3JRuiypWU5JIUh9Mj/M=", + "lastModified": 1693084840, + "narHash": "sha256-izfaLlfgleUVd5aSKqFU/6Ll6/Daex5+Nb7Xi/ms+Ag=", "owner": "JakeStanger", "repo": "ironbar", - "rev": "b649525a2cb43fdd673f04e0dee879d22925a821", + "rev": "af1f9e39b051a8a002a74c0224559897e6a15a11", "type": "github" }, "original": { @@ -278,11 +283,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1691592289, - "narHash": "sha256-Lqpw7lrXlLkYra33tp57ms8tZ0StWhbcl80vk4D90F8=", + "lastModified": 1692986144, + "narHash": "sha256-M4VFpy7Av9j+33HF5nIGm0k2+DXXW4qSSKdidIKg5jY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9034b46dc4c7596a87ab837bb8a07ef2d887e8c7", + "rev": "74e5bdc5478ebbe7ba5849f0d765f92757bb9dbf", "type": "github" }, "original": { @@ -294,11 +299,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1691654369, - "narHash": "sha256-gSILTEx1jRaJjwZxRlnu3ZwMn1FVNk80qlwiCX8kmpo=", + "lastModified": 1693003285, + "narHash": "sha256-5nm4yrEHKupjn62MibENtfqlP6pWcRTuSKrMiH9bLkc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ce5e4a6ef2e59d89a971bc434ca8ca222b9c7f5e", + "rev": "5690c4271f2998c304a45c91a0aeb8fb69feaea7", "type": "github" }, "original": { @@ -309,11 +314,11 @@ }, "nur": { "locked": { - "lastModified": 1691725539, - "narHash": "sha256-7TvXi9pUaZXiGZW0eH+JMcbFfBPvDgx03UuaHhIBPoI=", + "lastModified": 1693121506, + "narHash": "sha256-uACr/q8kCzgfLQ4w7TMB2XAPqid7Q4MryLXJrg9/W00=", "owner": "nix-community", "repo": "NUR", - "rev": "12503f38212124d5ce66bba48a5534ad6d61a1b9", + "rev": "8b94b37cf004acc1a7b7970b1e60f9b24f70b519", "type": "github" }, "original": { @@ -375,11 +380,11 @@ ] }, "locked": { - "lastModified": 1691719735, - "narHash": "sha256-GhPn5EIhGt7aFwgC6RELZJC7mUIol9O0k7Dsf2Hu0AM=", + "lastModified": 1693102271, + "narHash": "sha256-JuxJYl7zZ9FUOA/3Az5OPYWQfH9Y8SvtqqFnPKB6zUw=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "ac9d8b2e9acc153145e6fa3c78f9ba458ae517bf", + "rev": "1aac4029cfbc529f8b39c96d29fe1d09338f9110", "type": "github" }, "original": { @@ -390,11 +395,11 @@ }, "stable": { "locked": { - "lastModified": 1691592289, - "narHash": "sha256-Lqpw7lrXlLkYra33tp57ms8tZ0StWhbcl80vk4D90F8=", + "lastModified": 1692986144, + "narHash": "sha256-M4VFpy7Av9j+33HF5nIGm0k2+DXXW4qSSKdidIKg5jY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9034b46dc4c7596a87ab837bb8a07ef2d887e8c7", + "rev": "74e5bdc5478ebbe7ba5849f0d765f92757bb9dbf", "type": "github" }, "original": { @@ -419,6 +424,21 @@ } }, "systems_2": { + "locked": { + "lastModified": 1689347949, + "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", + "owner": "nix-systems", + "repo": "default-linux", + "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default-linux", + "type": "github" + } + }, + "systems_3": { "locked": { "lastModified": 1681028828, "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", @@ -437,18 +457,18 @@ "flake": false, "locked": { "host": "gitlab.freedesktop.org", - "lastModified": 1691073628, - "narHash": "sha256-LlxE3o3UzRY7APYVLGNKM30DBMcDifCRIQiMVSbYLIc=", + "lastModified": 1692976565, + "narHash": "sha256-eBKkG7tMxg92NskEn8dHRFY245JwjirWRoOZzW6DnUw=", "owner": "wlroots", "repo": "wlroots", - "rev": "c74f89d4f84bfed0284d3908aee5d207698c70c5", + "rev": "717ded9bb0191ea31bf4368be32e7a15fe1b8294", "type": "gitlab" }, "original": { "host": "gitlab.freedesktop.org", "owner": "wlroots", "repo": "wlroots", - "rev": "c74f89d4f84bfed0284d3908aee5d207698c70c5", + "rev": "717ded9bb0191ea31bf4368be32e7a15fe1b8294", "type": "gitlab" } }, @@ -461,14 +481,18 @@ "nixpkgs": [ "hyprland", "nixpkgs" + ], + "systems": [ + "hyprland", + "systems" ] }, "locked": { - "lastModified": 1691082525, - "narHash": "sha256-C5AO0KnyAFJaCkOn+5nJfWm0kyiPn/Awh0lKTjhgr7Y=", + "lastModified": 1691841170, + "narHash": "sha256-RCTm1/MVWYPnReMgyp7tr2ogGYo/pvw38jZaFwemgPU=", "owner": "hyprwm", "repo": "xdg-desktop-portal-hyprland", - "rev": "42747d267ab4345c4ceb78cd4a4fe99f072d80fc", + "rev": "57a3a41ba6b358109e4fc25c6a4706b5f7d93c6b", "type": "github" }, "original": { diff --git a/modules/hyprland/hyprland.conf b/modules/hyprland/hyprland.conf index 4923460..0852ca4 100644 --- a/modules/hyprland/hyprland.conf +++ b/modules/hyprland/hyprland.conf @@ -61,7 +61,6 @@ gestures { misc { no_direct_scanout = false - suppress_portal_warnings = true } binds { @@ -123,7 +122,7 @@ bind = $mod, a, hy3:changefocus, raise bind = $mod+SHIFT, a, hy3:changefocus, lower bind = $mod, e, hy3:expand, expand bind = $mod+SHIFT, e, hy3:expand, base -bind = $mod, r, togglesplit +bind = $mod, r, hy3:changegroup, opposite bindm = $mod, mouse:272, movewindow bindm = $mod, mouse:273, resizewindow @@ -163,6 +162,15 @@ bind = $mod+SHIFT, down, hy3:movewindow, d, once bind = $mod+SHIFT, up, hy3:movewindow, u, once bind = $mod+SHIFT, right, hy3:movewindow, r, once +bind = $mod+CONTROL+SHIFT, h, hy3:movewindow, l, once, visible +bind = $mod+CONTROL+SHIFT, j, hy3:movewindow, d, once, visible +bind = $mod+CONTROL+SHIFT, k, hy3:movewindow, u, once, visible +bind = $mod+CONTROL+SHIFT, l, hy3:movewindow, r, once, visible +bind = $mod+CONTROL+SHIFT, left, hy3:movewindow, l, once, visible +bind = $mod+CONTROL+SHIFT, down, hy3:movewindow, d, once, visible +bind = $mod+CONTROL+SHIFT, up, hy3:movewindow, u, once, visible +bind = $mod+CONTROL+SHIFT, right, hy3:movewindow, r, once, visible + bind = $mod, 1, workspace, 01 bind = $mod, 2, workspace, 02 bind = $mod, 3, workspace, 03