Compare commits

...

6 commits

12 changed files with 143 additions and 419 deletions

View file

@ -22,7 +22,7 @@
}, },
"TrackersListCollection": { "TrackersListCollection": {
"cargoLocks": null, "cargoLocks": null,
"date": "2025-09-16", "date": "2025-09-17",
"extract": null, "extract": null,
"name": "TrackersListCollection", "name": "TrackersListCollection",
"passthru": null, "passthru": null,
@ -34,14 +34,14 @@
"name": null, "name": null,
"owner": "XIU2", "owner": "XIU2",
"repo": "TrackersListCollection", "repo": "TrackersListCollection",
"rev": "a65d194a4f0f87cc3686689ec248874f95aa8722", "rev": "f7a8601fa13d0e589abd5d4fca521e49aa82bde3",
"sha256": "sha256-Myad5uSCk/O21f0tF6XDuFoeww4GKnxppW5CGxSWWPc=", "sha256": "sha256-xVloq+IQIxy+4fjzBatcWTsUA2W7Gyx2kf6EdQVjtRA=",
"sparseCheckout": [ "sparseCheckout": [
"all.txt" "all.txt"
], ],
"type": "github" "type": "github"
}, },
"version": "a65d194a4f0f87cc3686689ec248874f95aa8722" "version": "f7a8601fa13d0e589abd5d4fca521e49aa82bde3"
}, },
"cliphist": { "cliphist": {
"cargoLocks": null, "cargoLocks": null,
@ -153,7 +153,7 @@
}, },
"radicle-ci-broker": { "radicle-ci-broker": {
"cargoLocks": null, "cargoLocks": null,
"date": "2025-09-16", "date": "2025-09-17",
"extract": null, "extract": null,
"name": "radicle-ci-broker", "name": "radicle-ci-broker",
"passthru": null, "passthru": null,
@ -163,13 +163,13 @@
"fetchSubmodules": false, "fetchSubmodules": false,
"leaveDotGit": false, "leaveDotGit": false,
"name": null, "name": null,
"rev": "4610dcfd3a120b203906f111f39ecd84b99f7b3a", "rev": "62f1ded7e6f5e5f5c36eca1ad4dfd8eb75e14fbb",
"sha256": "sha256-fb6CgophH9cUjwTzZZnzKM342/tKjUr45YOzGLpc8vo=", "sha256": "sha256-6S0zhbKV8q2sm2r86MqcMg5yFrx36erDz1bOQBz59yQ=",
"sparseCheckout": [], "sparseCheckout": [],
"type": "git", "type": "git",
"url": "https://seed.radicle.garden/zwTxygwuz5LDGBq255RA2CbNGrz8.git" "url": "https://seed.radicle.garden/zwTxygwuz5LDGBq255RA2CbNGrz8.git"
}, },
"version": "4610dcfd3a120b203906f111f39ecd84b99f7b3a" "version": "62f1ded7e6f5e5f5c36eca1ad4dfd8eb75e14fbb"
}, },
"rime-yuhaostar": { "rime-yuhaostar": {
"cargoLocks": null, "cargoLocks": null,

View file

@ -15,18 +15,18 @@
}; };
TrackersListCollection = { TrackersListCollection = {
pname = "TrackersListCollection"; pname = "TrackersListCollection";
version = "a65d194a4f0f87cc3686689ec248874f95aa8722"; version = "f7a8601fa13d0e589abd5d4fca521e49aa82bde3";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "XIU2"; owner = "XIU2";
repo = "TrackersListCollection"; repo = "TrackersListCollection";
rev = "a65d194a4f0f87cc3686689ec248874f95aa8722"; rev = "f7a8601fa13d0e589abd5d4fca521e49aa82bde3";
fetchSubmodules = false; fetchSubmodules = false;
deepClone = false; deepClone = false;
leaveDotGit = false; leaveDotGit = false;
sparseCheckout = [ "all.txt" ]; sparseCheckout = [ "all.txt" ];
sha256 = "sha256-Myad5uSCk/O21f0tF6XDuFoeww4GKnxppW5CGxSWWPc="; sha256 = "sha256-xVloq+IQIxy+4fjzBatcWTsUA2W7Gyx2kf6EdQVjtRA=";
}; };
date = "2025-09-16"; date = "2025-09-17";
}; };
cliphist = { cliphist = {
pname = "cliphist"; pname = "cliphist";
@ -96,17 +96,17 @@
}; };
radicle-ci-broker = { radicle-ci-broker = {
pname = "radicle-ci-broker"; pname = "radicle-ci-broker";
version = "4610dcfd3a120b203906f111f39ecd84b99f7b3a"; version = "62f1ded7e6f5e5f5c36eca1ad4dfd8eb75e14fbb";
src = fetchgit { src = fetchgit {
url = "https://seed.radicle.garden/zwTxygwuz5LDGBq255RA2CbNGrz8.git"; url = "https://seed.radicle.garden/zwTxygwuz5LDGBq255RA2CbNGrz8.git";
rev = "4610dcfd3a120b203906f111f39ecd84b99f7b3a"; rev = "62f1ded7e6f5e5f5c36eca1ad4dfd8eb75e14fbb";
fetchSubmodules = false; fetchSubmodules = false;
deepClone = false; deepClone = false;
leaveDotGit = false; leaveDotGit = false;
sparseCheckout = [ ]; sparseCheckout = [ ];
sha256 = "sha256-fb6CgophH9cUjwTzZZnzKM342/tKjUr45YOzGLpc8vo="; sha256 = "sha256-6S0zhbKV8q2sm2r86MqcMg5yFrx36erDz1bOQBz59yQ=";
}; };
date = "2025-09-16"; date = "2025-09-17";
}; };
rime-yuhaostar = { rime-yuhaostar = {
pname = "rime-yuhaostar"; pname = "rime-yuhaostar";

467
flake.lock generated
View file

@ -77,11 +77,11 @@
"systems": "systems" "systems": "systems"
}, },
"locked": { "locked": {
"lastModified": 1757900773, "lastModified": 1758531822,
"narHash": "sha256-Ooahpz/YWQXvefne8Y/lWTyVz/+nDISDK59yzrnrXrI=", "narHash": "sha256-8vyWh8RHSXuElSVLRX6o0F/lD4+IIou/CrtNmhJXUW0=",
"owner": "HeitorAugustoLN", "owner": "HeitorAugustoLN",
"repo": "betterfox-nix", "repo": "betterfox-nix",
"rev": "5b21fa1cc30abbac47f2c6b10d826f1c190cc302", "rev": "4b7caad912abea3043429f01f3128ea1240190be",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -90,42 +90,6 @@
"type": "github" "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": { "chaotic": {
"inputs": { "inputs": {
"flake-schemas": "flake-schemas", "flake-schemas": "flake-schemas",
@ -135,11 +99,11 @@
"rust-overlay": "rust-overlay" "rust-overlay": "rust-overlay"
}, },
"locked": { "locked": {
"lastModified": 1757979374, "lastModified": 1758552416,
"narHash": "sha256-1ppp2L9mZsCe8H1GzV9Ni4PnXnYz1GDQPYurbPU/pZI=", "narHash": "sha256-e7AusEZhXO1ma2yXU0Yrn+18b+qEtwWymZ8AgibTBqU=",
"owner": "chaotic-cx", "owner": "chaotic-cx",
"repo": "nyx", "repo": "nyx",
"rev": "ed13c5539660d20490d07e3898977c2f39317920", "rev": "795ce3db53085b5e468b415a1a0cba19fad32c6f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -210,40 +174,6 @@
"type": "github" "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": { "disko": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
@ -251,11 +181,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1757508292, "lastModified": 1758287904,
"narHash": "sha256-7lVWL5bC6xBIMWWDal41LlGAG+9u2zUorqo3QCUL4p4=", "narHash": "sha256-IGmaEf3Do8o5Cwp1kXBN1wQmZwQN3NLfq5t4nHtVtcU=",
"owner": "nix-community", "owner": "nix-community",
"repo": "disko", "repo": "disko",
"rev": "146f45bee02b8bd88812cfce6ffc0f933788875a", "rev": "67ff9807dd148e704baadbd4fd783b54282ca627",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -267,11 +197,11 @@
"doomemacs": { "doomemacs": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1757976811, "lastModified": 1758509259,
"narHash": "sha256-kZx3fwrRatN+yRT4qvG2ehMOqvtClnv2M2fzrlRRDiI=", "narHash": "sha256-xwa4MdI/5wGpBLNJuxF61ccj9kyD3HKUs1282LTZRVk=",
"owner": "doomemacs", "owner": "doomemacs",
"repo": "doomemacs", "repo": "doomemacs",
"rev": "e10477d6d1f1cd8c9369daad6b74f7d2e6e9fad9", "rev": "fb9b359dbe96809b741d347236f3dde399d27059",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -290,11 +220,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1758011393, "lastModified": 1758504501,
"narHash": "sha256-yHrsbwmRIK6gJN71ilHzHPCPZqJ2fpyBmx0ViNkxWqU=", "narHash": "sha256-xg8fVogl3HivVNJufmq/9RZFoIou36rDBWCji1GH34I=",
"owner": "nix-community", "owner": "nix-community",
"repo": "emacs-overlay", "repo": "emacs-overlay",
"rev": "42b14295a6c6d45a9cc6a24a4a9d82ec59547955", "rev": "e88a8c1edf089b1a31378cf48f7ca3854950dc2a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -399,22 +329,6 @@
"type": "github" "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": { "flake-parts": {
"inputs": { "inputs": {
"nixpkgs-lib": [ "nixpkgs-lib": [
@ -559,47 +473,6 @@
"type": "github" "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": { "flake-schemas": {
"locked": { "locked": {
"lastModified": 1721999734, "lastModified": 1721999734,
@ -691,39 +564,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1757974173, "lastModified": 1758108966,
"narHash": "sha256-4DpXmct/2rcLgScT1CXOLr0TUeIlrBB1rnFqCOf5MUw=", "narHash": "sha256-ytw7ROXaWZ7OfwHrQ9xvjpUWeGVm86pwnEd1QhzawIo=",
"owner": "cachix", "owner": "cachix",
"repo": "git-hooks.nix", "repo": "git-hooks.nix",
"rev": "302af509428169db34f268324162712d10559f74", "rev": "54df955a695a84cd47d4a43e08e1feaf90b1fd9b",
"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" "type": "github"
}, },
"original": { "original": {
@ -776,29 +621,6 @@
"type": "github" "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": { "gnome-shell": {
"flake": false, "flake": false,
"locked": { "locked": {
@ -824,11 +646,11 @@
"rust-overlay": "rust-overlay_2" "rust-overlay": "rust-overlay_2"
}, },
"locked": { "locked": {
"lastModified": 1757982959, "lastModified": 1758548657,
"narHash": "sha256-b2a0ikawsIBcqwM05mv4tjsn0YfptAEcdEcTNhOD8Pk=", "narHash": "sha256-Y4PRLA9vpgR6olcHrcdQcPjZ2ukb4L3xnS5xJLS+ugU=",
"owner": "helix-editor", "owner": "helix-editor",
"repo": "helix", "repo": "helix",
"rev": "c0921202a0a9f9e3003a845824d3365e2f08467f", "rev": "37fe42d05d4d65e0c8112a10cc40cfbdc95e8a3c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -847,11 +669,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1755233722, "lastModified": 1758022363,
"narHash": "sha256-AavrbMltJKcC2Fx0lfJoZfmy7g87ebXU0ddVenhajLA=", "narHash": "sha256-ENUhCRWgSX4ni751HieNuQoq06dJvApV/Nm89kh+/A0=",
"owner": "hercules-ci", "owner": "hercules-ci",
"repo": "hercules-ci-effects", "repo": "hercules-ci-effects",
"rev": "99e03e72e3f7e13506f80ef9ebaedccb929d84d0", "rev": "1a3667d33e247ad35ca250698d63f49a5453d824",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -868,11 +690,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1757920978, "lastModified": 1758464306,
"narHash": "sha256-Mv16aegXLulgyDunijP6SPFJNm8lSXb2w3Q0X+vZ9TY=", "narHash": "sha256-i56XRXqjwJRdVYmpzVUQ0ktqBBHqNzQHQMQvFRF/acQ=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "11cc5449c50e0e5b785be3dfcb88245232633eb8", "rev": "939e91e1cff1f99736c5b02529658218ed819a2a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -888,11 +710,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1757997814, "lastModified": 1758545873,
"narHash": "sha256-F+1aoG+3NH4jDDEmhnDUReISyq6kQBBuktTUqCUWSiw=", "narHash": "sha256-0VP5cVd6DyibHNPC/IJ5Ut+KuNYUeKmr5ltzf+IcpjA=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "5820376beb804de9acf07debaaff1ac84728b708", "rev": "de5369834ff1f75246c46be89ef993392e961c26",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1040,11 +862,11 @@
"treefmt-nix": "treefmt-nix" "treefmt-nix": "treefmt-nix"
}, },
"locked": { "locked": {
"lastModified": 1757981100, "lastModified": 1758499570,
"narHash": "sha256-7fIHUJoYYVELlSRl4okgq3vhjakqJMtmWLUwCdbrk60=", "narHash": "sha256-d2tUVZ7/Lna6w5mk90g3NLgF7Cc+Ts8MttGX83ol9KQ=",
"owner": "nix-community", "owner": "nix-community",
"repo": "neovim-nightly-overlay", "repo": "neovim-nightly-overlay",
"rev": "b5a3252fd1e3b878271dfe957e8c34dc8791f112", "rev": "8b7e0b6092af1aeba5ac3ceebc0d975522958235",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1056,11 +878,11 @@
"neovim-src": { "neovim-src": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1757979081, "lastModified": 1758497400,
"narHash": "sha256-qk0ZyuDE9+CxlKAaJOP0iG/Itj9I/AQgkpQ2o8GjHmA=", "narHash": "sha256-ls4yWlhKmZHBB5RvHcPvE6qds5r4GYQd9ckeHm7ZHLQ=",
"owner": "neovim", "owner": "neovim",
"repo": "neovim", "repo": "neovim",
"rev": "ddcfa8bb4a98402c76c2996c6248c699095c05e6", "rev": "e887602eb5451bde2fe3241b2408c0ae7816ca3c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1081,11 +903,11 @@
"xwayland-satellite-unstable": "xwayland-satellite-unstable" "xwayland-satellite-unstable": "xwayland-satellite-unstable"
}, },
"locked": { "locked": {
"lastModified": 1758006511, "lastModified": 1758557018,
"narHash": "sha256-YmZX6Wydog4Q9p7dRZDFOFkUfCtQfoXRobmJdg3F1dg=", "narHash": "sha256-1Y60RW6jomYPnghYRqBq5aFEF/L2ZOCHBFd7zKy/wIw=",
"owner": "sodiboo", "owner": "sodiboo",
"repo": "niri-flake", "repo": "niri-flake",
"rev": "0be585b11314ac02804b4fe03196116c4f747d6d", "rev": "f3a529b7e7927012aa0f4ffc5487af761e6eb5b5",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1114,11 +936,11 @@
"niri-unstable": { "niri-unstable": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1758000903, "lastModified": 1758552132,
"narHash": "sha256-FyfB40rl2mbRGIvF2/6Iwv9xHDxOmhaE1MhlV6Efsg4=", "narHash": "sha256-GYcO5NbOY5vfY3iygWjOaZy+nYzemP0kacJ5z5E3P3Y=",
"owner": "YaLTeR", "owner": "YaLTeR",
"repo": "niri", "repo": "niri",
"rev": "c30e5c91851d77d48ff2120f0e710501b19d61b4", "rev": "4d4d968d97ebe633d8910ec65908e1ea75fc2b6d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1127,48 +949,6 @@
"type": "github" "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": { "nix-doom": {
"inputs": { "inputs": {
"doomemacs": "doomemacs", "doomemacs": "doomemacs",
@ -1179,11 +959,11 @@
"systems": "systems_3" "systems": "systems_3"
}, },
"locked": { "locked": {
"lastModified": 1758012118, "lastModified": 1758542136,
"narHash": "sha256-ecJ1Wvbww/DYv4ofaD2mP/FaX5Oe82fGiLNenc+m+JA=", "narHash": "sha256-8r6qZgxuAFJrlfiTpuQJl/cpydP3YTU8jIpE/2IXZuw=",
"owner": "marienz", "owner": "marienz",
"repo": "nix-doom-emacs-unstraightened", "repo": "nix-doom-emacs-unstraightened",
"rev": "90923049fc948b80d9f8ff587812338c226f7943", "rev": "1e3f4e31f6c8d9852c9aaa6064add4265df848c6",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1254,11 +1034,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1757979022, "lastModified": 1758479131,
"narHash": "sha256-fKqsvznISxVSBo6aaiGGXMRiBG4IIuV3sSySxx80pcQ=", "narHash": "sha256-KTCOYqnEUYSdk+DychTkXkOqgxYO2mLp9AzAw5mwAxA=",
"owner": "PedroHLC", "owner": "PedroHLC",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "93c5fdb7576f6b25476035aa95b8e54c867eca09", "rev": "94700b18eb20d3ec71e3f6cd32e30d03648664ba",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1283,21 +1063,6 @@
"type": "github" "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": { "nixpkgs-stable": {
"locked": { "locked": {
"lastModified": 1730741070, "lastModified": 1730741070,
@ -1316,11 +1081,11 @@
}, },
"nixpkgs-stable_2": { "nixpkgs-stable_2": {
"locked": { "locked": {
"lastModified": 1757810152, "lastModified": 1758346548,
"narHash": "sha256-Vp9K5ol6h0J90jG7Rm4RWZsCB3x7v5VPx588TQ1dkfs=", "narHash": "sha256-afXE7AJ7MY6wY1pg/Y6UPHNYPy5GtUKeBkrZZ/gC71E=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "9a094440e02a699be5c57453a092a8baf569bdad", "rev": "b2a3852bd078e68dd2b3dfa8c00c67af1f0a7d20",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1346,22 +1111,6 @@
"type": "github" "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": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1731919951, "lastModified": 1731919951,
@ -1380,11 +1129,11 @@
}, },
"nixpkgs_3": { "nixpkgs_3": {
"locked": { "locked": {
"lastModified": 1757873102, "lastModified": 1758446476,
"narHash": "sha256-kYhNxLlYyJcUouNRazBufVfBInMWMyF+44xG/xar2yE=", "narHash": "sha256-5rdAi7CTvM/kSs6fHe1bREIva5W3TbImsto+dxG4mBo=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "88cef159e47c0dc56f151593e044453a39a6e547", "rev": "a1f79a1770d05af18111fbbe2a3ab2c42c0f6cd0",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1412,11 +1161,11 @@
}, },
"nixpkgs_5": { "nixpkgs_5": {
"locked": { "locked": {
"lastModified": 1757745802, "lastModified": 1758277210,
"narHash": "sha256-hLEO2TPj55KcUFUU1vgtHE9UEIOjRcH/4QbmfHNF820=", "narHash": "sha256-iCGWf/LTy+aY0zFu8q12lK8KuZp7yvdhStehhyX1v8w=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "c23193b943c6c689d70ee98ce3128239ed9e32d1", "rev": "8eaee110344796db060382e15d3af0a9fc396e0e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1428,11 +1177,11 @@
}, },
"nixpkgs_6": { "nixpkgs_6": {
"locked": { "locked": {
"lastModified": 1757746433, "lastModified": 1758446476,
"narHash": "sha256-fEvTiU4s9lWgW7mYEU/1QUPirgkn+odUBTaindgiziY=", "narHash": "sha256-5rdAi7CTvM/kSs6fHe1bREIva5W3TbImsto+dxG4mBo=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "6d7ec06d6868ac6d94c371458fc2391ded9ff13d", "rev": "a1f79a1770d05af18111fbbe2a3ab2c42c0f6cd0",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1444,11 +1193,11 @@
}, },
"nixpkgs_7": { "nixpkgs_7": {
"locked": { "locked": {
"lastModified": 1757745802, "lastModified": 1758277210,
"narHash": "sha256-hLEO2TPj55KcUFUU1vgtHE9UEIOjRcH/4QbmfHNF820=", "narHash": "sha256-iCGWf/LTy+aY0zFu8q12lK8KuZp7yvdhStehhyX1v8w=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "c23193b943c6c689d70ee98ce3128239ed9e32d1", "rev": "8eaee110344796db060382e15d3af0a9fc396e0e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1460,32 +1209,16 @@
}, },
"nixpkgs_8": { "nixpkgs_8": {
"locked": { "locked": {
"lastModified": 1750441195, "lastModified": 1754340878,
"narHash": "sha256-yke+pm+MdgRb6c0dPt8MgDhv7fcBbdjmv1ZceNTyzKg=", "narHash": "sha256-lgmUyVQL9tSnvvIvBp7x1euhkkCho7n3TMzgjdvgPoU=",
"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", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "c87b95e25065c028d31a94f06a62927d18763fdf", "rev": "cab778239e705082fe97bb4990e0d24c50924c04",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nixos", "owner": "nixos",
"ref": "nixos-unstable", "ref": "nixpkgs-unstable",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }
@ -1498,11 +1231,11 @@
"systems": "systems_5" "systems": "systems_5"
}, },
"locked": { "locked": {
"lastModified": 1757864383, "lastModified": 1758551108,
"narHash": "sha256-oMoFAEC8A8BGBHIYiUNsgsVhEyNwTbn066J68LtbelY=", "narHash": "sha256-3KArqJcnrcEr1M3QsBG7NZRQSxVNFI3In+9MHdVmUKY=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixvim", "repo": "nixvim",
"rev": "db1a991f33fb43cf0e2a4aff54a8c53b4dc12128", "rev": "f828dead7723e7680b09929b9886225389d0370b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1517,11 +1250,11 @@
"nixpkgs": "nixpkgs_7" "nixpkgs": "nixpkgs_7"
}, },
"locked": { "locked": {
"lastModified": 1758018355, "lastModified": 1758564296,
"narHash": "sha256-35cUmHz97F0DpWwKuNTyWNlYnNoR0N1Ax4rnQrpJAJA=", "narHash": "sha256-hi0PlFm1gdeeTXDz9sIYZYKJWcPbRD9ar83q26YdU9I=",
"owner": "nix-community", "owner": "nix-community",
"repo": "NUR", "repo": "NUR",
"rev": "a3edb9f5c3f966b66d77524339d3cf916de9e767", "rev": "2c8121b44ea0f2b8917340d22e7f9098e1d09029",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1530,27 +1263,6 @@
"type": "github" "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": { "nur_2": {
"inputs": { "inputs": {
"flake-parts": [ "flake-parts": [
@ -1586,11 +1298,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1757624466, "lastModified": 1758272005,
"narHash": "sha256-25ExS2AkQD05Jf0Y2Wnn5KHpucN2d3ObEQOVaDh7ubg=", "narHash": "sha256-1u3xTH+3kaHhztPmWtLAD8LF5pTYLR2CpsPFWTFnVtQ=",
"owner": "NuschtOS", "owner": "NuschtOS",
"repo": "search", "repo": "search",
"rev": "da8bcb74407e41d334fc79081fdd8948b795bd6f", "rev": "aa975a3757f28ce862812466c5848787b868e116",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1647,7 +1359,6 @@
"nixpkgs": "nixpkgs_5", "nixpkgs": "nixpkgs_5",
"nixvim": "nixvim", "nixvim": "nixvim",
"nur": "nur", "nur": "nur",
"nur-ataraxiasjel": "nur-ataraxiasjel",
"sops-nix": "sops-nix", "sops-nix": "sops-nix",
"stylix": "stylix", "stylix": "stylix",
"treefmt-nix": "treefmt-nix_2" "treefmt-nix": "treefmt-nix_2"
@ -1661,11 +1372,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1757930296, "lastModified": 1758422215,
"narHash": "sha256-Z9u5VszKs8rfEvg2AsFucWEjl7wMtAln9l1b78cfBh4=", "narHash": "sha256-JvF5SXhp1wBHbfEVAWgJCDVSO8iknfDqXfqMch5YWg0=",
"owner": "oxalica", "owner": "oxalica",
"repo": "rust-overlay", "repo": "rust-overlay",
"rev": "09442765a05c2ca617c20ed68d9613da92a2d96b", "rev": "6f3988eb5885f1e2efa874a480d91de09a7f9f0b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1744,11 +1455,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1758007585, "lastModified": 1758425756,
"narHash": "sha256-HYnwlbY6RE5xVd5rh0bYw77pnD8lOgbT4mlrfjgNZ0c=", "narHash": "sha256-L3N8zV6wsViXiD8i3WFyrvjDdz76g3tXKEdZ4FkgQ+Y=",
"owner": "Mic92", "owner": "Mic92",
"repo": "sops-nix", "repo": "sops-nix",
"rev": "f77d4cfa075c3de66fc9976b80e0c4fc69e2c139", "rev": "e0fdaea3c31646e252a60b42d0ed8eafdb289762",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1972,11 +1683,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1756662192, "lastModified": 1758206697,
"narHash": "sha256-F1oFfV51AE259I85av+MAia221XwMHCOtZCMcZLK2Jk=", "narHash": "sha256-/DbPkh6PZOgfueCbs3uzlk4ASU2nPPsiVWhpMCNkAd0=",
"owner": "numtide", "owner": "numtide",
"repo": "treefmt-nix", "repo": "treefmt-nix",
"rev": "1aabc6c05ccbcbf4a635fb7a90400e44282f61c4", "rev": "128222dc911b8e2e18939537bed1762b7f3a04aa",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1987,14 +1698,14 @@
}, },
"treefmt-nix_2": { "treefmt-nix_2": {
"inputs": { "inputs": {
"nixpkgs": "nixpkgs_10" "nixpkgs": "nixpkgs_8"
}, },
"locked": { "locked": {
"lastModified": 1756662192, "lastModified": 1758206697,
"narHash": "sha256-F1oFfV51AE259I85av+MAia221XwMHCOtZCMcZLK2Jk=", "narHash": "sha256-/DbPkh6PZOgfueCbs3uzlk4ASU2nPPsiVWhpMCNkAd0=",
"owner": "numtide", "owner": "numtide",
"repo": "treefmt-nix", "repo": "treefmt-nix",
"rev": "1aabc6c05ccbcbf4a635fb7a90400e44282f61c4", "rev": "128222dc911b8e2e18939537bed1762b7f3a04aa",
"type": "github" "type": "github"
}, },
"original": { "original": {

View file

@ -191,11 +191,6 @@
owner = "nix-community"; owner = "nix-community";
repo = "NUR"; repo = "NUR";
}; };
nur-ataraxiasjel = {
type = "github";
owner = "AtaraxiaSjel";
repo = "nur";
};
nixvim = { nixvim = {
type = "github"; type = "github";

View file

@ -47,14 +47,26 @@
]; ];
programs.ssh = { programs.ssh = {
enable = true; enable = true;
hashKnownHosts = true;
extraOptionOverrides = { 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"; 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"; 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"; 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"; Ciphers = "chacha20-poly1305@openssh.com,aes256-gcm@openssh.com,aes128-gcm@openssh.com,aes256-ctr,aes192-ctr,aes128-ctr";
}; };
enableDefaultConfig = false;
matchBlocks = { 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" = { "github.com" = {
hostname = "ssh.github.com"; hostname = "ssh.github.com";
port = 443; port = 443;

View file

@ -48,7 +48,6 @@
accounts.email.enable = true; accounts.email.enable = true;
programs = { programs = {
chromium.enable = true; chromium.enable = true;
espanso.enable = true;
thunderbird.enable = true; thunderbird.enable = true;
foot.enable = false; foot.enable = false;
mpv.enable = true; mpv.enable = true;

View file

@ -1,6 +1,7 @@
{ {
config, config,
lib, lib,
pkgs,
... ...
}: }:
let let
@ -20,6 +21,17 @@ in
interactiveShellInit = '' interactiveShellInit = ''
fish_vi_key_bindings 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 = { functions = {
__fish_command_not_found_handler = { __fish_command_not_found_handler = {
body = "__fish_default_command_not_found_handler $argv[1]"; body = "__fish_default_command_not_found_handler $argv[1]";
@ -31,6 +43,18 @@ 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; fastfetch.enable = true;
}; };

View file

@ -34,7 +34,6 @@
enable = true; enable = true;
unixName = "david"; unixName = "david";
}; };
waydroid.enable = true;
}; };
programs = { programs = {
bash.enable = true; bash.enable = true;

View file

@ -28,7 +28,7 @@
Name = "bond0"; Name = "bond0";
}; };
bondConfig = { bondConfig = {
Mode = "active-backup"; Mode = "balance-rr";
MIIMonitorSec = "1s"; MIIMonitorSec = "1s";
PrimaryReselectPolicy = "better"; PrimaryReselectPolicy = "better";
}; };

View file

@ -9,7 +9,6 @@ in
./editor-runtime.nix ./editor-runtime.nix
./radicle-ci-broker.nix ./radicle-ci-broker.nix
./wallpapers.nix ./wallpapers.nix
./waydroid-script.nix
./rime-yuhaostar.nix ./rime-yuhaostar.nix
./nixvim.nix ./nixvim.nix

View file

@ -19,7 +19,6 @@ in
# Nur # Nur
./nur.nix ./nur.nix
./nur-ataraxiasejel.nix
] ]
|> map (file: import file args) |> map (file: import file args)
|> (overlays: (lib.composeManyExtensions overlays) final prev) |> (overlays: (lib.composeManyExtensions overlays) final prev)

View file

@ -1,14 +0,0 @@
{ 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;
};
};
};
}