From b8677a83f0f796acfd7dd26832ef27214f5a431f Mon Sep 17 00:00:00 2001 From: voidarc Date: Tue, 28 Jul 2026 19:21:01 +0100 Subject: [PATCH] added files output to flake and updated --- flake.lock | 83 ++++++++++++++++++++---------------------------------- flake.nix | 35 +++++++++++++++++------ 2 files changed, 57 insertions(+), 61 deletions(-) diff --git a/flake.lock b/flake.lock index 9afe4c8..47d8a45 100644 --- a/flake.lock +++ b/flake.lock @@ -20,11 +20,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": { @@ -100,28 +100,6 @@ "type": "github" } }, - "gitignore": { - "inputs": { - "nixpkgs": [ - "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" - } - }, "home-manager": { "inputs": { "nixpkgs": [ @@ -218,11 +196,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": { @@ -264,11 +242,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": { @@ -395,11 +373,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": { @@ -464,11 +442,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1782467914, - "narHash": "sha256-pGvFkM8N0xEkIIXDe5YYfbEAvHrk4IxBrjB/x8OomhE=", + "lastModified": 1784356753, + "narHash": "sha256-12KrbMiWLcf8m7pCvAtZh1ZrgF85ZXDXvfR/fWTKy84=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e73de5be04e0eff4190a1432b946d469c794e7b4", + "rev": "61b7c44c4073f0b827768aff0049561b5110ea5a", "type": "github" }, "original": { @@ -495,11 +473,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1782959384, - "narHash": "sha256-xnJJk+ct+D2+wdRxj1wk36w5zV9RVESwRqcklPdt3fM=", + "lastModified": 1785090369, + "narHash": "sha256-m0pDuRJG7EDo9ri+4Ksu83VsI+PlxNC9lNBfydejce4=", "owner": "nixos", "repo": "nixpkgs", - "rev": "65179426c83bb3f6bc14898b42ea1c6f01d374b0", + "rev": "624af665418d3c65d544145b4d34ad696439570e", "type": "github" }, "original": { @@ -551,11 +529,11 @@ "systems": "systems_2" }, "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": { @@ -567,18 +545,17 @@ "pre-commit-hooks": { "inputs": { "flake-compat": "flake-compat", - "gitignore": "gitignore", "nixpkgs": [ "hyprland", "nixpkgs" ] }, "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": { @@ -682,11 +659,11 @@ "nixpkgs": "nixpkgs_4" }, "locked": { - "lastModified": 1782375095, - "narHash": "sha256-bRepNpAluz2i0IIk7Tmzw/4BkyOrwABvc66NEgXPEhA=", + "lastModified": 1785177581, + "narHash": "sha256-9Z4l080DSrHMxoQTZTpVsML2h6JDuB9lDwHPsLd9BrQ=", "owner": "lassulus", "repo": "wrappers", - "rev": "cd780e92c0fa66c2e721e1d91894f3db13b9f2b4", + "rev": "f57bc81aa9669871343341b13aa175c8927b6a74", "type": "github" }, "original": { @@ -744,11 +721,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 5ed85d8..5b4b252 100644 --- a/flake.nix +++ b/flake.nix @@ -59,23 +59,42 @@ runtimePackages, exePath, flags, - env, + env, }: (wrappers.lib.wrapPackage { inherit env pkgs package exePath flags; }).overrideAttrs (old: { passthru = (old.passthru or {}) // {inherit runtimePackages;}; }); + repoSrc = pkgs.lib.cleanSourceWith { + src = ./.; + filter = path: type: let + name = baseNameOf path; + in + !(name == ".git" || name == ".gitignore" || name == "result" || name == ".direnv"); + }; in { lib.defaultRuntimePkgs.${system} = defaultRuntimePkgs; - packages.${system}.default = pkgs.lib.makeOverridable mkWrapped { - inherit pkgs; - package = hypr; - runtimePackages = defaultRuntimePkgs; - exePath = pkgs.lib.getExe hypr; - env."MODULES_ROOT" = ./modules; - flags."--config" = ./hyprland.lua; + packages.${system} = { + default = pkgs.lib.makeOverridable mkWrapped { + inherit pkgs; + package = hypr; + runtimePackages = defaultRuntimePkgs; + exePath = pkgs.lib.getExe hypr; + env."MODULES_ROOT" = ./modules; + flags."--config" = ./hyprland.lua; + }; + repo-files = pkgs.stdenvNoCC.mkDerivation { + pname = "hyprland-repo-files"; + version = "1.0"; + src = repoSrc; + dontBuild = true; + installPhase = '' + mkdir -p $out + cp -r . $out/ + ''; + }; }; }; }