From ed31c2cf5e643a1973f9bbbc891c6789cd87be9b Mon Sep 17 00:00:00 2001 From: ulic-youthlic Date: Sun, 6 Jul 2025 08:58:26 +0800 Subject: [PATCH] flake: Sync flake input upstreams --- flake.lock | 485 ++++++++++++++----- flake.nix | 11 +- overlays/modifications/default.nix | 3 + overlays/modifications/nur-ataraxiasejel.nix | 17 + 4 files changed, 400 insertions(+), 116 deletions(-) create mode 100644 overlays/modifications/nur-ataraxiasejel.nix diff --git a/flake.lock b/flake.lock index 3eb3e0c..f971488 100644 --- a/flake.lock +++ b/flake.lock @@ -74,11 +74,11 @@ ] }, "locked": { - "lastModified": 1745154287, - "narHash": "sha256-kOYbNDnaP/1rQxeRu7e71yap4+aQFeObr29GFJou/jo=", + "lastModified": 1752086927, + "narHash": "sha256-gBs68/c/WnanvRc772uTGBTih7e/BpTyAc+DzMKk86Q=", "owner": "HeitorAugustoLN", "repo": "betterfox-nix", - "rev": "f76d3767f46c0d5536b911d3453ef76e186b344a", + "rev": "d4464e56f0fe6da7c09abab3ca0eed620c4a8993", "type": "github" }, "original": { @@ -87,6 +87,37 @@ "type": "github" } }, + "cachix": { + "inputs": { + "devenv": [ + "nur-ataraxiasjel", + "devenv" + ], + "flake-compat": [ + "nur-ataraxiasjel", + "devenv" + ], + "git-hooks": [ + "nur-ataraxiasjel", + "devenv" + ], + "nixpkgs": "nixpkgs_5" + }, + "locked": { + "lastModified": 1744206633, + "narHash": "sha256-pb5aYkE8FOoa4n123slgHiOf1UbNSnKe5pEZC+xXD5g=", + "owner": "cachix", + "repo": "cachix", + "rev": "8a60090640b96f9df95d1ab99e5763a586be1404", + "type": "github" + }, + "original": { + "owner": "cachix", + "ref": "latest", + "repo": "cachix", + "type": "github" + } + }, "chaotic": { "inputs": { "flake-schemas": "flake-schemas", @@ -96,11 +127,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1751549328, - "narHash": "sha256-Pzh9+N0palTIX+O2NygrUmMS8omB86SnYthLwE5cu5g=", + "lastModified": 1752156231, + "narHash": "sha256-x0yeVZU1f9MBYrndIE7eJYNPgc7bbMbTXKDTJ9xHtOQ=", "owner": "chaotic-cx", "repo": "nyx", - "rev": "53209f5724858da5e3e5db3db404c325b4da5414", + "rev": "461aa14d3e9b4a8a8524392fc3dbdf0c8611b82a", "type": "github" }, "original": { @@ -119,11 +150,11 @@ ] }, "locked": { - "lastModified": 1751629121, - "narHash": "sha256-XOZaKjrJXKvZmY4k2RyLwJaQdFjArS6N+q5cWh5TL9A=", + "lastModified": 1751713915, + "narHash": "sha256-nVu5xAfFpOgsORMf3w3Mix+snKtiDLFcWWCTqDvf48Y=", "owner": "daeuniverse", "repo": "flake.nix", - "rev": "8608dc1cf1993971713a4e40377e9d89aefca908", + "rev": "3339cd91444e16ba50e1e95a86a972b5209456d6", "type": "github" }, "original": { @@ -156,6 +187,40 @@ "type": "github" } }, + "devenv": { + "inputs": { + "cachix": "cachix", + "flake-compat": "flake-compat_3", + "git-hooks": "git-hooks", + "nix": "nix", + "nixpkgs": "nixpkgs_7" + }, + "locked": { + "lastModified": 1748273445, + "narHash": "sha256-5V0dzpNgQM0CHDsMzh+ludYeu1S+Y+IMjbaskSSdFh0=", + "owner": "cachix", + "repo": "devenv", + "rev": "668a50d8b7bdb19a0131f53c9f6c25c9071e1ffb", + "type": "github" + }, + "original": { + "owner": "cachix", + "repo": "devenv", + "type": "github" + } + }, + "devenv-root": { + "flake": false, + "locked": { + "narHash": "sha256-d6xi4mKdjkX2JFicDIv5niSzpyI0m/Hnm8GGAIU04kY=", + "type": "file", + "url": "file:///dev/null" + }, + "original": { + "type": "file", + "url": "file:///dev/null" + } + }, "disko": { "inputs": { "nixpkgs": [ @@ -163,11 +228,11 @@ ] }, "locked": { - "lastModified": 1751607816, - "narHash": "sha256-5PtrwjqCIJ4DKQhzYdm8RFePBuwb+yTzjV52wWoGSt4=", + "lastModified": 1752113600, + "narHash": "sha256-7LYDxKxZgBQ8LZUuolAQ8UkIB+jb4A2UmiR+kzY9CLI=", "owner": "nix-community", "repo": "disko", - "rev": "da6109c917b48abc1f76dd5c9bf3901c8c80f662", + "rev": "79264292b7e3482e5702932949de9cbb69fedf6d", "type": "github" }, "original": { @@ -225,12 +290,13 @@ } }, "flake-compat_3": { + "flake": false, "locked": { - "lastModified": 1747046372, - "narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=", + "lastModified": 1733328505, + "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=", "owner": "edolstra", "repo": "flake-compat", - "rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885", + "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec", "type": "github" }, "original": { @@ -257,6 +323,68 @@ "type": "github" } }, + "flake-parts_2": { + "inputs": { + "nixpkgs-lib": [ + "nur", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1733312601, + "narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, + "flake-parts_3": { + "inputs": { + "nixpkgs-lib": [ + "nur-ataraxiasjel", + "devenv", + "nix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1712014858, + "narHash": "sha256-sB4SWl2lX95bExY2gMFG5HIzvva5AVMJd4Igm+GpZNw=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "9126214d0a59633752a136528f5f3b9aa8565b7d", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, + "flake-parts_4": { + "inputs": { + "nixpkgs-lib": "nixpkgs-lib_2" + }, + "locked": { + "lastModified": 1743550720, + "narHash": "sha256-hIshGgKZCgWh6AYJpJmRgFdR3WUbkY04o82X05xqQiY=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "c621e8422220273271f52058f618c94e405bb0f5", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, "flake-schemas": { "locked": { "lastModified": 1721999734, @@ -323,21 +451,22 @@ "git-hooks": { "inputs": { "flake-compat": [ - "stylix", - "flake-compat" + "nur-ataraxiasjel", + "devenv" ], "gitignore": "gitignore", "nixpkgs": [ - "stylix", + "nur-ataraxiasjel", + "devenv", "nixpkgs" ] }, "locked": { - "lastModified": 1747372754, - "narHash": "sha256-2Y53NGIX2vxfie1rOW0Qb86vjRZ7ngizoo+bnXU9D9k=", + "lastModified": 1746537231, + "narHash": "sha256-Wb2xeSyOsCoTCTj7LOoD6cdKLEROyFAArnYoS+noCWo=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "80479b6ec16fefd9c1db3ea13aeb038c60530f46", + "rev": "fa466640195d38ec97cf0493d6d6882bc4d14969", "type": "github" }, "original": { @@ -349,7 +478,8 @@ "gitignore": { "inputs": { "nixpkgs": [ - "stylix", + "nur-ataraxiasjel", + "devenv", "git-hooks", "nixpkgs" ] @@ -393,11 +523,11 @@ "rust-overlay": "rust-overlay_2" }, "locked": { - "lastModified": 1751638642, - "narHash": "sha256-lKlxSvY6Dn9yYkwAedht2O7iXX3QjJ76YFvGOLvnpfk=", + "lastModified": 1752155373, + "narHash": "sha256-NE03Kz7XRHrJ4IUcaZVhkgr4EwVgrexLw6JUGZ9gSwo=", "owner": "helix-editor", "repo": "helix", - "rev": "9789b2746192c9501577a6a25ba15fae5b27e88b", + "rev": "8e0f326ebb98060deab7d454fab6fd9f4b217737", "type": "github" }, "original": { @@ -415,11 +545,11 @@ ] }, "locked": { - "lastModified": 1751513147, - "narHash": "sha256-idSXM3Y0KNf/WDDqGfthiOSQMwZYwis1JZhTkdWrr6A=", + "lastModified": 1751824240, + "narHash": "sha256-aDDC0CHTlL7QDKWWhdbEgVPK6KwWt+ca0QkmHYZxMzI=", "owner": "nix-community", "repo": "home-manager", - "rev": "426b405d979d893832549b95f23c13537c65d244", + "rev": "fd9e55f5fac45a26f6169310afca64d56b681935", "type": "github" }, "original": { @@ -435,11 +565,11 @@ ] }, "locked": { - "lastModified": 1751638848, - "narHash": "sha256-7HiC6w4ROEbMmKtj5pilnLOJej9HkkfU9wEd5QSTyNo=", + "lastModified": 1752093218, + "narHash": "sha256-+3rXu8ewcNDi65/2mKkdSGrivQs5zEZVp5aYszXC0d0=", "owner": "nix-community", "repo": "home-manager", - "rev": "7d9e3c35f0d46f82bac791d76260f15f53d83529", + "rev": "206ed3c71418b52e176f16f58805c96e84555320", "type": "github" }, "original": { @@ -470,6 +600,22 @@ "type": "github" } }, + "libgit2": { + "flake": false, + "locked": { + "lastModified": 1697646580, + "narHash": "sha256-oX4Z3S9WtJlwvj0uH9HlYcWv+x1hqp8mhXl7HsLu2f0=", + "owner": "libgit2", + "repo": "libgit2", + "rev": "45fd9ed7ae1a9b74b957ef4f337bc3c8b3df01b5", + "type": "github" + }, + "original": { + "owner": "libgit2", + "repo": "libgit2", + "type": "github" + } + }, "lix": { "flake": false, "locked": { @@ -522,11 +668,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1751653855, - "narHash": "sha256-JzPiCLz/ESg5OJ3uYPP141HTPEpfDA+g/8LPVtNiQdA=", + "lastModified": 1752078530, + "narHash": "sha256-TrRmlYdhWcadWvBpDjB9Xlry4uT4ZUIO46d+o5tjtCQ=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "0ca4dc1ae61f37b9f2f15225b3015a2dea3413da", + "rev": "d231d92313192d4d0c78d6ef04167fed9dee87cf", "type": "github" }, "original": { @@ -568,6 +714,43 @@ "type": "github" } }, + "nix": { + "inputs": { + "flake-compat": [ + "nur-ataraxiasjel", + "devenv" + ], + "flake-parts": "flake-parts_3", + "libgit2": "libgit2", + "nixpkgs": "nixpkgs_6", + "nixpkgs-23-11": [ + "nur-ataraxiasjel", + "devenv" + ], + "nixpkgs-regression": [ + "nur-ataraxiasjel", + "devenv" + ], + "pre-commit-hooks": [ + "nur-ataraxiasjel", + "devenv" + ] + }, + "locked": { + "lastModified": 1745930071, + "narHash": "sha256-bYyjarS3qSNqxfgc89IoVz8cAFDkF9yPE63EJr+h50s=", + "owner": "domenkozar", + "repo": "nix", + "rev": "b455edf3505f1bf0172b39a735caef94687d0d9c", + "type": "github" + }, + "original": { + "owner": "domenkozar", + "ref": "devenv-2.24", + "repo": "nix", + "type": "github" + } + }, "nix-github-actions": { "inputs": { "nixpkgs": [ @@ -614,11 +797,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1751432711, - "narHash": "sha256-136MeWtckSHTN9Z2WRNRdZ8oRP3vyx3L8UxeBYE+J9w=", + "lastModified": 1752048960, + "narHash": "sha256-gATnkOe37eeVwKKYCsL+OnS2gU4MmLuZFzzWCtaKLI8=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "497ae1357f1ac97f1aea31a4cb74ad0d534ef41f", + "rev": "7ced9122cff2163c6a0212b8d1ec8c33a1660806", "type": "github" }, "original": { @@ -630,11 +813,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1751271578, - "narHash": "sha256-P/SQmKDu06x8yv7i0s8bvnnuJYkxVGBWLWHaU+tt4YY=", + "lastModified": 1751984180, + "narHash": "sha256-LwWRsENAZJKUdD3SpLluwDmdXY9F45ZEgCb0X+xgOL0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3016b4b15d13f3089db8a41ef937b13a9e33a8df", + "rev": "9807714d6944a957c2e036f84b0ff8caf9930bc0", "type": "github" }, "original": { @@ -659,13 +842,28 @@ "type": "github" } }, + "nixpkgs-lib_2": { + "locked": { + "lastModified": 1743296961, + "narHash": "sha256-b1EdN3cULCqtorQ4QeWgLMrd5ZGOjLSLemfa00heasc=", + "owner": "nix-community", + "repo": "nixpkgs.lib", + "rev": "e4822aea2a6d1cdd36653c134cacfd64c97ff4fa", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "nixpkgs.lib", + "type": "github" + } + }, "nixpkgs-stable": { "locked": { - "lastModified": 1751582995, - "narHash": "sha256-u7ubvtxdTnFPpV27AHpgoKn7qHuE7sgWgza/1oj5nzA=", + "lastModified": 1751943650, + "narHash": "sha256-7orTnNqkGGru8Je6Un6mq1T8YVVU/O5kyW4+f9C1mZQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "7a732ed41ca0dd64b4b71b563ab9805a80a7d693", + "rev": "88983d4b665fb491861005137ce2b11a9f89f203", "type": "github" }, "original": { @@ -709,11 +907,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1751271578, - "narHash": "sha256-P/SQmKDu06x8yv7i0s8bvnnuJYkxVGBWLWHaU+tt4YY=", + "lastModified": 1751984180, + "narHash": "sha256-LwWRsENAZJKUdD3SpLluwDmdXY9F45ZEgCb0X+xgOL0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3016b4b15d13f3089db8a41ef937b13a9e33a8df", + "rev": "9807714d6944a957c2e036f84b0ff8caf9930bc0", "type": "github" }, "original": { @@ -724,6 +922,86 @@ } }, "nixpkgs_4": { + "locked": { + "lastModified": 1751984180, + "narHash": "sha256-LwWRsENAZJKUdD3SpLluwDmdXY9F45ZEgCb0X+xgOL0=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "9807714d6944a957c2e036f84b0ff8caf9930bc0", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_5": { + "locked": { + "lastModified": 1733212471, + "narHash": "sha256-M1+uCoV5igihRfcUKrr1riygbe73/dzNnzPsmaLCmpo=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "55d15ad12a74eb7d4646254e13638ad0c4128776", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_6": { + "locked": { + "lastModified": 1717432640, + "narHash": "sha256-+f9c4/ZX5MWDOuB1rKoWj+lBNm0z0rs4CK47HBLxy1o=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "88269ab3044128b7c2f4c7d68448b2fb50456870", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "release-24.05", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_7": { + "locked": { + "lastModified": 1746807397, + "narHash": "sha256-zU2z0jlkJGWLhdNr/8AJSxqK8XD0IlQgHp3VZcP56Aw=", + "owner": "cachix", + "repo": "devenv-nixpkgs", + "rev": "c5208b594838ea8e6cca5997fbf784b7cca1ca90", + "type": "github" + }, + "original": { + "owner": "cachix", + "ref": "rolling", + "repo": "devenv-nixpkgs", + "type": "github" + } + }, + "nixpkgs_8": { + "locked": { + "lastModified": 1748190013, + "narHash": "sha256-R5HJFflOfsP5FBtk+zE8FpL8uqE7n62jqOsADvVshhE=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "62b852f6c6742134ade1abdd2a21685fd617a291", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_9": { "locked": { "lastModified": 1747958103, "narHash": "sha256-qmmFCrfBwSHoWw7cVK4Aj+fns+c54EBP8cGqp/yK410=", @@ -741,22 +1019,15 @@ }, "nur": { "inputs": { - "flake-parts": [ - "flake-parts" - ], - "nixpkgs": [ - "nixpkgs" - ], - "treefmt-nix": [ - "treefmt-nix" - ] + "flake-parts": "flake-parts_2", + "nixpkgs": "nixpkgs_4" }, "locked": { - "lastModified": 1751713912, - "narHash": "sha256-4ikKVj322GK2DCSw7K1InZGYjsTnTMI4S0/aNDrtW6U=", + "lastModified": 1752148075, + "narHash": "sha256-gS7UuiexhO4OXBpK/RYzZKZV/zNVvFkdqNtljjfehWg=", "owner": "nix-community", "repo": "NUR", - "rev": "1ad467ddb779f4cc7f9e2dc975d32689299c6b16", + "rev": "1426c53eef01e08fbf956a6f845cf2f376d2eb57", "type": "github" }, "original": { @@ -765,6 +1036,27 @@ "type": "github" } }, + "nur-ataraxiasjel": { + "inputs": { + "devenv": "devenv", + "devenv-root": "devenv-root", + "flake-parts": "flake-parts_4", + "nixpkgs": "nixpkgs_8" + }, + "locked": { + "lastModified": 1751641756, + "narHash": "sha256-5fXKpa5iVpsnsHUhiqMQ1gXdOGwEKc61fXhaMZn7Gb4=", + "owner": "AtaraxiaSjel", + "repo": "nur", + "rev": "73e0fbc32ab305d50b84ab351c31604f003b50a8", + "type": "github" + }, + "original": { + "owner": "AtaraxiaSjel", + "repo": "nur", + "type": "github" + } + }, "nur_2": { "inputs": { "flake-parts": [ @@ -774,15 +1066,14 @@ "nixpkgs": [ "stylix", "nixpkgs" - ], - "treefmt-nix": "treefmt-nix" + ] }, "locked": { - "lastModified": 1748730660, - "narHash": "sha256-5LKmRYKdPuhm8j5GFe3AfrJL8dd8o57BQ34AGjJl1R0=", + "lastModified": 1751906969, + "narHash": "sha256-BSQAOdPnzdpOuCdAGSJmefSDlqmStFNScEnrWzSqKPw=", "owner": "nix-community", "repo": "NUR", - "rev": "2c0bc52fe14681e9ef60e3553888c4f086e46ecb", + "rev": "ddb679f4131e819efe3bbc6457ba19d7ad116f25", "type": "github" }, "original": { @@ -808,9 +1099,10 @@ "nixos-hardware": "nixos-hardware", "nixpkgs": "nixpkgs_3", "nur": "nur", + "nur-ataraxiasjel": "nur-ataraxiasjel", "sops-nix": "sops-nix", "stylix": "stylix", - "treefmt-nix": "treefmt-nix_2" + "treefmt-nix": "treefmt-nix" } }, "rust-overlay": { @@ -821,11 +1113,11 @@ ] }, "locked": { - "lastModified": 1751510438, - "narHash": "sha256-m8PjOoyyCR4nhqtHEBP1tB/jF+gJYYguSZmUmVTEAQE=", + "lastModified": 1751856221, + "narHash": "sha256-/QE1eV0ckFvgRMcKjZqgdJDoXFNwSMepwRoBjaw2MCk=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "7f415261f298656f8164bd636c0dc05af4e95b6b", + "rev": "34cae4b56929c5b340e1c5b10d9a98a425b2a51e", "type": "github" }, "original": { @@ -903,15 +1195,10 @@ "base16-helix": "base16-helix", "base16-vim": "base16-vim", "firefox-gnome-theme": "firefox-gnome-theme", - "flake-compat": "flake-compat_3", "flake-parts": [ "flake-parts" ], - "git-hooks": "git-hooks", "gnome-shell": "gnome-shell", - "home-manager": [ - "home-manager" - ], "nixpkgs": [ "nixpkgs" ], @@ -924,11 +1211,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1751656637, - "narHash": "sha256-x1uJ6wQ7C+N/Zx9liQzjyVOEwGf5tcKogSoGgxASZOg=", + "lastModified": 1752083519, + "narHash": "sha256-NbLWT1fOfyoNdt5ZH65h0JnGzF8uSZPsjdo5PmW2AHI=", "owner": "nix-community", "repo": "stylix", - "rev": "606944b16862d43934fec3311f9cb9f478b7f99b", + "rev": "480649bbdf8ef423c84a7152ceadf22839a5acbb", "type": "github" }, "original": { @@ -1003,11 +1290,11 @@ "tinted-schemes": { "flake": false, "locked": { - "lastModified": 1748180480, - "narHash": "sha256-7n0XiZiEHl2zRhDwZd/g+p38xwEoWtT0/aESwTMXWG4=", + "lastModified": 1750770351, + "narHash": "sha256-LI+BnRoFNRa2ffbe3dcuIRYAUcGklBx0+EcFxlHj0SY=", "owner": "tinted-theming", "repo": "schemes", - "rev": "87d652edd26f5c0c99deda5ae13dfb8ece2ffe31", + "rev": "5a775c6ffd6e6125947b393872cde95867d85a2a", "type": "github" }, "original": { @@ -1019,11 +1306,11 @@ "tinted-tmux": { "flake": false, "locked": { - "lastModified": 1748740859, - "narHash": "sha256-OEM12bg7F4N5WjZOcV7FHJbqRI6jtCqL6u8FtPrlZz4=", + "lastModified": 1751159871, + "narHash": "sha256-UOHBN1fgHIEzvPmdNMHaDvdRMgLmEJh2hNmDrp3d3LE=", "owner": "tinted-theming", "repo": "tinted-tmux", - "rev": "57d5f9683ff9a3b590643beeaf0364da819aedda", + "rev": "bded5e24407cec9d01bd47a317d15b9223a1546c", "type": "github" }, "original": { @@ -1035,11 +1322,11 @@ "tinted-zed": { "flake": false, "locked": { - "lastModified": 1725758778, - "narHash": "sha256-8P1b6mJWyYcu36WRlSVbuj575QWIFZALZMTg5ID/sM4=", + "lastModified": 1751158968, + "narHash": "sha256-ksOyv7D3SRRtebpXxgpG4TK8gZSKFc4TIZpR+C98jX8=", "owner": "tinted-theming", "repo": "base16-zed", - "rev": "122c9e5c0e6f27211361a04fae92df97940eccf9", + "rev": "86a470d94204f7652b906ab0d378e4231a5b3384", "type": "github" }, "original": { @@ -1050,36 +1337,14 @@ }, "treefmt-nix": { "inputs": { - "nixpkgs": [ - "stylix", - "nur", - "nixpkgs" - ] + "nixpkgs": "nixpkgs_9" }, "locked": { - "lastModified": 1733222881, - "narHash": "sha256-JIPcz1PrpXUCbaccEnrcUS8jjEb/1vJbZz5KkobyFdM=", + "lastModified": 1752055615, + "narHash": "sha256-19m7P4O/Aw/6+CzncWMAJu89JaKeMh3aMle1CNQSIwM=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "49717b5af6f80172275d47a418c9719a31a78b53", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "treefmt-nix", - "type": "github" - } - }, - "treefmt-nix_2": { - "inputs": { - "nixpkgs": "nixpkgs_4" - }, - "locked": { - "lastModified": 1750931469, - "narHash": "sha256-0IEdQB1nS+uViQw4k3VGUXntjkDp7aAlqcxdewb/hAc=", - "owner": "numtide", - "repo": "treefmt-nix", - "rev": "ac8e6f32e11e9c7f153823abc3ab007f2a65d3e1", + "rev": "c9d477b5d5bd7f26adddd3f96cfd6a904768d4f9", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 1702dfd..8e3e4d4 100644 --- a/flake.nix +++ b/flake.nix @@ -134,7 +134,6 @@ inputs = { nixpkgs.follows = "nixpkgs"; flake-parts.follows = "flake-parts"; - home-manager.follows = "home-manager"; }; }; @@ -173,11 +172,11 @@ type = "github"; owner = "nix-community"; repo = "NUR"; - inputs = { - nixpkgs.follows = "nixpkgs"; - treefmt-nix.follows = "treefmt-nix"; - flake-parts.follows = "flake-parts"; - }; + }; + nur-ataraxiasjel = { + type = "github"; + owner = "AtaraxiaSjel"; + repo = "nur"; }; }; } diff --git a/overlays/modifications/default.nix b/overlays/modifications/default.nix index 906d1ed..1ae5b57 100644 --- a/overlays/modifications/default.nix +++ b/overlays/modifications/default.nix @@ -11,7 +11,10 @@ in # ./QQ.nix ./helix.nix ./cliphist.nix + + # Nur ./nur.nix + ./nur-ataraxiasejel.nix ] |> map (file: import file args) |> (overlays: (lib.composeManyExtensions overlays) final prev) diff --git a/overlays/modifications/nur-ataraxiasejel.nix b/overlays/modifications/nur-ataraxiasejel.nix new file mode 100644 index 0000000..a63a870 --- /dev/null +++ b/overlays/modifications/nur-ataraxiasejel.nix @@ -0,0 +1,17 @@ +{inputs, ...}: final: prev: let + inherit (final.stdenv.hostPlatform) system; +in { + nur = + prev.nur + // { + repos = + prev.nur.repos + // { + ataraxiasjel = + prev.nur.repos.ataraxiasjel + // { + inherit (inputs.nur-ataraxiasjel.packages.${system}) waydroid-script; + }; + }; + }; +}