diff --git a/_sources/generated.json b/_sources/generated.json index bb6c1a3..701d484 100644 --- a/_sources/generated.json +++ b/_sources/generated.json @@ -22,7 +22,7 @@ }, "TrackersListCollection": { "cargoLocks": null, - "date": "2025-09-17", + "date": "2025-09-16", "extract": null, "name": "TrackersListCollection", "passthru": null, @@ -34,14 +34,14 @@ "name": null, "owner": "XIU2", "repo": "TrackersListCollection", - "rev": "f7a8601fa13d0e589abd5d4fca521e49aa82bde3", - "sha256": "sha256-xVloq+IQIxy+4fjzBatcWTsUA2W7Gyx2kf6EdQVjtRA=", + "rev": "a65d194a4f0f87cc3686689ec248874f95aa8722", + "sha256": "sha256-Myad5uSCk/O21f0tF6XDuFoeww4GKnxppW5CGxSWWPc=", "sparseCheckout": [ "all.txt" ], "type": "github" }, - "version": "f7a8601fa13d0e589abd5d4fca521e49aa82bde3" + "version": "a65d194a4f0f87cc3686689ec248874f95aa8722" }, "cliphist": { "cargoLocks": null, @@ -153,7 +153,7 @@ }, "radicle-ci-broker": { "cargoLocks": null, - "date": "2025-09-17", + "date": "2025-09-16", "extract": null, "name": "radicle-ci-broker", "passthru": null, @@ -163,13 +163,13 @@ "fetchSubmodules": false, "leaveDotGit": false, "name": null, - "rev": "62f1ded7e6f5e5f5c36eca1ad4dfd8eb75e14fbb", - "sha256": "sha256-6S0zhbKV8q2sm2r86MqcMg5yFrx36erDz1bOQBz59yQ=", + "rev": "4610dcfd3a120b203906f111f39ecd84b99f7b3a", + "sha256": "sha256-fb6CgophH9cUjwTzZZnzKM342/tKjUr45YOzGLpc8vo=", "sparseCheckout": [], "type": "git", "url": "https://seed.radicle.garden/zwTxygwuz5LDGBq255RA2CbNGrz8.git" }, - "version": "62f1ded7e6f5e5f5c36eca1ad4dfd8eb75e14fbb" + "version": "4610dcfd3a120b203906f111f39ecd84b99f7b3a" }, "rime-yuhaostar": { "cargoLocks": null, diff --git a/_sources/generated.nix b/_sources/generated.nix index 95c36b0..e73042f 100644 --- a/_sources/generated.nix +++ b/_sources/generated.nix @@ -15,18 +15,18 @@ }; TrackersListCollection = { pname = "TrackersListCollection"; - version = "f7a8601fa13d0e589abd5d4fca521e49aa82bde3"; + version = "a65d194a4f0f87cc3686689ec248874f95aa8722"; src = fetchFromGitHub { owner = "XIU2"; repo = "TrackersListCollection"; - rev = "f7a8601fa13d0e589abd5d4fca521e49aa82bde3"; + rev = "a65d194a4f0f87cc3686689ec248874f95aa8722"; fetchSubmodules = false; deepClone = false; leaveDotGit = false; sparseCheckout = [ "all.txt" ]; - sha256 = "sha256-xVloq+IQIxy+4fjzBatcWTsUA2W7Gyx2kf6EdQVjtRA="; + sha256 = "sha256-Myad5uSCk/O21f0tF6XDuFoeww4GKnxppW5CGxSWWPc="; }; - date = "2025-09-17"; + date = "2025-09-16"; }; cliphist = { pname = "cliphist"; @@ -96,17 +96,17 @@ }; radicle-ci-broker = { pname = "radicle-ci-broker"; - version = "62f1ded7e6f5e5f5c36eca1ad4dfd8eb75e14fbb"; + version = "4610dcfd3a120b203906f111f39ecd84b99f7b3a"; src = fetchgit { url = "https://seed.radicle.garden/zwTxygwuz5LDGBq255RA2CbNGrz8.git"; - rev = "62f1ded7e6f5e5f5c36eca1ad4dfd8eb75e14fbb"; + rev = "4610dcfd3a120b203906f111f39ecd84b99f7b3a"; fetchSubmodules = false; deepClone = false; leaveDotGit = false; sparseCheckout = [ ]; - sha256 = "sha256-6S0zhbKV8q2sm2r86MqcMg5yFrx36erDz1bOQBz59yQ="; + sha256 = "sha256-fb6CgophH9cUjwTzZZnzKM342/tKjUr45YOzGLpc8vo="; }; - date = "2025-09-17"; + date = "2025-09-16"; }; rime-yuhaostar = { pname = "rime-yuhaostar"; diff --git a/flake.lock b/flake.lock index eb8c0b9..f05d673 100644 --- a/flake.lock +++ b/flake.lock @@ -77,11 +77,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1758531822, - "narHash": "sha256-8vyWh8RHSXuElSVLRX6o0F/lD4+IIou/CrtNmhJXUW0=", + "lastModified": 1757900773, + "narHash": "sha256-Ooahpz/YWQXvefne8Y/lWTyVz/+nDISDK59yzrnrXrI=", "owner": "HeitorAugustoLN", "repo": "betterfox-nix", - "rev": "4b7caad912abea3043429f01f3128ea1240190be", + "rev": "5b21fa1cc30abbac47f2c6b10d826f1c190cc302", "type": "github" }, "original": { @@ -90,6 +90,42 @@ "type": "github" } }, + "cachix": { + "inputs": { + "devenv": [ + "nur-ataraxiasjel", + "devenv" + ], + "flake-compat": [ + "nur-ataraxiasjel", + "devenv" + ], + "git-hooks": [ + "nur-ataraxiasjel", + "devenv", + "git-hooks" + ], + "nixpkgs": [ + "nur-ataraxiasjel", + "devenv", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1748883665, + "narHash": "sha256-R0W7uAg+BLoHjMRMQ8+oiSbTq8nkGz5RDpQ+ZfxxP3A=", + "owner": "cachix", + "repo": "cachix", + "rev": "f707778d902af4d62d8dd92c269f8e70de09acbe", + "type": "github" + }, + "original": { + "owner": "cachix", + "ref": "latest", + "repo": "cachix", + "type": "github" + } + }, "chaotic": { "inputs": { "flake-schemas": "flake-schemas", @@ -99,11 +135,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1758552416, - "narHash": "sha256-e7AusEZhXO1ma2yXU0Yrn+18b+qEtwWymZ8AgibTBqU=", + "lastModified": 1757979374, + "narHash": "sha256-1ppp2L9mZsCe8H1GzV9Ni4PnXnYz1GDQPYurbPU/pZI=", "owner": "chaotic-cx", "repo": "nyx", - "rev": "795ce3db53085b5e468b415a1a0cba19fad32c6f", + "rev": "ed13c5539660d20490d07e3898977c2f39317920", "type": "github" }, "original": { @@ -174,6 +210,40 @@ "type": "github" } }, + "devenv": { + "inputs": { + "cachix": "cachix", + "flake-compat": "flake-compat_6", + "git-hooks": "git-hooks_2", + "nix": "nix", + "nixpkgs": "nixpkgs_8" + }, + "locked": { + "lastModified": 1753154034, + "narHash": "sha256-hU/fGCFT7k3fBFauVBL6ujNbuzbyaA5RWjycDC61ggk=", + "owner": "cachix", + "repo": "devenv", + "rev": "7da0a830f7fdc719b5002d18c0bc74d5b231784d", + "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": [ @@ -181,11 +251,11 @@ ] }, "locked": { - "lastModified": 1758287904, - "narHash": "sha256-IGmaEf3Do8o5Cwp1kXBN1wQmZwQN3NLfq5t4nHtVtcU=", + "lastModified": 1757508292, + "narHash": "sha256-7lVWL5bC6xBIMWWDal41LlGAG+9u2zUorqo3QCUL4p4=", "owner": "nix-community", "repo": "disko", - "rev": "67ff9807dd148e704baadbd4fd783b54282ca627", + "rev": "146f45bee02b8bd88812cfce6ffc0f933788875a", "type": "github" }, "original": { @@ -197,11 +267,11 @@ "doomemacs": { "flake": false, "locked": { - "lastModified": 1758509259, - "narHash": "sha256-xwa4MdI/5wGpBLNJuxF61ccj9kyD3HKUs1282LTZRVk=", + "lastModified": 1757976811, + "narHash": "sha256-kZx3fwrRatN+yRT4qvG2ehMOqvtClnv2M2fzrlRRDiI=", "owner": "doomemacs", "repo": "doomemacs", - "rev": "fb9b359dbe96809b741d347236f3dde399d27059", + "rev": "e10477d6d1f1cd8c9369daad6b74f7d2e6e9fad9", "type": "github" }, "original": { @@ -220,11 +290,11 @@ ] }, "locked": { - "lastModified": 1758504501, - "narHash": "sha256-xg8fVogl3HivVNJufmq/9RZFoIou36rDBWCji1GH34I=", + "lastModified": 1758011393, + "narHash": "sha256-yHrsbwmRIK6gJN71ilHzHPCPZqJ2fpyBmx0ViNkxWqU=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "e88a8c1edf089b1a31378cf48f7ca3854950dc2a", + "rev": "42b14295a6c6d45a9cc6a24a4a9d82ec59547955", "type": "github" }, "original": { @@ -329,6 +399,22 @@ "type": "github" } }, + "flake-compat_6": { + "flake": false, + "locked": { + "lastModified": 1747046372, + "narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, "flake-parts": { "inputs": { "nixpkgs-lib": [ @@ -473,6 +559,47 @@ "type": "github" } }, + "flake-parts_8": { + "inputs": { + "nixpkgs-lib": [ + "nur-ataraxiasjel", + "devenv", + "nix", + "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_9": { + "inputs": { + "nixpkgs-lib": "nixpkgs-lib_2" + }, + "locked": { + "lastModified": 1753121425, + "narHash": "sha256-TVcTNvOeWWk1DXljFxVRp+E0tzG1LhrVjOGGoMHuXio=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "644e0fc48951a860279da645ba77fe4a6e814c5e", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, "flake-schemas": { "locked": { "lastModified": 1721999734, @@ -564,11 +691,39 @@ ] }, "locked": { - "lastModified": 1758108966, - "narHash": "sha256-ytw7ROXaWZ7OfwHrQ9xvjpUWeGVm86pwnEd1QhzawIo=", + "lastModified": 1757974173, + "narHash": "sha256-4DpXmct/2rcLgScT1CXOLr0TUeIlrBB1rnFqCOf5MUw=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "54df955a695a84cd47d4a43e08e1feaf90b1fd9b", + "rev": "302af509428169db34f268324162712d10559f74", + "type": "github" + }, + "original": { + "owner": "cachix", + "repo": "git-hooks.nix", + "type": "github" + } + }, + "git-hooks_2": { + "inputs": { + "flake-compat": [ + "nur-ataraxiasjel", + "devenv", + "flake-compat" + ], + "gitignore": "gitignore_3", + "nixpkgs": [ + "nur-ataraxiasjel", + "devenv", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1750779888, + "narHash": "sha256-wibppH3g/E2lxU43ZQHC5yA/7kIKLGxVEnsnVK1BtRg=", + "owner": "cachix", + "repo": "git-hooks.nix", + "rev": "16ec914f6fb6f599ce988427d9d94efddf25fe6d", "type": "github" }, "original": { @@ -621,6 +776,29 @@ "type": "github" } }, + "gitignore_3": { + "inputs": { + "nixpkgs": [ + "nur-ataraxiasjel", + "devenv", + "git-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" + } + }, "gnome-shell": { "flake": false, "locked": { @@ -646,11 +824,11 @@ "rust-overlay": "rust-overlay_2" }, "locked": { - "lastModified": 1758548657, - "narHash": "sha256-Y4PRLA9vpgR6olcHrcdQcPjZ2ukb4L3xnS5xJLS+ugU=", + "lastModified": 1757982959, + "narHash": "sha256-b2a0ikawsIBcqwM05mv4tjsn0YfptAEcdEcTNhOD8Pk=", "owner": "helix-editor", "repo": "helix", - "rev": "37fe42d05d4d65e0c8112a10cc40cfbdc95e8a3c", + "rev": "c0921202a0a9f9e3003a845824d3365e2f08467f", "type": "github" }, "original": { @@ -669,11 +847,11 @@ ] }, "locked": { - "lastModified": 1758022363, - "narHash": "sha256-ENUhCRWgSX4ni751HieNuQoq06dJvApV/Nm89kh+/A0=", + "lastModified": 1755233722, + "narHash": "sha256-AavrbMltJKcC2Fx0lfJoZfmy7g87ebXU0ddVenhajLA=", "owner": "hercules-ci", "repo": "hercules-ci-effects", - "rev": "1a3667d33e247ad35ca250698d63f49a5453d824", + "rev": "99e03e72e3f7e13506f80ef9ebaedccb929d84d0", "type": "github" }, "original": { @@ -690,11 +868,11 @@ ] }, "locked": { - "lastModified": 1758464306, - "narHash": "sha256-i56XRXqjwJRdVYmpzVUQ0ktqBBHqNzQHQMQvFRF/acQ=", + "lastModified": 1757920978, + "narHash": "sha256-Mv16aegXLulgyDunijP6SPFJNm8lSXb2w3Q0X+vZ9TY=", "owner": "nix-community", "repo": "home-manager", - "rev": "939e91e1cff1f99736c5b02529658218ed819a2a", + "rev": "11cc5449c50e0e5b785be3dfcb88245232633eb8", "type": "github" }, "original": { @@ -710,11 +888,11 @@ ] }, "locked": { - "lastModified": 1758545873, - "narHash": "sha256-0VP5cVd6DyibHNPC/IJ5Ut+KuNYUeKmr5ltzf+IcpjA=", + "lastModified": 1757997814, + "narHash": "sha256-F+1aoG+3NH4jDDEmhnDUReISyq6kQBBuktTUqCUWSiw=", "owner": "nix-community", "repo": "home-manager", - "rev": "de5369834ff1f75246c46be89ef993392e961c26", + "rev": "5820376beb804de9acf07debaaff1ac84728b708", "type": "github" }, "original": { @@ -862,11 +1040,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1758499570, - "narHash": "sha256-d2tUVZ7/Lna6w5mk90g3NLgF7Cc+Ts8MttGX83ol9KQ=", + "lastModified": 1757981100, + "narHash": "sha256-7fIHUJoYYVELlSRl4okgq3vhjakqJMtmWLUwCdbrk60=", "owner": "nix-community", "repo": "neovim-nightly-overlay", - "rev": "8b7e0b6092af1aeba5ac3ceebc0d975522958235", + "rev": "b5a3252fd1e3b878271dfe957e8c34dc8791f112", "type": "github" }, "original": { @@ -878,11 +1056,11 @@ "neovim-src": { "flake": false, "locked": { - "lastModified": 1758497400, - "narHash": "sha256-ls4yWlhKmZHBB5RvHcPvE6qds5r4GYQd9ckeHm7ZHLQ=", + "lastModified": 1757979081, + "narHash": "sha256-qk0ZyuDE9+CxlKAaJOP0iG/Itj9I/AQgkpQ2o8GjHmA=", "owner": "neovim", "repo": "neovim", - "rev": "e887602eb5451bde2fe3241b2408c0ae7816ca3c", + "rev": "ddcfa8bb4a98402c76c2996c6248c699095c05e6", "type": "github" }, "original": { @@ -903,11 +1081,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1758557018, - "narHash": "sha256-1Y60RW6jomYPnghYRqBq5aFEF/L2ZOCHBFd7zKy/wIw=", + "lastModified": 1758006511, + "narHash": "sha256-YmZX6Wydog4Q9p7dRZDFOFkUfCtQfoXRobmJdg3F1dg=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "f3a529b7e7927012aa0f4ffc5487af761e6eb5b5", + "rev": "0be585b11314ac02804b4fe03196116c4f747d6d", "type": "github" }, "original": { @@ -936,11 +1114,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1758552132, - "narHash": "sha256-GYcO5NbOY5vfY3iygWjOaZy+nYzemP0kacJ5z5E3P3Y=", + "lastModified": 1758000903, + "narHash": "sha256-FyfB40rl2mbRGIvF2/6Iwv9xHDxOmhaE1MhlV6Efsg4=", "owner": "YaLTeR", "repo": "niri", - "rev": "4d4d968d97ebe633d8910ec65908e1ea75fc2b6d", + "rev": "c30e5c91851d77d48ff2120f0e710501b19d61b4", "type": "github" }, "original": { @@ -949,6 +1127,48 @@ "type": "github" } }, + "nix": { + "inputs": { + "flake-compat": [ + "nur-ataraxiasjel", + "devenv", + "flake-compat" + ], + "flake-parts": "flake-parts_8", + "git-hooks-nix": [ + "nur-ataraxiasjel", + "devenv", + "git-hooks" + ], + "nixpkgs": [ + "nur-ataraxiasjel", + "devenv", + "nixpkgs" + ], + "nixpkgs-23-11": [ + "nur-ataraxiasjel", + "devenv" + ], + "nixpkgs-regression": [ + "nur-ataraxiasjel", + "devenv" + ] + }, + "locked": { + "lastModified": 1752773918, + "narHash": "sha256-dOi/M6yNeuJlj88exI+7k154z+hAhFcuB8tZktiW7rg=", + "owner": "cachix", + "repo": "nix", + "rev": "031c3cf42d2e9391eee373507d8c12e0f9606779", + "type": "github" + }, + "original": { + "owner": "cachix", + "ref": "devenv-2.30", + "repo": "nix", + "type": "github" + } + }, "nix-doom": { "inputs": { "doomemacs": "doomemacs", @@ -959,11 +1179,11 @@ "systems": "systems_3" }, "locked": { - "lastModified": 1758542136, - "narHash": "sha256-8r6qZgxuAFJrlfiTpuQJl/cpydP3YTU8jIpE/2IXZuw=", + "lastModified": 1758012118, + "narHash": "sha256-ecJ1Wvbww/DYv4ofaD2mP/FaX5Oe82fGiLNenc+m+JA=", "owner": "marienz", "repo": "nix-doom-emacs-unstraightened", - "rev": "1e3f4e31f6c8d9852c9aaa6064add4265df848c6", + "rev": "90923049fc948b80d9f8ff587812338c226f7943", "type": "github" }, "original": { @@ -1034,11 +1254,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1758479131, - "narHash": "sha256-KTCOYqnEUYSdk+DychTkXkOqgxYO2mLp9AzAw5mwAxA=", + "lastModified": 1757979022, + "narHash": "sha256-fKqsvznISxVSBo6aaiGGXMRiBG4IIuV3sSySxx80pcQ=", "owner": "PedroHLC", "repo": "nixpkgs", - "rev": "94700b18eb20d3ec71e3f6cd32e30d03648664ba", + "rev": "93c5fdb7576f6b25476035aa95b8e54c867eca09", "type": "github" }, "original": { @@ -1063,6 +1283,21 @@ "type": "github" } }, + "nixpkgs-lib_2": { + "locked": { + "lastModified": 1751159883, + "narHash": "sha256-urW/Ylk9FIfvXfliA1ywh75yszAbiTEVgpPeinFyVZo=", + "owner": "nix-community", + "repo": "nixpkgs.lib", + "rev": "14a40a1d7fb9afa4739275ac642ed7301a9ba1ab", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "nixpkgs.lib", + "type": "github" + } + }, "nixpkgs-stable": { "locked": { "lastModified": 1730741070, @@ -1081,11 +1316,11 @@ }, "nixpkgs-stable_2": { "locked": { - "lastModified": 1758346548, - "narHash": "sha256-afXE7AJ7MY6wY1pg/Y6UPHNYPy5GtUKeBkrZZ/gC71E=", + "lastModified": 1757810152, + "narHash": "sha256-Vp9K5ol6h0J90jG7Rm4RWZsCB3x7v5VPx588TQ1dkfs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b2a3852bd078e68dd2b3dfa8c00c67af1f0a7d20", + "rev": "9a094440e02a699be5c57453a092a8baf569bdad", "type": "github" }, "original": { @@ -1111,6 +1346,22 @@ "type": "github" } }, + "nixpkgs_10": { + "locked": { + "lastModified": 1754340878, + "narHash": "sha256-lgmUyVQL9tSnvvIvBp7x1euhkkCho7n3TMzgjdvgPoU=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "cab778239e705082fe97bb4990e0d24c50924c04", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "nixpkgs_2": { "locked": { "lastModified": 1731919951, @@ -1129,11 +1380,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1758446476, - "narHash": "sha256-5rdAi7CTvM/kSs6fHe1bREIva5W3TbImsto+dxG4mBo=", + "lastModified": 1757873102, + "narHash": "sha256-kYhNxLlYyJcUouNRazBufVfBInMWMyF+44xG/xar2yE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a1f79a1770d05af18111fbbe2a3ab2c42c0f6cd0", + "rev": "88cef159e47c0dc56f151593e044453a39a6e547", "type": "github" }, "original": { @@ -1161,11 +1412,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1758277210, - "narHash": "sha256-iCGWf/LTy+aY0zFu8q12lK8KuZp7yvdhStehhyX1v8w=", + "lastModified": 1757745802, + "narHash": "sha256-hLEO2TPj55KcUFUU1vgtHE9UEIOjRcH/4QbmfHNF820=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "8eaee110344796db060382e15d3af0a9fc396e0e", + "rev": "c23193b943c6c689d70ee98ce3128239ed9e32d1", "type": "github" }, "original": { @@ -1177,11 +1428,11 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1758446476, - "narHash": "sha256-5rdAi7CTvM/kSs6fHe1bREIva5W3TbImsto+dxG4mBo=", + "lastModified": 1757746433, + "narHash": "sha256-fEvTiU4s9lWgW7mYEU/1QUPirgkn+odUBTaindgiziY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a1f79a1770d05af18111fbbe2a3ab2c42c0f6cd0", + "rev": "6d7ec06d6868ac6d94c371458fc2391ded9ff13d", "type": "github" }, "original": { @@ -1193,11 +1444,11 @@ }, "nixpkgs_7": { "locked": { - "lastModified": 1758277210, - "narHash": "sha256-iCGWf/LTy+aY0zFu8q12lK8KuZp7yvdhStehhyX1v8w=", + "lastModified": 1757745802, + "narHash": "sha256-hLEO2TPj55KcUFUU1vgtHE9UEIOjRcH/4QbmfHNF820=", "owner": "nixos", "repo": "nixpkgs", - "rev": "8eaee110344796db060382e15d3af0a9fc396e0e", + "rev": "c23193b943c6c689d70ee98ce3128239ed9e32d1", "type": "github" }, "original": { @@ -1209,16 +1460,32 @@ }, "nixpkgs_8": { "locked": { - "lastModified": 1754340878, - "narHash": "sha256-lgmUyVQL9tSnvvIvBp7x1euhkkCho7n3TMzgjdvgPoU=", + "lastModified": 1750441195, + "narHash": "sha256-yke+pm+MdgRb6c0dPt8MgDhv7fcBbdjmv1ZceNTyzKg=", + "owner": "cachix", + "repo": "devenv-nixpkgs", + "rev": "0ceffe312871b443929ff3006960d29b120dc627", + "type": "github" + }, + "original": { + "owner": "cachix", + "ref": "rolling", + "repo": "devenv-nixpkgs", + "type": "github" + } + }, + "nixpkgs_9": { + "locked": { + "lastModified": 1752950548, + "narHash": "sha256-NS6BLD0lxOrnCiEOcvQCDVPXafX1/ek1dfJHX1nUIzc=", "owner": "nixos", "repo": "nixpkgs", - "rev": "cab778239e705082fe97bb4990e0d24c50924c04", + "rev": "c87b95e25065c028d31a94f06a62927d18763fdf", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixpkgs-unstable", + "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" } @@ -1231,11 +1498,11 @@ "systems": "systems_5" }, "locked": { - "lastModified": 1758551108, - "narHash": "sha256-3KArqJcnrcEr1M3QsBG7NZRQSxVNFI3In+9MHdVmUKY=", + "lastModified": 1757864383, + "narHash": "sha256-oMoFAEC8A8BGBHIYiUNsgsVhEyNwTbn066J68LtbelY=", "owner": "nix-community", "repo": "nixvim", - "rev": "f828dead7723e7680b09929b9886225389d0370b", + "rev": "db1a991f33fb43cf0e2a4aff54a8c53b4dc12128", "type": "github" }, "original": { @@ -1250,11 +1517,11 @@ "nixpkgs": "nixpkgs_7" }, "locked": { - "lastModified": 1758564296, - "narHash": "sha256-hi0PlFm1gdeeTXDz9sIYZYKJWcPbRD9ar83q26YdU9I=", + "lastModified": 1758018355, + "narHash": "sha256-35cUmHz97F0DpWwKuNTyWNlYnNoR0N1Ax4rnQrpJAJA=", "owner": "nix-community", "repo": "NUR", - "rev": "2c8121b44ea0f2b8917340d22e7f9098e1d09029", + "rev": "a3edb9f5c3f966b66d77524339d3cf916de9e767", "type": "github" }, "original": { @@ -1263,6 +1530,27 @@ "type": "github" } }, + "nur-ataraxiasjel": { + "inputs": { + "devenv": "devenv", + "devenv-root": "devenv-root", + "flake-parts": "flake-parts_9", + "nixpkgs": "nixpkgs_9" + }, + "locked": { + "lastModified": 1755533381, + "narHash": "sha256-iuQla7oiZjKPm18vnqtyDIA8kHEftzmIBPKTCxyLEwU=", + "owner": "AtaraxiaSjel", + "repo": "nur", + "rev": "dfbf4ae08522dfe57c6e9e628c869960171cb642", + "type": "github" + }, + "original": { + "owner": "AtaraxiaSjel", + "repo": "nur", + "type": "github" + } + }, "nur_2": { "inputs": { "flake-parts": [ @@ -1298,11 +1586,11 @@ ] }, "locked": { - "lastModified": 1758272005, - "narHash": "sha256-1u3xTH+3kaHhztPmWtLAD8LF5pTYLR2CpsPFWTFnVtQ=", + "lastModified": 1757624466, + "narHash": "sha256-25ExS2AkQD05Jf0Y2Wnn5KHpucN2d3ObEQOVaDh7ubg=", "owner": "NuschtOS", "repo": "search", - "rev": "aa975a3757f28ce862812466c5848787b868e116", + "rev": "da8bcb74407e41d334fc79081fdd8948b795bd6f", "type": "github" }, "original": { @@ -1359,6 +1647,7 @@ "nixpkgs": "nixpkgs_5", "nixvim": "nixvim", "nur": "nur", + "nur-ataraxiasjel": "nur-ataraxiasjel", "sops-nix": "sops-nix", "stylix": "stylix", "treefmt-nix": "treefmt-nix_2" @@ -1372,11 +1661,11 @@ ] }, "locked": { - "lastModified": 1758422215, - "narHash": "sha256-JvF5SXhp1wBHbfEVAWgJCDVSO8iknfDqXfqMch5YWg0=", + "lastModified": 1757930296, + "narHash": "sha256-Z9u5VszKs8rfEvg2AsFucWEjl7wMtAln9l1b78cfBh4=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "6f3988eb5885f1e2efa874a480d91de09a7f9f0b", + "rev": "09442765a05c2ca617c20ed68d9613da92a2d96b", "type": "github" }, "original": { @@ -1455,11 +1744,11 @@ ] }, "locked": { - "lastModified": 1758425756, - "narHash": "sha256-L3N8zV6wsViXiD8i3WFyrvjDdz76g3tXKEdZ4FkgQ+Y=", + "lastModified": 1758007585, + "narHash": "sha256-HYnwlbY6RE5xVd5rh0bYw77pnD8lOgbT4mlrfjgNZ0c=", "owner": "Mic92", "repo": "sops-nix", - "rev": "e0fdaea3c31646e252a60b42d0ed8eafdb289762", + "rev": "f77d4cfa075c3de66fc9976b80e0c4fc69e2c139", "type": "github" }, "original": { @@ -1683,11 +1972,11 @@ ] }, "locked": { - "lastModified": 1758206697, - "narHash": "sha256-/DbPkh6PZOgfueCbs3uzlk4ASU2nPPsiVWhpMCNkAd0=", + "lastModified": 1756662192, + "narHash": "sha256-F1oFfV51AE259I85av+MAia221XwMHCOtZCMcZLK2Jk=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "128222dc911b8e2e18939537bed1762b7f3a04aa", + "rev": "1aabc6c05ccbcbf4a635fb7a90400e44282f61c4", "type": "github" }, "original": { @@ -1698,14 +1987,14 @@ }, "treefmt-nix_2": { "inputs": { - "nixpkgs": "nixpkgs_8" + "nixpkgs": "nixpkgs_10" }, "locked": { - "lastModified": 1758206697, - "narHash": "sha256-/DbPkh6PZOgfueCbs3uzlk4ASU2nPPsiVWhpMCNkAd0=", + "lastModified": 1756662192, + "narHash": "sha256-F1oFfV51AE259I85av+MAia221XwMHCOtZCMcZLK2Jk=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "128222dc911b8e2e18939537bed1762b7f3a04aa", + "rev": "1aabc6c05ccbcbf4a635fb7a90400e44282f61c4", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 0b062a4..4ffcc2b 100644 --- a/flake.nix +++ b/flake.nix @@ -191,6 +191,11 @@ owner = "nix-community"; repo = "NUR"; }; + nur-ataraxiasjel = { + type = "github"; + owner = "AtaraxiaSjel"; + repo = "nur"; + }; nixvim = { type = "github"; diff --git a/home/alice/configurations/Cape/default.nix b/home/alice/configurations/Cape/default.nix index 2ee2fb9..bc5b0a0 100644 --- a/home/alice/configurations/Cape/default.nix +++ b/home/alice/configurations/Cape/default.nix @@ -47,26 +47,14 @@ ]; programs.ssh = { enable = true; + hashKnownHosts = true; extraOptionOverrides = { HostKeyAlgorithms = "ssh-ed25519-cert-v01@openssh.com,ssh-rsa-cert-v01@openssh.com,ssh-ed25519,ssh-rsa,ecdsa-sha2-nistp521-cert-v01@openssh.com,ecdsa-sha2-nistp384-cert-v01@openssh.com,ecdsa-sha2-nistp256-cert-v01@openssh.com,ecdsa-sha2-nistp521,ecdsa-sha2-nistp384,ecdsa-sha2-nistp256"; KexAlgorithms = "curve25519-sha256@libssh.org,ecdh-sha2-nistp521,ecdh-sha2-nistp384,ecdh-sha2-nistp256,diffie-hellman-group-exchange-sha256"; MACs = "hmac-sha2-512-etm@openssh.com,hmac-sha2-256-etm@openssh.com,umac-128-etm@openssh.com,hmac-sha2-512,hmac-sha2-256,umac-128@openssh.com"; Ciphers = "chacha20-poly1305@openssh.com,aes256-gcm@openssh.com,aes128-gcm@openssh.com,aes256-ctr,aes192-ctr,aes128-ctr"; }; - enableDefaultConfig = false; matchBlocks = { - "*" = { - forwardAgent = false; - addKeysToAgent = "no"; - compression = false; - serverAliveInterval = 0; - serverAliveCountMax = 3; - hashKnownHosts = false; - userKnownHostsFile = "~/.ssh/known_hosts"; - controlMaster = "no"; - controlPath = "~/.ssh/master-%r@%n:%p"; - controlPersist = "no"; - }; "github.com" = { hostname = "ssh.github.com"; port = 443; diff --git a/home/david/configurations/Tytonidae/default.nix b/home/david/configurations/Tytonidae/default.nix index de7cf2b..84a1866 100644 --- a/home/david/configurations/Tytonidae/default.nix +++ b/home/david/configurations/Tytonidae/default.nix @@ -48,6 +48,7 @@ accounts.email.enable = true; programs = { chromium.enable = true; + espanso.enable = true; thunderbird.enable = true; foot.enable = false; mpv.enable = true; diff --git a/home/modules/programs/fish.nix b/home/modules/programs/fish.nix index ccd6be3..87a2ea5 100644 --- a/home/modules/programs/fish.nix +++ b/home/modules/programs/fish.nix @@ -1,7 +1,6 @@ { config, lib, - pkgs, ... }: let @@ -21,17 +20,6 @@ in interactiveShellInit = '' fish_vi_key_bindings ''; - plugins = [ - { - name = with pkgs.fishPlugins.foreign-env; pname + "-" + version; - src = pkgs.fishPlugins.foreign-env.overrideAttrs { - postInstall = # bash - '' - ln -s $out/share/fish/vendor_functions.d $out/functions - ''; - }; - } - ]; functions = { __fish_command_not_found_handler = { body = "__fish_default_command_not_found_handler $argv[1]"; @@ -43,18 +31,6 @@ in ''; }; }; - shellInitLast = # fish - '' - if test -d ~/.guix-profile - set -gx GUIX_PROFILE ~/.guix-profile - if test -f $GUIX_PROFILE/etc/profile - fenv source $GUIX_PROFILE/etc/profile - end - if test -d $GUIX_PROFILE/lib/locale - set -gx GUIX_LOCPATH $GUIX_PROFILE/lib/locale - end - end - ''; }; fastfetch.enable = true; }; diff --git a/nixos/configurations/Tytonidae/default.nix b/nixos/configurations/Tytonidae/default.nix index 4332e69..00e7061 100644 --- a/nixos/configurations/Tytonidae/default.nix +++ b/nixos/configurations/Tytonidae/default.nix @@ -34,6 +34,7 @@ enable = true; unixName = "david"; }; + waydroid.enable = true; }; programs = { bash.enable = true; diff --git a/nixos/configurations/Tytonidae/networking.nix b/nixos/configurations/Tytonidae/networking.nix index 56bd1ed..ca79ad8 100644 --- a/nixos/configurations/Tytonidae/networking.nix +++ b/nixos/configurations/Tytonidae/networking.nix @@ -28,7 +28,7 @@ Name = "bond0"; }; bondConfig = { - Mode = "balance-rr"; + Mode = "active-backup"; MIIMonitorSec = "1s"; PrimaryReselectPolicy = "better"; }; diff --git a/overlays/additions/default.nix b/overlays/additions/default.nix index d1f5660..a23b24d 100644 --- a/overlays/additions/default.nix +++ b/overlays/additions/default.nix @@ -9,6 +9,7 @@ in ./editor-runtime.nix ./radicle-ci-broker.nix ./wallpapers.nix + ./waydroid-script.nix ./rime-yuhaostar.nix ./nixvim.nix diff --git a/overlays/modifications/default.nix b/overlays/modifications/default.nix index ac8320f..4e5b46e 100644 --- a/overlays/modifications/default.nix +++ b/overlays/modifications/default.nix @@ -19,6 +19,7 @@ in # 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..2e9181d --- /dev/null +++ b/overlays/modifications/nur-ataraxiasejel.nix @@ -0,0 +1,14 @@ +{ inputs, ... }: +_final: prev: +let + inherit (prev.stdenv.hostPlatform) system; +in +{ + nur = prev.nur // { + repos = prev.nur.repos // { + ataraxiasjel = prev.nur.repos.ataraxiasjel // { + inherit (inputs.nur-ataraxiasjel.packages.${system}) waydroid-script; + }; + }; + }; +}