From d4db1e7f094fb33783bbd1af686cfafafa80b974 Mon Sep 17 00:00:00 2001 From: voidarc Date: Tue, 28 Jul 2026 19:25:12 +0100 Subject: [PATCH] updated flake and removed now redundant hyprland input --- flake.lock | 205 +++++++++++--------------- flake.nix | 5 - modules/features/hyprland/default.nix | 2 +- 3 files changed, 90 insertions(+), 122 deletions(-) diff --git a/flake.lock b/flake.lock index 493b0cd..67e5b6d 100644 --- a/flake.lock +++ b/flake.lock @@ -24,11 +24,11 @@ ] }, "locked": { - "lastModified": 1782073106, - "narHash": "sha256-dnS5SaZlPqR1E0dPXaPc+lFkBwLUbAgbwsVMk7uA6dY=", + "lastModified": 1784368054, + "narHash": "sha256-zF1iJkBQSDWmRO4/LEeHR1SpKY0lqZaxkoQJpPS9K9U=", "owner": "hyprwm", "repo": "aquamarine", - "rev": "6d6e2384f381def4ea4ea81543cba4bbdac72457", + "rev": "9b5f14d9483445e766294eb8fbe0b8f370269ed0", "type": "github" }, "original": { @@ -228,29 +228,6 @@ "type": "github" } }, - "gitignore": { - "inputs": { - "nixpkgs": [ - "hyprland", - "hyprland", - "pre-commit-hooks", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1709087332, - "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=", - "owner": "hercules-ci", - "repo": "gitignore.nix", - "rev": "637db329424fd7e46cf4185293b9cc8c88c95394", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "gitignore.nix", - "type": "github" - } - }, "gotify-desktop": { "inputs": { "nixpkgs": [ @@ -382,36 +359,18 @@ "hyprland": { "inputs": { "hyprland": "hyprland_2", - "nixpkgs": [ - "nixpkgs" - ], + "nixpkgs": "nixpkgs_3", "otter-launcher": "otter-launcher", "woomer": "woomer", "wrappers": "wrappers", "wshowkeys": "wshowkeys" }, "locked": { - "lastModified": 1784471205, - "narHash": "sha256-u/m4ToCCm0kI1npq+wj+aIEJtuvv2LaER2DywD9TD6U=", + "lastModified": 1785262861, + "narHash": "sha256-aSqAk+X2lcfWKICSTtVdramX5kkuUFy5MGOc58sl1NQ=", "ref": "refs/heads/main", - "rev": "782cd6884b28f91f2af4274b99adcdb9c146fa79", - "revCount": 49, - "type": "git", - "url": "https://git.voidarc.co.uk/voidarc/hypr" - }, - "original": { - "type": "git", - "url": "https://git.voidarc.co.uk/voidarc/hypr" - } - }, - "hyprland-config": { - "flake": false, - "locked": { - "lastModified": 1784471205, - "narHash": "sha256-u/m4ToCCm0kI1npq+wj+aIEJtuvv2LaER2DywD9TD6U=", - "ref": "refs/heads/main", - "rev": "782cd6884b28f91f2af4274b99adcdb9c146fa79", - "revCount": 49, + "rev": "b8677a83f0f796acfd7dd26832ef27214f5a431f", + "revCount": 50, "type": "git", "url": "https://git.voidarc.co.uk/voidarc/hypr" }, @@ -460,11 +419,11 @@ ] }, "locked": { - "lastModified": 1782563850, - "narHash": "sha256-rs/EzgrgPHbCtJjFZN4aR1HYldH/0NtGAempWVpWQTs=", + "lastModified": 1784196523, + "narHash": "sha256-ahtKMGXFJdlQNhatQm1+BBU/pGfGYnAqQt3vWvq4p8s=", "owner": "hyprwm", "repo": "hyprland-guiutils", - "rev": "5ba080ee036c30cb2485f2647ff8a61f7aa08178", + "rev": "a6ccb6cb112ed5a244c0191fb972347ecfa893e0", "type": "github" }, "original": { @@ -517,11 +476,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1783110106, - "narHash": "sha256-PRnnFkTfQ+sQHSrcWw0512zEMNp5/1WHJeVuDf6FmxI=", + "lastModified": 1785237127, + "narHash": "sha256-sMSWRj9zZ3O4Q1Bk8mKkdXsTb3zpXRESlrzWmQXmW54=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "14fa1fd0273973b7a40966b4fa9e081d6bf67dae", + "rev": "ff24e1755fd308ee70367d63168a12feb05d1fc2", "type": "github" }, "original": { @@ -635,11 +594,11 @@ ] }, "locked": { - "lastModified": 1783002634, - "narHash": "sha256-xGqHIUK0wIZoW7SiMalwvO6uGOO/VrlQwoRobpE7dDI=", + "lastModified": 1784323413, + "narHash": "sha256-XnAVV+H4f8Xdv0yZcSwJ5kCjLyE8fHxPeLX6a3HSrAU=", "owner": "hyprwm", "repo": "hyprutils", - "rev": "41fb809557abd29a57151b6e1aaeabd05f9437e1", + "rev": "5f03477ab3a005ff27c527486f551883535aea2f", "type": "github" }, "original": { @@ -709,11 +668,11 @@ }, "import-tree": { "locked": { - "lastModified": 1778781969, - "narHash": "sha256-Jjuz5CmSkur8KvLDoGa+vylEp+RkQtv4mt/qcMznpH0=", + "lastModified": 1784254960, + "narHash": "sha256-iI88R3wHz8wTKQb5orvpc51L/Xr64AJyxid/0MKa/b8=", "owner": "vic", "repo": "import-tree", - "rev": "d321337efd0f23a9eb14a42adb7b2c29313ab274", + "rev": "4ebb10ae17d5f1ad366e7aef5b92cb8eecf24f69", "type": "github" }, "original": { @@ -800,6 +759,22 @@ } }, "nixpkgs_10": { + "locked": { + "lastModified": 1744536153, + "narHash": "sha256-awS2zRgF4uTwrOKwwiJcByDzDOdo3Q1rPZbiHQg/N38=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "18dd725c29603f582cf1900e0d25f9f1063dbf11", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_11": { "locked": { "lastModified": 1780336545, "narHash": "sha256-vhVhuXzFrIOfcssC/9hDHx7MHzDKjF3keHuREOQqQiQ=", @@ -817,11 +792,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1782467914, - "narHash": "sha256-pGvFkM8N0xEkIIXDe5YYfbEAvHrk4IxBrjB/x8OomhE=", + "lastModified": 1784356753, + "narHash": "sha256-12KrbMiWLcf8m7pCvAtZh1ZrgF85ZXDXvfR/fWTKy84=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e73de5be04e0eff4190a1432b946d469c794e7b4", + "rev": "61b7c44c4073f0b827768aff0049561b5110ea5a", "type": "github" }, "original": { @@ -832,6 +807,22 @@ } }, "nixpkgs_3": { + "locked": { + "lastModified": 1785090369, + "narHash": "sha256-m0pDuRJG7EDo9ri+4Ksu83VsI+PlxNC9lNBfydejce4=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "624af665418d3c65d544145b4d34ad696439570e", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_4": { "locked": { "lastModified": 1782175435, "narHash": "sha256-EMzXKmnOtBQ2MnvpiNOm7E+kOMvdPrIKaeg52Tip2Uk=", @@ -847,7 +838,7 @@ "type": "github" } }, - "nixpkgs_4": { + "nixpkgs_5": { "locked": { "lastModified": 1773734432, "narHash": "sha256-IF5ppUWh6gHGHYDbtVUyhwy/i7D261P7fWD1bPefOsw=", @@ -863,13 +854,13 @@ "type": "github" } }, - "nixpkgs_5": { + "nixpkgs_6": { "locked": { - "lastModified": 1783549019, - "narHash": "sha256-0XnckG4ZhBmAsYa9mLuEIFowBG0fDGPLHduQGsbMS4A=", + "lastModified": 1785104993, + "narHash": "sha256-eKbrvPoAOFutbYMdbB3r5EQVmFxKv24iKqHPPUXA0gM=", "owner": "nixos", "repo": "nixpkgs", - "rev": "74cc63f702f7d60a557e152a57b40fb1fd0f72ac", + "rev": "8623c4c20aa4ca2f5fb81510d2944066c3fb0d96", "type": "github" }, "original": { @@ -879,7 +870,7 @@ "type": "github" } }, - "nixpkgs_6": { + "nixpkgs_7": { "locked": { "lastModified": 1782467914, "narHash": "sha256-pGvFkM8N0xEkIIXDe5YYfbEAvHrk4IxBrjB/x8OomhE=", @@ -895,7 +886,7 @@ "type": "github" } }, - "nixpkgs_7": { + "nixpkgs_8": { "locked": { "lastModified": 1780336545, "narHash": "sha256-vhVhuXzFrIOfcssC/9hDHx7MHzDKjF3keHuREOQqQiQ=", @@ -911,7 +902,7 @@ "type": "github" } }, - "nixpkgs_8": { + "nixpkgs_9": { "locked": { "lastModified": 1783224372, "narHash": "sha256-8i/87eeoqiGE4yOTjwSA3Eh/ziJRQEmd/unYU+K27sk=", @@ -927,25 +918,9 @@ "type": "github" } }, - "nixpkgs_9": { - "locked": { - "lastModified": 1744536153, - "narHash": "sha256-awS2zRgF4uTwrOKwwiJcByDzDOdo3Q1rPZbiHQg/N38=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "18dd725c29603f582cf1900e0d25f9f1063dbf11", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, "nvim": { "inputs": { - "nixpkgs": "nixpkgs_6", + "nixpkgs": "nixpkgs_7", "wrappers": "wrappers_2" }, "locked": { @@ -994,11 +969,11 @@ "systems": "systems_3" }, "locked": { - "lastModified": 1783145565, - "narHash": "sha256-czL1P2nQV3JrbV6J2b3jXnWcz+Kbz+xhaXKk3+wdnF0=", + "lastModified": 1783875707, + "narHash": "sha256-Ryg3PqFcGydelQpgPF0j8GMaXaGDrNTSesEy6fDw/eg=", "owner": "kuokuo123", "repo": "otter-launcher", - "rev": "2e35ce8c7ba6f5e4d98bf4c9073f5fa91143744d", + "rev": "242e5da4f0acc0b4301be7b4546f5afb3e4b23d6", "type": "github" }, "original": { @@ -1017,11 +992,11 @@ "systems": "systems_6" }, "locked": { - "lastModified": 1783339207, - "narHash": "sha256-ZO2WzXNEM9XKuReixgQuP1G+5nrihYWajugBCIjjPkE=", + "lastModified": 1783875707, + "narHash": "sha256-Ryg3PqFcGydelQpgPF0j8GMaXaGDrNTSesEy6fDw/eg=", "owner": "kuokuo123", "repo": "otter-launcher", - "rev": "d101421377473a190701d53cbe28b8244edad728", + "rev": "242e5da4f0acc0b4301be7b4546f5afb3e4b23d6", "type": "github" }, "original": { @@ -1033,7 +1008,6 @@ "pre-commit-hooks": { "inputs": { "flake-compat": "flake-compat", - "gitignore": "gitignore", "nixpkgs": [ "hyprland", "hyprland", @@ -1041,11 +1015,11 @@ ] }, "locked": { - "lastModified": 1781733627, - "narHash": "sha256-U3yTuGBnmXvXoQI3qkpfEDsn9RovQPAjN7ndRco+3u0=", + "lastModified": 1784288435, + "narHash": "sha256-ReRHaLgr/uVqdD8afFSn+myXIfpHeOhP0yYe0TJqAA8=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "3bbec39bc90eadfa031e6f3b77272f3f60803e39", + "rev": "43b3c1ab9d40fb1dbb008f451988a91e375825e9", "type": "github" }, "original": { @@ -1076,9 +1050,8 @@ "flake-parts": "flake-parts", "gotify-desktop": "gotify-desktop", "hyprland": "hyprland", - "hyprland-config": "hyprland-config", "import-tree": "import-tree", - "nixpkgs": "nixpkgs_5", + "nixpkgs": "nixpkgs_6", "nvim": "nvim", "omnisearch": "omnisearch", "otter-launcher": "otter-launcher_2", @@ -1092,7 +1065,7 @@ }, "rust-overlay": { "inputs": { - "nixpkgs": "nixpkgs_9" + "nixpkgs": "nixpkgs_10" }, "locked": { "lastModified": 1784438913, @@ -1110,14 +1083,14 @@ }, "sls-steam": { "inputs": { - "nixpkgs": "nixpkgs_8" + "nixpkgs": "nixpkgs_9" }, "locked": { - "lastModified": 1783704618, - "narHash": "sha256-/zurHHGZW+E2xF4Pk6BSP4Mib3oPJDMtqrinRF2pYFI=", + "lastModified": 1785224226, + "narHash": "sha256-Aj0ZA0boiYSPrvN+5ECpcYmx8OFEF+M1OoVY7ko0H/E=", "owner": "AceSLS", "repo": "SLSsteam", - "rev": "37d5bb313fa186e70b38623bee3ba0f4f17f65b5", + "rev": "4f7b79143a47a8ecb97c323745c7593d55fd6f20", "type": "github" }, "original": { @@ -1304,7 +1277,7 @@ "woomer": { "inputs": { "crane": "crane", - "nixpkgs": "nixpkgs_3", + "nixpkgs": "nixpkgs_4", "systems": "systems_4" }, "locked": { @@ -1345,14 +1318,14 @@ }, "wrappers": { "inputs": { - "nixpkgs": "nixpkgs_4" + "nixpkgs": "nixpkgs_5" }, "locked": { - "lastModified": 1782375095, - "narHash": "sha256-bRepNpAluz2i0IIk7Tmzw/4BkyOrwABvc66NEgXPEhA=", + "lastModified": 1785177581, + "narHash": "sha256-9Z4l080DSrHMxoQTZTpVsML2h6JDuB9lDwHPsLd9BrQ=", "owner": "lassulus", "repo": "wrappers", - "rev": "cd780e92c0fa66c2e721e1d91894f3db13b9f2b4", + "rev": "f57bc81aa9669871343341b13aa175c8927b6a74", "type": "github" }, "original": { @@ -1363,7 +1336,7 @@ }, "wrappers_2": { "inputs": { - "nixpkgs": "nixpkgs_7" + "nixpkgs": "nixpkgs_8" }, "locked": { "lastModified": 1782135443, @@ -1381,7 +1354,7 @@ }, "wrappers_3": { "inputs": { - "nixpkgs": "nixpkgs_10" + "nixpkgs": "nixpkgs_11" }, "locked": { "lastModified": 1782135443, @@ -1474,11 +1447,11 @@ ] }, "locked": { - "lastModified": 1782311043, - "narHash": "sha256-07zLc2M3/ax+JsjxGTft17/Joua41LHE9/9AC/F9zeU=", + "lastModified": 1784371182, + "narHash": "sha256-S8A1lezEalltWcCp3gAic5lssS0xTSISK6fKODefhOk=", "owner": "hyprwm", "repo": "xdg-desktop-portal-hyprland", - "rev": "882ad01e195ce201b07c618bbee44a0cad8b9e5a", + "rev": "08d99f727944dd15e4740090305e31c5fb92a50a", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 8316d1c..4c3b72e 100644 --- a/flake.nix +++ b/flake.nix @@ -9,11 +9,6 @@ nvim.url = "git+https://git.voidarc.co.uk/voidarc/nvim"; hyprland = { url = "git+https://git.voidarc.co.uk/voidarc/hypr"; - inputs.nixpkgs.follows = "nixpkgs"; - }; - hyprland-config = { - url = "git+https://git.voidarc.co.uk/voidarc/hypr"; - flake = false; }; otter-launcher = { url = "github:kuokuo123/otter-launcher"; diff --git a/modules/features/hyprland/default.nix b/modules/features/hyprland/default.nix index d5d6cfd..8e49b4f 100644 --- a/modules/features/hyprland/default.nix +++ b/modules/features/hyprland/default.nix @@ -42,7 +42,7 @@ ''; system.activationScripts.hyprConfig = lib.stringAfter ["specialfs"] '' mkdir -p /run/hypr/config - ln -sfn ${inputs.hyprland-config}/* /run/hypr/config + ln -sfn ${inputs'.hyprland.packages.repo-files}/* /run/hypr/config ''; }); perSystem = {