diff --git a/flake.lock b/flake.lock index 690bc4e..bc81572 100644 --- a/flake.lock +++ b/flake.lock @@ -20,11 +20,11 @@ ] }, "locked": { - "lastModified": 1750372185, - "narHash": "sha256-lVBKxd9dsZOH1fA6kSE5WNnt8e+09fN+NL/Q3BjTWHY=", + "lastModified": 1751569683, + "narHash": "sha256-PoQcCYTiN52PanxgWBN4Tqet1x4PCk6KtjaHNjELH88=", "owner": "hyprwm", "repo": "aquamarine", - "rev": "7cef49d261cbbe537e8cb662485e76d29ac4cbca", + "rev": "c0c56dde3e471030edb135425a82107cf0057c6f", "type": "github" }, "original": { @@ -63,6 +63,70 @@ "type": "github" } }, + "determinate": { + "inputs": { + "determinate-nixd-aarch64-darwin": "determinate-nixd-aarch64-darwin", + "determinate-nixd-aarch64-linux": "determinate-nixd-aarch64-linux", + "determinate-nixd-x86_64-darwin": [ + "determinate", + "determinate-nixd-aarch64-darwin" + ], + "determinate-nixd-x86_64-linux": "determinate-nixd-x86_64-linux", + "nix": "nix", + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1751571582, + "narHash": "sha256-px4+H0VI5H+kzHgfoyAD0haTNiAXhiVgXqCAgAjT16A=", + "owner": "determinatesystems", + "repo": "determinate", + "rev": "e3f21c62aee2ccd25811be574c09e1de8a57a687", + "type": "github" + }, + "original": { + "owner": "determinatesystems", + "repo": "determinate", + "type": "github" + } + }, + "determinate-nixd-aarch64-darwin": { + "flake": false, + "locked": { + "narHash": "sha256-+O3K2pZRWkbL0DEh5HyV0+pyAkRmJ0z6NjYTvetrTtk=", + "type": "file", + "url": "https://install.determinate.systems/determinate-nixd/tag/v3.7.0/macOS" + }, + "original": { + "type": "file", + "url": "https://install.determinate.systems/determinate-nixd/tag/v3.7.0/macOS" + } + }, + "determinate-nixd-aarch64-linux": { + "flake": false, + "locked": { + "narHash": "sha256-r8BSSNXss3EoCUV4gYJwAS18OO7fceWXCL2SPLwls50=", + "type": "file", + "url": "https://install.determinate.systems/determinate-nixd/tag/v3.7.0/aarch64-linux" + }, + "original": { + "type": "file", + "url": "https://install.determinate.systems/determinate-nixd/tag/v3.7.0/aarch64-linux" + } + }, + "determinate-nixd-x86_64-linux": { + "flake": false, + "locked": { + "narHash": "sha256-hSauxThw5pfDiiqdVeFv3QeL4e3DRI09hFYuGhTKQWU=", + "type": "file", + "url": "https://install.determinate.systems/determinate-nixd/tag/v3.7.0/x86_64-linux" + }, + "original": { + "type": "file", + "url": "https://install.determinate.systems/determinate-nixd/tag/v3.7.0/x86_64-linux" + } + }, "flake-compat": { "flake": false, "locked": { @@ -80,6 +144,22 @@ } }, "flake-compat_2": { + "flake": false, + "locked": { + "lastModified": 1696426674, + "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, + "flake-compat_3": { "flake": false, "locked": { "lastModified": 1747046372, @@ -95,7 +175,7 @@ "type": "github" } }, - "flake-compat_3": { + "flake-compat_4": { "flake": false, "locked": { "lastModified": 1733328505, @@ -111,22 +191,28 @@ "type": "github" } }, - "flake-compat_4": { + "flake-parts": { + "inputs": { + "nixpkgs-lib": [ + "determinate", + "nix", + "nixpkgs" + ] + }, "locked": { - "lastModified": 1747046372, - "narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885", - "type": "github" + "lastModified": 1748821116, + "narHash": "sha256-F82+gS044J1APL0n4hH50GYdPRv/5JWm34oCJYmVKdE=", + "rev": "49f0870db23e8c1ca0b5259734a02cd9e1e371a1", + "revCount": 377, + "type": "tarball", + "url": "https://api.flakehub.com/f/pinned/hercules-ci/flake-parts/0.1.377%2Brev-49f0870db23e8c1ca0b5259734a02cd9e1e371a1/01972f28-554a-73f8-91f4-d488cc502f08/source.tar.gz" }, "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" + "type": "tarball", + "url": "https://flakehub.com/f/hercules-ci/flake-parts/0.1" } }, - "flake-parts": { + "flake-parts_2": { "inputs": { "nixpkgs-lib": [ "lanzaboote", @@ -147,7 +233,7 @@ "type": "github" } }, - "flake-parts_2": { + "flake-parts_3": { "inputs": { "nixpkgs-lib": [ "schizofox", @@ -168,7 +254,7 @@ "type": "github" } }, - "flake-parts_3": { + "flake-parts_4": { "inputs": { "nixpkgs-lib": "nixpkgs-lib" }, @@ -186,37 +272,30 @@ "type": "github" } }, - "flake-utils": { + "git-hooks-nix": { "inputs": { - "systems": "systems" + "flake-compat": "flake-compat", + "gitignore": [ + "determinate", + "nix" + ], + "nixpkgs": [ + "determinate", + "nix", + "nixpkgs" + ] }, "locked": { - "lastModified": 1731533236, - "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", - "type": "github" + "lastModified": 1747372754, + "narHash": "sha256-2Y53NGIX2vxfie1rOW0Qb86vjRZ7ngizoo+bnXU9D9k=", + "rev": "80479b6ec16fefd9c1db3ea13aeb038c60530f46", + "revCount": 1026, + "type": "tarball", + "url": "https://api.flakehub.com/f/pinned/cachix/git-hooks.nix/0.1.1026%2Brev-80479b6ec16fefd9c1db3ea13aeb038c60530f46/0196d79a-1b35-7b8e-a021-c894fb62163d/source.tar.gz" }, "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flakey-profile": { - "locked": { - "lastModified": 1712898590, - "narHash": "sha256-FhGIEU93VHAChKEXx905TSiPZKga69bWl1VB37FK//I=", - "owner": "lf-", - "repo": "flakey-profile", - "rev": "243c903fd8eadc0f63d205665a92d4df91d42d9d", - "type": "github" - }, - "original": { - "owner": "lf-", - "repo": "flakey-profile", - "type": "github" + "type": "tarball", + "url": "https://flakehub.com/f/cachix/git-hooks.nix/0.1.941" } }, "gitignore": { @@ -356,11 +435,11 @@ ] }, "locked": { - "lastModified": 1750371717, - "narHash": "sha256-cNP+bVq8m5x2Rl6MTjwfQLCdwbVmKvTH7yqVc1SpiJM=", + "lastModified": 1750621377, + "narHash": "sha256-8u6b5oAdX0rCuoR8wFenajBRmI+mzbpNig6hSCuWUzE=", "owner": "hyprwm", "repo": "hyprgraphics", - "rev": "15c6f8f3a567fec9a0f732cd310a7ff456deef88", + "rev": "b3d628d01693fb9bb0a6690cd4e7b80abda04310", "type": "github" }, "original": { @@ -389,11 +468,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1750959819, - "narHash": "sha256-KZuCRu4PpqK0QrUJ2i/9+k+51ZO7prnjdH2WfR3wkuI=", + "lastModified": 1751714318, + "narHash": "sha256-nkoRnDkRGaCT0JTuHcDXPCMkdmhUFEtI1TMUiQcrxfs=", "owner": "hyprwm", "repo": "hyprland", - "rev": "3d6476c9021519995239ec93bbb11f0dce6c60a0", + "rev": "6a5f4f5954a64bac718e3938f062d045256e7aeb", "type": "github" }, "original": { @@ -536,11 +615,11 @@ ] }, "locked": { - "lastModified": 1750703126, - "narHash": "sha256-zJHmLsiW6P8h9HaH5eMKhEh/gvym3k6/Ywr4UHKpJfc=", + "lastModified": 1751061882, + "narHash": "sha256-g9n8Vrbx+2JYM170P9BbvGHN39Wlkr4U+V2WLHQsXL8=", "owner": "hyprwm", "repo": "hyprutils", - "rev": "d46bd32da554c370f98180a1e465f052b9584805", + "rev": "4737241eaf8a1e51671a2a088518071f9a265cf4", "type": "github" }, "original": { @@ -592,8 +671,8 @@ "lanzaboote": { "inputs": { "crane": "crane", - "flake-compat": "flake-compat_2", - "flake-parts": "flake-parts", + "flake-compat": "flake-compat_3", + "flake-parts": "flake-parts_2", "nixpkgs": [ "nixpkgs" ], @@ -601,11 +680,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1750866260, - "narHash": "sha256-fo5NvfutMEw9OV+5rGYuCKjlNNjcnD3cKMbOfzusO/E=", + "lastModified": 1751381593, + "narHash": "sha256-js1XwtJpYhvQrrTaVzViybpztkHJVZ63aXOlFAcTENM=", "owner": "nix-community", "repo": "lanzaboote", - "rev": "f40a3401f86d117affeeb8ca6f0ce5cd1ca3cc24", + "rev": "f4eb75540307c2b33521322c04b7fea74e48a66f", "type": "github" }, "original": { @@ -614,39 +693,25 @@ "type": "github" } }, - "lix": { - "flake": false, - "locked": { - "lastModified": 1746827285, - "narHash": "sha256-hsFe4Tsqqg4l+FfQWphDtjC79WzNCZbEFhHI8j2KJzw=", - "rev": "47aad376c87e2e65967f17099277428e4b3f8e5a", - "type": "tarball", - "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/47aad376c87e2e65967f17099277428e4b3f8e5a.tar.gz?rev=47aad376c87e2e65967f17099277428e4b3f8e5a" - }, - "original": { - "type": "tarball", - "url": "https://git.lix.systems/lix-project/lix/archive/2.93.0.tar.gz" - } - }, - "lix-module": { + "nix": { "inputs": { - "flake-utils": "flake-utils", - "flakey-profile": "flakey-profile", - "lix": "lix", - "nixpkgs": [ - "nixpkgs" - ] + "flake-parts": "flake-parts", + "git-hooks-nix": "git-hooks-nix", + "nixpkgs": "nixpkgs", + "nixpkgs-23-11": "nixpkgs-23-11", + "nixpkgs-regression": "nixpkgs-regression" }, "locked": { - "lastModified": 1746838955, - "narHash": "sha256-11R4K3iAx4tLXjUs+hQ5K90JwDABD/XHhsM9nkeS5N8=", - "rev": "cd2a9c028df820a83ca2807dc6c6e7abc3dfa7fc", + "lastModified": 1751568315, + "narHash": "sha256-52rbPxatlf/8BA3plVc87W8kyXdBr6iab+nQHe4QeJg=", + "rev": "81672fee2a84385d052c20982307bbd86fd031c4", + "revCount": 21102, "type": "tarball", - "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/cd2a9c028df820a83ca2807dc6c6e7abc3dfa7fc.tar.gz?rev=cd2a9c028df820a83ca2807dc6c6e7abc3dfa7fc" + "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/nix-src/3.7.0/0197d1ca-253f-75ae-9f36-38c46bd107f4/source.tar.gz" }, "original": { "type": "tarball", - "url": "https://git.lix.systems/lix-project/nixos-module/archive/2.93.0.tar.gz" + "url": "https://flakehub.com/f/DeterminateSystems/nix-src/%2A" } }, "nixpak": { @@ -677,17 +742,31 @@ }, "nixpkgs": { "locked": { - "lastModified": 1750776420, - "narHash": "sha256-/CG+w0o0oJ5itVklOoLbdn2dGB0wbZVOoDm4np6w09A=", + "lastModified": 1747179050, + "narHash": "sha256-qhFMmDkeJX9KJwr5H32f1r7Prs7XbQWtO0h3V0a0rFY=", + "rev": "adaa24fbf46737f3f1b5497bf64bae750f82942e", + "revCount": 799423, + "type": "tarball", + "url": "https://api.flakehub.com/f/pinned/NixOS/nixpkgs/0.1.799423%2Brev-adaa24fbf46737f3f1b5497bf64bae750f82942e/0196d1c3-1974-7bf1-bcf6-06620ac40c8c/source.tar.gz" + }, + "original": { + "type": "tarball", + "url": "https://flakehub.com/f/NixOS/nixpkgs/%3D0.1.799423" + } + }, + "nixpkgs-23-11": { + "locked": { + "lastModified": 1717159533, + "narHash": "sha256-oamiKNfr2MS6yH64rUn99mIZjc45nGJlj9eGth/3Xuw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "30a61f056ac492e3b7cdcb69c1e6abdcf00e39cf", + "rev": "a62e6edd6d5e1fa0329b8653c801147986f8d446", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-unstable", "repo": "nixpkgs", + "rev": "a62e6edd6d5e1fa0329b8653c801147986f8d446", "type": "github" } }, @@ -703,7 +782,39 @@ "url": "https://github.com/NixOS/nixpkgs/archive/e9b51731911566bbf7e4895475a87fe06961de0b.tar.gz" } }, + "nixpkgs-regression": { + "locked": { + "lastModified": 1643052045, + "narHash": "sha256-uGJ0VXIhWKGXxkeNnq4TvV3CIOkUJ3PAoLZ3HMzNVMw=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", + "type": "github" + }, + "original": { + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", + "type": "github" + } + }, "nixpkgs_2": { + "locked": { + "lastModified": 1751271578, + "narHash": "sha256-P/SQmKDu06x8yv7i0s8bvnnuJYkxVGBWLWHaU+tt4YY=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "3016b4b15d13f3089db8a41ef937b13a9e33a8df", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_3": { "locked": { "lastModified": 1736429638, "narHash": "sha256-dDWqQqSgMQXw5eFtcyoVijv7HbYJZOIo+jWQdJtsxn4=", @@ -719,25 +830,9 @@ "type": "github" } }, - "nixpkgs_3": { - "locked": { - "lastModified": 1750339022, - "narHash": "sha256-ws4nec55lgEwmz5LovtxnrFlCFuAQiY/TEcspY8KycY=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "8b1e1e1e0fd8215f26e074ae47a73cbb2b1a328e", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, "pre-commit-hooks": { "inputs": { - "flake-compat": "flake-compat", + "flake-compat": "flake-compat_2", "gitignore": "gitignore", "nixpkgs": [ "hyprland", @@ -745,11 +840,11 @@ ] }, "locked": { - "lastModified": 1749636823, - "narHash": "sha256-WUaIlOlPLyPgz9be7fqWJA5iG6rHcGRtLERSCfUDne4=", + "lastModified": 1750779888, + "narHash": "sha256-wibppH3g/E2lxU43ZQHC5yA/7kIKLGxVEnsnVK1BtRg=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "623c56286de5a3193aa38891a6991b28f9bab056", + "rev": "16ec914f6fb6f599ce988427d9d94efddf25fe6d", "type": "github" }, "original": { @@ -771,11 +866,11 @@ ] }, "locked": { - "lastModified": 1749636823, - "narHash": "sha256-WUaIlOlPLyPgz9be7fqWJA5iG6rHcGRtLERSCfUDne4=", + "lastModified": 1750779888, + "narHash": "sha256-wibppH3g/E2lxU43ZQHC5yA/7kIKLGxVEnsnVK1BtRg=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "623c56286de5a3193aa38891a6991b28f9bab056", + "rev": "16ec914f6fb6f599ce988427d9d94efddf25fe6d", "type": "github" }, "original": { @@ -791,32 +886,31 @@ ] }, "locked": { - "lastModified": 1750880040, - "narHash": "sha256-ZwQH4akrZf5BxOfXx9Skjw7UpWAj1/ITVRDZsS/AYLA=", + "lastModified": 1751686190, + "narHash": "sha256-veNnb2UVyjugo9fIeGjisMGGn0TNae71p5D1YwwEAFs=", "ref": "refs/heads/master", - "rev": "d949f913479445e4f0ca3a95a183ee45d98dc359", - "revCount": 596, + "rev": "87d99b866f9866db10b55c8b03632f0eecae52d8", + "revCount": 606, "type": "git", - "url": "https://git.outfoxxed.me/outfoxxed/quickshell" + "url": "https://git.outfoxxed.me/quickshell/quickshell" }, "original": { "type": "git", - "url": "https://git.outfoxxed.me/outfoxxed/quickshell" + "url": "https://git.outfoxxed.me/quickshell/quickshell" } }, "root": { "inputs": { + "determinate": "determinate", "hyprland": "hyprland", "impermanence": "impermanence", "lanzaboote": "lanzaboote", - "lix-module": "lix-module", - "nixpkgs": "nixpkgs", + "nixpkgs": "nixpkgs_2", "quickshell": "quickshell", "rust-overlay": "rust-overlay_2", "schizofox": "schizofox", - "systems": "systems_3", - "watt": "watt", - "zedless": "zedless" + "systems": "systems_2", + "watt": "watt" } }, "rust-overlay": { @@ -827,11 +921,11 @@ ] }, "locked": { - "lastModified": 1750560265, - "narHash": "sha256-jQCojKl1/TzqE6ANOu6rP2qqxOcGK2xs6hpxZ77wrR8=", + "lastModified": 1751165203, + "narHash": "sha256-3QhlpAk2yn+ExwvRLtaixWsVW1q3OX3KXXe0l8VMLl4=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "076fdb0d45a9de3f379a626f51a62c78afe7efb1", + "rev": "90f547b90e73d3c6025e66c5b742d6db51c418c3", "type": "github" }, "original": { @@ -847,11 +941,11 @@ ] }, "locked": { - "lastModified": 1750905536, - "narHash": "sha256-Mo7yXM5IvMGNvJPiNkFsVT2UERmnvjsKgnY6UyDdySQ=", + "lastModified": 1751683029, + "narHash": "sha256-dYO5X5jK8bpQOeRAo8R5aUt6M/+Ji1cZgstZI7SQ2IA=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "2fa7c0aabd15fa0ccc1dc7e675a4fcf0272ad9a1", + "rev": "9e5e62a33a929a67a5427fb7324a6f583dced0b2", "type": "github" }, "original": { @@ -862,13 +956,13 @@ }, "schizofox": { "inputs": { - "flake-compat": "flake-compat_3", - "flake-parts": "flake-parts_2", + "flake-compat": "flake-compat_4", + "flake-parts": "flake-parts_3", "home-manager": "home-manager", "nixpak": "nixpak", - "nixpkgs": "nixpkgs_2", + "nixpkgs": "nixpkgs_3", "searx-randomizer": "searx-randomizer", - "systems": "systems_2" + "systems": "systems" }, "locked": { "lastModified": 1744892989, @@ -887,7 +981,7 @@ "searx-randomizer": { "inputs": { "crane": "crane_2", - "flake-parts": "flake-parts_3", + "flake-parts": "flake-parts_4", "nixpkgs": [ "schizofox", "nixpkgs" @@ -908,21 +1002,6 @@ } }, "systems": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, - "systems_2": { "locked": { "lastModified": 1689347949, "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", @@ -937,7 +1016,7 @@ "type": "github" } }, - "systems_3": { + "systems_2": { "locked": { "lastModified": 1689347949, "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", @@ -1012,25 +1091,6 @@ "repo": "xdg-desktop-portal-hyprland", "type": "github" } - }, - "zedless": { - "inputs": { - "flake-compat": "flake-compat_4", - "nixpkgs": "nixpkgs_3" - }, - "locked": { - "lastModified": 1750898414, - "narHash": "sha256-QuSbqvtgYIpEBriY/zTbsmOt+WXPuANSVAN4wnt6U1k=", - "owner": "zedless-editor", - "repo": "zed", - "rev": "3ab1a186f16d5554c3b91e1963f4e4e4acfcc5e4", - "type": "github" - }, - "original": { - "owner": "zedless-editor", - "repo": "zed", - "type": "github" - } } }, "root": "root", diff --git a/flake.nix b/flake.nix index 8b16869..934f6ba 100644 --- a/flake.nix +++ b/flake.nix @@ -73,25 +73,22 @@ }; quickshell = { - url = "git+https://git.outfoxxed.me/outfoxxed/quickshell"; + url = "git+https://git.outfoxxed.me/quickshell/quickshell"; # THIS IS IMPORTANT # Mismatched system dependencies will lead to crashes and other issues. inputs.nixpkgs.follows = "nixpkgs"; }; - lix-module = { - url = "https://git.lix.systems/lix-project/nixos-module/archive/2.93.0.tar.gz"; - inputs.nixpkgs.follows = "nixpkgs"; - }; - # The things rust is making me do... rust-overlay = { url = "github:oxalica/rust-overlay"; inputs.nixpkgs.follows = "nixpkgs"; }; - zedless = { - url = "github:zedless-editor/zed"; + # DetNix is doing too well these days not to use it... + determinate = { + url = "github:determinatesystems/determinate"; + inputs.nixpkgs.follows = "nixpkgs"; }; }; } diff --git a/hosts/hermit/programs.nix b/hosts/hermit/programs.nix index 76dcd9f..cdad6db 100644 --- a/hosts/hermit/programs.nix +++ b/hosts/hermit/programs.nix @@ -1,25 +1,19 @@ -{ - inputs, - pkgs, - ... -}:let - -# a newer nil version, for pipes support. -newer-nil = pkgs.nil.overrideAttrs (_: { - version = "unstable-02-06-2025"; - - src = pkgs.fetchFromGitHub { - owner = "oxalica"; - repo = "nil"; - rev = "577d160da311cc7f5042038456a0713e9863d09e"; - hash = "sha256-ggXU3RHv6NgWw+vc+HO4/9n0GPufhTIUjVuLci8Za8c="; - }; - cargoDeps = pkgs.rustPlatform.fetchCargoVendor { - inherit (newer-nil) src; - hash = "sha256-uZsLlFU9GKLvFllF7Kf5Q7HfN26KQojf4rvOb9p7Rjs="; - }; -}); +{pkgs, ...}: let + # a newer nil version, for pipes support. + newer-nil = pkgs.nil.overrideAttrs (_: { + version = "unstable-02-06-2025"; + src = pkgs.fetchFromGitHub { + owner = "oxalica"; + repo = "nil"; + rev = "577d160da311cc7f5042038456a0713e9863d09e"; + hash = "sha256-ggXU3RHv6NgWw+vc+HO4/9n0GPufhTIUjVuLci8Za8c="; + }; + cargoDeps = pkgs.rustPlatform.fetchCargoVendor { + inherit (newer-nil) src; + hash = "sha256-uZsLlFU9GKLvFllF7Kf5Q7HfN26KQojf4rvOb9p7Rjs="; + }; + }); in { environment.systemPackages = builtins.attrValues { inherit @@ -55,7 +49,6 @@ in { httpie hyperfine imagemagick - img2pdf impala imv inetutils @@ -102,7 +95,6 @@ in { xournalpp zathura ; - inherit (inputs.zedless.packages.${pkgs.stdenv.system}) zed-editor; inherit newer-nil; }; } diff --git a/modules/system/nix/module.nix b/modules/system/nix/module.nix index 925d18a..7c639af 100644 --- a/modules/system/nix/module.nix +++ b/modules/system/nix/module.nix @@ -12,11 +12,15 @@ in { imports = [ ./documentation.nix # nixos documentation ./nixpkgs.nix # global nixpkgs configuration - inputs.lix-module.nixosModules.default + inputs.determinate.nixosModules.default ]; nix = { - # package = pkgs.lix; + # Check that Nix can parse the generated nix.conf. + checkConfig = true; + + # Check the nix.conf, parsing for any kind of error. When disabled, checks only for unknown settings. + checkAllErrors = true; # fuck channels, no thanks channel.enable = mkForce false; @@ -63,10 +67,10 @@ in { # Automatically optimise symlinks auto-optimise-store = true; - # Allow sudo users to mark the following values as trusted + # Users that are allowed to connect to the Nix daemon. allowed-users = ["root" "@wheel" "nix-builder"]; - # Only allow sudo users to manage the nix store + # Users that are allowed to connect to the Nix daemon. trusted-users = ["root" "@wheel" "nix-builder"]; # Let the system decide the number of max jobs @@ -108,7 +112,7 @@ in { "flakes" # flakes "nix-command" # experimental nix commands "cgroups" # allow nix to execute builds inside cgroups - "pipe-operator" + "pipe-operators" ]; # Ensures that the result of Nix expressions is fully determined by @@ -148,13 +152,15 @@ in { # Substituters to pull from. substituters = [ "https://cache.nixos.org" - "https://cache.privatevoid.net" ]; trusted-public-keys = [ "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=" - "cache.privatevoid.net:SErQ8bvNWANeAvtsOESUwVYr2VJynfuc9JRwlzTTkVg=" ]; + # Determinate nix config + # =========================================== + lazy-trees = true; + # =========================================== }; };