diff --git a/.typos.toml b/.typos.toml index d514ecc..ca6d928 100644 --- a/.typos.toml +++ b/.typos.toml @@ -23,7 +23,6 @@ extend-ignore-identifiers-re = [ "ConfiguratioN", "StructurE", "lazer", - "substituters", ] [default.extend-identifiers] diff --git a/_sources/generated.json b/_sources/generated.json index 631f79a..9758210 100644 --- a/_sources/generated.json +++ b/_sources/generated.json @@ -1,6 +1,6 @@ { "OuterWildsTextAdventure": { - "cargoLock": null, + "cargoLocks": null, "date": "2024-12-21", "extract": null, "name": "OuterWildsTextAdventure", @@ -21,8 +21,8 @@ "version": "2a4430a6e53fc2e9979e0f4ebb312d90b92ba119" }, "TrackersListCollection": { - "cargoLock": null, - "date": "2026-01-31", + "cargoLocks": null, + "date": "2026-01-23", "extract": null, "name": "TrackersListCollection", "passthru": null, @@ -34,17 +34,17 @@ "name": null, "owner": "XIU2", "repo": "TrackersListCollection", - "rev": "0c7a32db6974f0c58f30a0753f4a8d164a22262d", - "sha256": "sha256-cydLc8KSt/Qy9n9Cq+eY6v14pZhjmQmqV16rWQda8Gw=", + "rev": "61e90fe4cbf20204a0b5590df7c6d48556512185", + "sha256": "sha256-vJfyx/rjlLf8mJnV8Trx+hppCRyu1BfBmCOvA6YjjZc=", "sparseCheckout": [ "all.txt" ], "type": "github" }, - "version": "0c7a32db6974f0c58f30a0753f4a8d164a22262d" + "version": "61e90fe4cbf20204a0b5590df7c6d48556512185" }, "noto-sans-cjk": { - "cargoLock": null, + "cargoLocks": null, "date": null, "extract": null, "name": "noto-sans-cjk", @@ -67,7 +67,7 @@ "version": "Serif2.003" }, "noto-serif-cjk": { - "cargoLock": null, + "cargoLocks": null, "date": null, "extract": null, "name": "noto-serif-cjk", @@ -90,7 +90,7 @@ "version": "Serif2.003" }, "nvim_vim-startuptime": { - "cargoLock": null, + "cargoLocks": null, "date": "2025-02-17", "extract": null, "name": "nvim_vim-startuptime", @@ -111,7 +111,7 @@ "version": "b6f0d93f6b8cf6eee0b4c94450198ba2d6a05ff6" }, "rime-yuhaostar": { - "cargoLock": null, + "cargoLocks": null, "date": null, "extract": null, "name": "rime-yuhaostar", @@ -126,8 +126,8 @@ "version": "v3.10.0" }, "spotx": { - "cargoLock": null, - "date": "2026-01-27", + "cargoLocks": null, + "date": "2026-01-14", "extract": null, "name": "spotx", "passthru": null, @@ -139,15 +139,15 @@ "name": null, "owner": "SpotX-Official", "repo": "SpotX-Bash", - "rev": "ca98eef240cd26b90ff423a836229275d4a1594f", - "sha256": "sha256-7u4ewbrBWu9AizkTJDW+Mo/syAmJEz5yH2vA4Zodi9c=", + "rev": "37ffdc78ba3ded6af6550895bfc687f44f1c4af6", + "sha256": "sha256-W6TGdLFPMcfaYG55fKu3ieKROBArFTg9KwW8VRBFcnI=", "sparseCheckout": [], "type": "github" }, - "version": "ca98eef240cd26b90ff423a836229275d4a1594f" + "version": "37ffdc78ba3ded6af6550895bfc687f44f1c4af6" }, "wshowkeys-mao": { - "cargoLock": null, + "cargoLocks": null, "date": "2025-09-14", "extract": null, "name": "wshowkeys-mao", diff --git a/_sources/generated.nix b/_sources/generated.nix index 14f9919..7fb9cf4 100644 --- a/_sources/generated.nix +++ b/_sources/generated.nix @@ -1,10 +1,5 @@ # This file was generated by nvfetcher, please do not modify it manually. -{ - fetchgit, - fetchurl, - fetchFromGitHub, - dockerTools, -}: +{ fetchgit, fetchurl, fetchFromGitHub, dockerTools }: { OuterWildsTextAdventure = { pname = "OuterWildsTextAdventure"; @@ -20,18 +15,18 @@ }; TrackersListCollection = { pname = "TrackersListCollection"; - version = "0c7a32db6974f0c58f30a0753f4a8d164a22262d"; + version = "61e90fe4cbf20204a0b5590df7c6d48556512185"; src = fetchFromGitHub { owner = "XIU2"; repo = "TrackersListCollection"; - rev = "0c7a32db6974f0c58f30a0753f4a8d164a22262d"; + rev = "61e90fe4cbf20204a0b5590df7c6d48556512185"; fetchSubmodules = false; deepClone = false; leaveDotGit = false; sparseCheckout = [ "all.txt" ]; - sha256 = "sha256-cydLc8KSt/Qy9n9Cq+eY6v14pZhjmQmqV16rWQda8Gw="; + sha256 = "sha256-vJfyx/rjlLf8mJnV8Trx+hppCRyu1BfBmCOvA6YjjZc="; }; - date = "2026-01-31"; + date = "2026-01-23"; }; noto-sans-cjk = { pname = "noto-sans-cjk"; @@ -84,15 +79,15 @@ }; spotx = { pname = "spotx"; - version = "ca98eef240cd26b90ff423a836229275d4a1594f"; + version = "37ffdc78ba3ded6af6550895bfc687f44f1c4af6"; src = fetchFromGitHub { owner = "SpotX-Official"; repo = "SpotX-Bash"; - rev = "ca98eef240cd26b90ff423a836229275d4a1594f"; + rev = "37ffdc78ba3ded6af6550895bfc687f44f1c4af6"; fetchSubmodules = false; - sha256 = "sha256-7u4ewbrBWu9AizkTJDW+Mo/syAmJEz5yH2vA4Zodi9c="; + sha256 = "sha256-W6TGdLFPMcfaYG55fKu3ieKROBArFTg9KwW8VRBFcnI="; }; - date = "2026-01-27"; + date = "2026-01-14"; }; wshowkeys-mao = { pname = "wshowkeys-mao"; diff --git a/flake.lock b/flake.lock index f4a4145..fe7e126 100644 --- a/flake.lock +++ b/flake.lock @@ -137,11 +137,11 @@ ] }, "locked": { - "lastModified": 1769524058, - "narHash": "sha256-zygdD6X1PcVNR2PsyK4ptzrVEiAdbMqLos7utrMDEWE=", + "lastModified": 1766150702, + "narHash": "sha256-P0kM+5o+DKnB6raXgFEk3azw8Wqg5FL6wyl9jD+G5a4=", "owner": "nix-community", "repo": "disko", - "rev": "71a3fc97d80881e91710fe721f1158d3b96ae14d", + "rev": "916506443ecd0d0b4a0f4cf9d40a3c22ce39b378", "type": "github" }, "original": { @@ -153,11 +153,11 @@ "doomemacs": { "flake": false, "locked": { - "lastModified": 1768984347, - "narHash": "sha256-VvC4rgAAaFnYLCdcUoz7dTE3kuBNuHIc+GlXOrPCxpg=", + "lastModified": 1767773143, + "narHash": "sha256-QL/t9v2kFNxBDyNJb/s411o3mxujan+QX5IZglTdpTk=", "owner": "doomemacs", "repo": "doomemacs", - "rev": "57818a6da90fbef39ff80d62fab2cd319496c3b9", + "rev": "3e15fb36d7f94f0a218bda977be4d3f5da983a71", "type": "github" }, "original": { @@ -172,11 +172,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1769824510, - "narHash": "sha256-eR1c/iKIHUXYW/PthilPJPO4/DnHQcVp2IpdIkgHJaw=", + "lastModified": 1768703823, + "narHash": "sha256-oonTamz3/eaJ9QqJWUWKpIXI3PtxP3j5rTGqSKscREo=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "656fc2edb2d52e7cc547290df5e955325a80c0f8", + "rev": "42822bddba89071d6a3f0c17644ada71de09fbbd", "type": "github" }, "original": { @@ -195,11 +195,11 @@ ] }, "locked": { - "lastModified": 1769676024, - "narHash": "sha256-OT08V+jMGDsIOW13IFnnobCp05uMv5e+tHNUG+dBBZo=", + "lastModified": 1768616209, + "narHash": "sha256-X5A9sNji2KkCKTHWScqxSbePKuw02G1uRiYTgAmY4ZY=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "18760112ac0d63955060cddbe99881d18a94a23d", + "rev": "9105cf487aead6b5960a08153610c87936c88e36", "type": "github" }, "original": { @@ -342,11 +342,11 @@ ] }, "locked": { - "lastModified": 1768135262, - "narHash": "sha256-PVvu7OqHBGWN16zSi6tEmPwwHQ4rLPU9Plvs8/1TUBY=", + "lastModified": 1765835352, + "narHash": "sha256-XswHlK/Qtjasvhd1nOa1e8MgZ8GS//jBoTqWtrS1Giw=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "80daad04eddbbf5a4d883996a73f3f542fa437ac", + "rev": "a34fae9c08a15ad73f295041fec82323541400a9", "type": "github" }, "original": { @@ -490,11 +490,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1769721111, - "narHash": "sha256-mwB7UaBiIY7trRH3rJXAMHOrjtcXRAEnp2LGoKzsc34=", + "lastModified": 1768367261, + "narHash": "sha256-fRFNRmMcf0pZyE5nGCSkr/8l1bT1YOhCLGgpUMQlQ+E=", "owner": "helix-editor", "repo": "helix", - "rev": "476ae24cc40b5a81522cbf37efe848860b44f434", + "rev": "594b5655aa496c6c2539509eb00d5abd082ce89e", "type": "github" }, "original": { @@ -511,11 +511,11 @@ ] }, "locked": { - "lastModified": 1769813945, - "narHash": "sha256-9ABv9Lo9t6MrFjlnRnU8Zw1C6LVj2+R8PipQ/rxGLHk=", + "lastModified": 1768707181, + "narHash": "sha256-GdwFfnwdUgABFpc4sAmX7GYx8eQs6cEjOPo6nBJ0YaI=", "owner": "nix-community", "repo": "home-manager", - "rev": "475921375def3eb930e1f8883f619ff8609accb6", + "rev": "83bcb17377f0242376a327e742e9404e9a528647", "type": "github" }, "original": { @@ -608,11 +608,11 @@ "nixpkgs": "nixpkgs_4" }, "locked": { - "lastModified": 1769731486, - "narHash": "sha256-FubWXQX1k1qyVKWiGNVSw2bQ2TD739PRqRsLXS/b2y0=", + "lastModified": 1768694683, + "narHash": "sha256-pB512IZ8jDu8BQ45gv3UoVCwLUoPDM82Tg5wIBb93bo=", "owner": "nix-community", "repo": "neovim-nightly-overlay", - "rev": "0d454d45604a3215057806757beda9bc7390d59e", + "rev": "0dc0043f996b3583a21011765a53109db5a9d016", "type": "github" }, "original": { @@ -624,11 +624,11 @@ "neovim-src": { "flake": false, "locked": { - "lastModified": 1769723720, - "narHash": "sha256-gmlHBj1nGfOBaCMEfgHdy/4sbuBXDaVIWNGJVPP+vNw=", + "lastModified": 1768656175, + "narHash": "sha256-qnBvj3GvyF757Z8qJLjcVk/NW5p1wldeLHLdQPbehOM=", "owner": "neovim", "repo": "neovim", - "rev": "52cd9dcff260decda860cf154873b298d10c1208", + "rev": "a5e5ec8910ea35ebb86dcba7f58333d9d4caca47", "type": "github" }, "original": { @@ -649,11 +649,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1769714858, - "narHash": "sha256-IHHAKi8yMonZZmVHUQxew1V9UfLBG8Um9PLbNPx3OA4=", + "lastModified": 1768684335, + "narHash": "sha256-YLjGGcSNE2lK+TUqDFEX6IBjPZNjLaoxAXji3mmZbvs=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "dfbb02586582d5332d0c06653583b9d743bce081", + "rev": "c133a45b02dba5fd229532067d6a22d5209436d6", "type": "github" }, "original": { @@ -682,11 +682,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1769577126, - "narHash": "sha256-v9vz9Rj4MGwPuhGELdvpRKl2HH+xvkgat6VwL0L86Fg=", + "lastModified": 1768678265, + "narHash": "sha256-Ub8eed4DsfIDWyg30xEe+8bSxL/z5Af/gCjmvJ0V/Hs=", "owner": "YaLTeR", "repo": "niri", - "rev": "f30db163b5748e8cf95c05aba77d0d3736f40543", + "rev": "d7184a04b904e07113f4623610775ae78d32394c", "type": "github" }, "original": { @@ -705,11 +705,11 @@ "systems": "systems_3" }, "locked": { - "lastModified": 1769677259, - "narHash": "sha256-On/Ue/+X9Ikg5vti1gnOFqP1PsOjlJgrrM6HIrngiL0=", + "lastModified": 1768639397, + "narHash": "sha256-DhdY6FeC/5vBM+Q4f/m1dAdl6DmN69ZzLipD7aiUPjs=", "owner": "marienz", "repo": "nix-doom-emacs-unstraightened", - "rev": "446cdd1a7c065865f79135745d835ccc04e6197e", + "rev": "5eb4d7f1c031043a77b34c9a5c95e500f080ecaa", "type": "github" }, "original": { @@ -724,11 +724,11 @@ "nixpkgs": "nixpkgs_5" }, "locked": { - "lastModified": 1769826495, - "narHash": "sha256-jyfGSLu7TjgwaZb7wgUJnAEtcoksqG4f0LORh4JBcdM=", + "lastModified": 1768702158, + "narHash": "sha256-k9OVfn2Osw5wBvCazstlzjGY8zC82RvTlcmeGFZ5uak=", "owner": "fufexan", "repo": "nix-gaming", - "rev": "84471e0ca212961bd297a2b9017582041c903ddd", + "rev": "88f03a8a5685eca1c645372ebd1767b9b228d60c", "type": "github" }, "original": { @@ -748,11 +748,11 @@ ] }, "locked": { - "lastModified": 1769832438, - "narHash": "sha256-Z2ARPCjrrylnXnC0zZDj81e137Vtfa11v57NZl+rBEU=", + "lastModified": 1768710268, + "narHash": "sha256-45Whm5k/sNiBzGJWKJvz50Z9NQVycXmM2bb0YBzsT9U=", "owner": "nix-community", "repo": "nix4nvchad", - "rev": "c117d404536f6f35c709eed79687b615b96eb4d0", + "rev": "25267531fec57db1b3c55e6646c1ea8c9721bac6", "type": "github" }, "original": { @@ -763,11 +763,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1769302137, - "narHash": "sha256-QEDtctEkOsbx8nlFh4yqPEOtr4tif6KTqWwJ37IM2ds=", + "lastModified": 1768584846, + "narHash": "sha256-IRPmIOV2tPwxbhP/I9M5AmwhTC0lMPtoPStC+8T6xl0=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "a351494b0e35fd7c0b7a1aae82f0afddf4907aa8", + "rev": "cce68f4a54fa4e3d633358364477f5cc1d782440", "type": "github" }, "original": { @@ -779,11 +779,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1769461804, - "narHash": "sha256-msG8SU5WsBUfVVa/9RPLaymvi5bI8edTavbIq3vRlhI=", + "lastModified": 1768564909, + "narHash": "sha256-Kell/SpJYVkHWMvnhqJz/8DqQg2b6PguxVWOuadbHCc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "bfc1b8a4574108ceef22f02bafcf6611380c100d", + "rev": "e4bae1bd10c9c57b2cf517953ab70060a828ee6f", "type": "github" }, "original": { @@ -793,22 +793,6 @@ "type": "github" } }, - "nixpkgs-485356": { - "locked": { - "lastModified": 1769787892, - "narHash": "sha256-mvKmjiiNOTooYiE1vTGLJRsASPB+v1P0cyU1T56w0oI=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "c90394bd7b97bf48a653d3483c33c3ac2748489d", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "refs/pull/485356/head", - "repo": "nixpkgs", - "type": "github" - } - }, "nixpkgs-lib": { "locked": { "lastModified": 1765674936, @@ -857,11 +841,11 @@ }, "nixpkgs-stable_2": { "locked": { - "lastModified": 1769598131, - "narHash": "sha256-e7VO/kGLgRMbWtpBqdWl0uFg8Y2XWFMdz0uUJvlML8o=", + "lastModified": 1768621446, + "narHash": "sha256-6YwHV1cjv6arXdF/PQc365h1j+Qje3Pydk501Rm4Q+4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "fa83fd837f3098e3e678e6cf017b2b36102c7211", + "rev": "72ac591e737060deab2b86d6952babd1f896d7c5", "type": "github" }, "original": { @@ -905,11 +889,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1769527094, - "narHash": "sha256-xV20Alb7ZGN7qujnsi5lG1NckSUmpIb05H2Xar73TDc=", + "lastModified": 1768569498, + "narHash": "sha256-bB6Nt99Cj8Nu5nIUq0GLmpiErIT5KFshMQJGMZwgqUo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "afce96367b2e37fc29afb5543573cd49db3357b7", + "rev": "be5afa0fcb31f0a96bf9ecba05a516c66fcd8114", "type": "github" }, "original": { @@ -921,11 +905,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1769268028, - "narHash": "sha256-mAdJpV0e5IGZjnE4f/8uf0E4hQR7ptRP00gnZKUOdMo=", + "lastModified": 1768569498, + "narHash": "sha256-bB6Nt99Cj8Nu5nIUq0GLmpiErIT5KFshMQJGMZwgqUo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ab9fbbcf4858bd6d40ba2bbec37ceb4ab6e1f562", + "rev": "be5afa0fcb31f0a96bf9ecba05a516c66fcd8114", "type": "github" }, "original": { @@ -937,11 +921,11 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1769461804, - "narHash": "sha256-msG8SU5WsBUfVVa/9RPLaymvi5bI8edTavbIq3vRlhI=", + "lastModified": 1768564909, + "narHash": "sha256-Kell/SpJYVkHWMvnhqJz/8DqQg2b6PguxVWOuadbHCc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "bfc1b8a4574108ceef22f02bafcf6611380c100d", + "rev": "e4bae1bd10c9c57b2cf517953ab70060a828ee6f", "type": "github" }, "original": { @@ -953,11 +937,11 @@ }, "nixpkgs_7": { "locked": { - "lastModified": 1768875095, - "narHash": "sha256-dYP3DjiL7oIiiq3H65tGIXXIT1Waiadmv93JS0sS+8A=", + "lastModified": 1767026758, + "narHash": "sha256-7fsac/f7nh/VaKJ/qm3I338+wAJa/3J57cOGpXi0Sbg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ed142ab1b3a092c4d149245d0c4126a5d7ea00b0", + "rev": "346dd96ad74dc4457a9db9de4f4f57dab2e5731d", "type": "github" }, "original": { @@ -969,11 +953,11 @@ }, "nixpkgs_8": { "locked": { - "lastModified": 1769461804, - "narHash": "sha256-msG8SU5WsBUfVVa/9RPLaymvi5bI8edTavbIq3vRlhI=", + "lastModified": 1768564909, + "narHash": "sha256-Kell/SpJYVkHWMvnhqJz/8DqQg2b6PguxVWOuadbHCc=", "owner": "nixos", "repo": "nixpkgs", - "rev": "bfc1b8a4574108ceef22f02bafcf6611380c100d", + "rev": "e4bae1bd10c9c57b2cf517953ab70060a828ee6f", "type": "github" }, "original": { @@ -1006,11 +990,11 @@ "systems": "systems_5" }, "locked": { - "lastModified": 1769644746, - "narHash": "sha256-1X9o0GjCzku03magX4pM+1OZXA0aUTN7KvEReZ9t3OU=", + "lastModified": 1768486009, + "narHash": "sha256-I7ymDe6UQooHy9I9wrafKCCDnRbox/EMWAgJgpm7fGs=", "owner": "nix-community", "repo": "nixvim", - "rev": "3c27e1b35ca0fee6a89bfc20840654361ffe888d", + "rev": "03a638205b5cb04ba9c2ed6c604e137b15f07fa1", "type": "github" }, "original": { @@ -1026,11 +1010,11 @@ ] }, "locked": { - "lastModified": 1769831457, - "narHash": "sha256-UCHlDVBQe0QGmcra1Oq9yX4LqLGkEPV7I6XvR4eq+oc=", + "lastModified": 1768713905, + "narHash": "sha256-qbJ1JclkDhgmCPaKxFSigt0l8+Y6LUC957jLB4YiR1o=", "owner": "noctalia-dev", "repo": "noctalia-shell", - "rev": "131740dcc01af2d0372e169b060984bfe8afaa7a", + "rev": "c8f1cbb79e13ce97b50728dbf146fe25c113eb31", "type": "github" }, "original": { @@ -1045,11 +1029,11 @@ "nixpkgs": "nixpkgs_8" }, "locked": { - "lastModified": 1769834069, - "narHash": "sha256-GjeN/5TdWev/L/Izem3XScV6i/55Z+n+GfjKa1srBcU=", + "lastModified": 1768724691, + "narHash": "sha256-ly/K9UboM6PfSP3/F8/MZlv6ig0+NvZqklmST1kHRxQ=", "owner": "nix-community", "repo": "NUR", - "rev": "2db81de33100ef4d86ebc80dc4bc30df1fe97c5d", + "rev": "d1e6f67d595140006df9aff2a83e49a64932895d", "type": "github" }, "original": { @@ -1141,7 +1125,6 @@ "nix4nvchad": "nix4nvchad", "nixos-hardware": "nixos-hardware", "nixpkgs": "nixpkgs_6", - "nixpkgs-485356": "nixpkgs-485356", "nixvim": "nixvim", "noctalia": "noctalia", "nur": "nur", @@ -1202,11 +1185,11 @@ ] }, "locked": { - "lastModified": 1769469829, - "narHash": "sha256-wFcr32ZqspCxk4+FvIxIL0AZktRs6DuF8oOsLt59YBU=", + "lastModified": 1768709255, + "narHash": "sha256-aigyBfxI20FRtqajVMYXHtj5gHXENY2gLAXEhfJ8/WM=", "owner": "Mic92", "repo": "sops-nix", - "rev": "c5eebd4eb2e3372fe12a8d70a248a6ee9dd02eff", + "rev": "5e8fae80726b66e9fec023d21cd3b3e638597aa9", "type": "github" }, "original": { @@ -1254,11 +1237,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1769819994, - "narHash": "sha256-AJB2hcg1OgocLGuVdot9HyCD+Kv+a6znhY2i3XqcZYU=", + "lastModified": 1768603455, + "narHash": "sha256-ih6dYNhX1oSg0emfSAvf3iRcgsJtMmS6RUaoCX8kNoU=", "owner": "nix-community", "repo": "stylix", - "rev": "8b14679c0e1570b0e137f0f7997717be0fdf2cf2", + "rev": "590e5c68c4d5e8c766420473c0185d75113f653b", "type": "github" }, "original": { @@ -1443,11 +1426,11 @@ "nixpkgs": "nixpkgs_9" }, "locked": { - "lastModified": 1769691507, - "narHash": "sha256-8aAYwyVzSSwIhP2glDhw/G0i5+wOrren3v6WmxkVonM=", + "lastModified": 1768158989, + "narHash": "sha256-67vyT1+xClLldnumAzCTBvU0jLZ1YBcf4vANRWP3+Ak=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "28b19c5844cc6e2257801d43f2772a4b4c050a1b", + "rev": "e96d59dff5c0d7fddb9d113ba108f03c3ef99eca", "type": "github" }, "original": { @@ -1476,11 +1459,11 @@ "xwayland-satellite-unstable": { "flake": false, "locked": { - "lastModified": 1769713942, - "narHash": "sha256-0BtCSO2qzYK/akRDsERqRVLknCYD3FYErc+szreSHUo=", + "lastModified": 1768106915, + "narHash": "sha256-HlLo9zH4ULRXlmlIK948cHmdVhxyHgTHxGaoCRlW4k8=", "owner": "Supreeeme", "repo": "xwayland-satellite", - "rev": "37ec78ee26e158b71f42e113e0e7dd9d5eb6bdb0", + "rev": "72245e108f3b03c3c4474d2de9de2d1830849603", "type": "github" }, "original": { @@ -1499,11 +1482,11 @@ ] }, "locked": { - "lastModified": 1769748063, - "narHash": "sha256-H5XCtJMS3RQKHeaS+axX7CAJ0WwuTUYGy4uzLFSm0Xc=", + "lastModified": 1768711359, + "narHash": "sha256-3n2ixvAMWij1ZOh/KMJJqizX+sRU083wFR8pa6+IkyU=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "efdd1e683da9412f515b9bd42c37861978c2fd3a", + "rev": "8c9e9425946f290fa60e0e6fd7b1464cbcdbc53e", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index bfcf8a5..f11162e 100644 --- a/flake.nix +++ b/flake.nix @@ -49,12 +49,6 @@ nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; # nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable-small"; # nixpkgs.url = "github:NixOS/nixpkgs/master"; - nixpkgs-485356 = { - type = "github"; - owner = "nixos"; - repo = "nixpkgs"; - ref = "refs/pull/485356/head"; - }; lix-module = { url = "git+https://git.lix.systems/lix-project/nixos-module?ref=release-2.93"; diff --git a/nixos/configurations/Cape/default.nix b/nixos/configurations/Cape/default.nix index acfa8a1..c0c3d68 100644 --- a/nixos/configurations/Cape/default.nix +++ b/nixos/configurations/Cape/default.nix @@ -40,12 +40,6 @@ enable = true; serverName = "im.youthlic.social"; }; - rqbit = { - enable = true; - unixName = "alice"; - ratelimitUpload = 0; - httpHost = "100.76.229.45"; - }; }; }; diff --git a/nixos/configurations/Tytonidae/default.nix b/nixos/configurations/Tytonidae/default.nix index ac5fbaa..7aa3ee4 100644 --- a/nixos/configurations/Tytonidae/default.nix +++ b/nixos/configurations/Tytonidae/default.nix @@ -52,11 +52,6 @@ # emacs.enable = true; sunshine.enable = true; kdeconnect.enable = true; - rqbit = { - enable = true; - unixName = "david"; - ratelimitUpload = 10; - }; }; }; diff --git a/nixos/modules/programs/rqbit.nix b/nixos/modules/programs/rqbit.nix deleted file mode 100644 index f43160a..0000000 --- a/nixos/modules/programs/rqbit.nix +++ /dev/null @@ -1,58 +0,0 @@ -{ - pkgs, - lib, - config, - options, - ... -}: let - cfg = config.youthlic.programs.rqbit; -in { - options = { - youthlic.programs.rqbit = { - enable = lib.mkEnableOption "rqbit"; - unixName = lib.mkOption { - type = lib.types.str; - }; - ratelimitUpload = lib.mkOption { - type = lib.types.int; - description = '' - Limit upload to mega-bytes-per-second - ''; - }; - httpHost = options.services.rqbit.httpHost; - }; - }; - config = lib.mkIf cfg.enable { - services.rqbit = { - inherit (cfg) httpHost; - enable = true; - openFirewall = true; - httpPort = 9092; - }; - users.groups.rqbit.members = [cfg.unixName]; - systemd.services."rqbit" = { - serviceConfig = { - EnvironmentFile = [ - (toString - ( - pkgs.writeText - "rqbit-env.env" - ( # env - # '' - # RQBIT_TRACKERS_FILENAME=${pkgs.trackerslist}/trackers_all.txt - # '' - '' - RQBIT_TRACKERS_FILENAME=${pkgs.TrackersListCollection}/all.txt - '' - + (lib.optionalString (cfg.ratelimitUpload != 0) - # env - '' - RQBIT_RATELIMIT_UPLOAD=${toString (cfg.ratelimitUpload * 1024 * 1024)} - '') - ) - )) - ]; - }; - }; - }; -} diff --git a/overlays/additions/default.nix b/overlays/additions/default.nix index ee3c395..9004a75 100644 --- a/overlays/additions/default.nix +++ b/overlays/additions/default.nix @@ -18,5 +18,5 @@ in ] [ (map (file: import file args)) - (overlays: (composeManyExtensions overlays) final prev) + (overlays: (lib.composeManyExtensions overlays) final prev) ] diff --git a/overlays/modifications/default.nix b/overlays/modifications/default.nix index c6e342c..c8ab3bf 100644 --- a/overlays/modifications/default.nix +++ b/overlays/modifications/default.nix @@ -16,13 +16,10 @@ in ./vim.nix ./prismlauncher.nix - ./fix-ffmpeg_7-full.nix - ./fix-kdePackages.kdenlive.nix - # Nur ./nur.nix ] [ (map (file: import file args)) - (overlays: (composeManyExtensions overlays) final prev) + (overlays: (lib.composeManyExtensions overlays) final prev) ] diff --git a/overlays/modifications/fix-ffmpeg_7-full.nix b/overlays/modifications/fix-ffmpeg_7-full.nix deleted file mode 100644 index 0528464..0000000 --- a/overlays/modifications/fix-ffmpeg_7-full.nix +++ /dev/null @@ -1,14 +0,0 @@ -{inputs, ...}: _final: prev: let - inherit (prev.stdenv.hostPlatform) system; - pkgs = import inputs.nixpkgs-485356 { - localSystem = { - inherit system; - }; - config = { - allowUnfree = true; - cudaSupport = true; - }; - }; -in { - ffmpeg_7-full = pkgs.ffmpeg_7-full; -} diff --git a/overlays/modifications/fix-kdePackages.kdenlive.nix b/overlays/modifications/fix-kdePackages.kdenlive.nix deleted file mode 100644 index b742843..0000000 --- a/overlays/modifications/fix-kdePackages.kdenlive.nix +++ /dev/null @@ -1,9 +0,0 @@ -{...}: final: prev: { - kdePackages = - prev.kdePackages - // { - kdenlive = prev.kdePackages.kdenlive.override { - ffmpeg-full = final.ffmpeg_7-full; - }; - }; -}