From b321172044c319327d01c22ebdbc30d1f5b673d2 Mon Sep 17 00:00:00 2001 From: Lucien Cartier-Tilet Date: Sun, 29 Mar 2026 13:32:19 +0200 Subject: [PATCH] chore(flake): update flake lock, remove devenv input --- .envrc | 6 +- flake.lock | 894 +++------------------------------- flake.nix | 206 ++++---- users/modules/dev/vcs/git.nix | 5 +- 4 files changed, 168 insertions(+), 943 deletions(-) diff --git a/.envrc b/.envrc index 9ed350b..752574d 100644 --- a/.envrc +++ b/.envrc @@ -1,11 +1,7 @@ # -*- mode: sh; -*- -if ! has nix_direnv_version || ! nix_direnv_version 2.2.1; then - source_url "https://raw.githubusercontent.com/nix-community/nix-direnv/2.2.1/direnvrc" "sha256-zelF0vLbEl5uaqrfIzbgNzJWGmLzCmYAkInj/LNxvKs=" -fi - watch_file flake.nix watch_file flake.lock if ! use flake . --no-pure-eval then - echo "devenv could not be built. The devenv environment was not loaded. Make the necessary changes to devenv.nix and hit enter to try again." >&2 + echo "dev shell could not be built. The environment was not loaded. Make the necessary changes to flake.nix and hit enter to try again." >&2 fi diff --git a/flake.lock b/flake.lock index d5d3a0f..6e03cd1 100644 --- a/flake.lock +++ b/flake.lock @@ -25,97 +25,6 @@ } }, "cachix": { - "inputs": { - "devenv": [ - "devenv" - ], - "flake-compat": [ - "devenv", - "flake-compat" - ], - "git-hooks": [ - "devenv", - "git-hooks" - ], - "nixpkgs": [ - "devenv", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1767714506, - "narHash": "sha256-WaTs0t1CxhgxbIuvQ97OFhDTVUGd1HA+KzLZUZBhe0s=", - "owner": "cachix", - "repo": "cachix", - "rev": "894c649f0daaa38bbcfb21de64be47dfa7cd0ec9", - "type": "github" - }, - "original": { - "owner": "cachix", - "ref": "latest", - "repo": "cachix", - "type": "github" - } - }, - "cachix_2": { - "inputs": { - "devenv": [ - "devenv", - "crate2nix" - ], - "flake-compat": [ - "devenv", - "crate2nix" - ], - "git-hooks": "git-hooks", - "nixpkgs": "nixpkgs" - }, - "locked": { - "lastModified": 1767714506, - "narHash": "sha256-WaTs0t1CxhgxbIuvQ97OFhDTVUGd1HA+KzLZUZBhe0s=", - "owner": "cachix", - "repo": "cachix", - "rev": "894c649f0daaa38bbcfb21de64be47dfa7cd0ec9", - "type": "github" - }, - "original": { - "owner": "cachix", - "ref": "latest", - "repo": "cachix", - "type": "github" - } - }, - "cachix_3": { - "inputs": { - "devenv": [ - "devenv", - "crate2nix", - "crate2nix_stable" - ], - "flake-compat": [ - "devenv", - "crate2nix", - "crate2nix_stable" - ], - "git-hooks": "git-hooks_2", - "nixpkgs": "nixpkgs_2" - }, - "locked": { - "lastModified": 1767714506, - "narHash": "sha256-WaTs0t1CxhgxbIuvQ97OFhDTVUGd1HA+KzLZUZBhe0s=", - "owner": "cachix", - "repo": "cachix", - "rev": "894c649f0daaa38bbcfb21de64be47dfa7cd0ec9", - "type": "github" - }, - "original": { - "owner": "cachix", - "ref": "latest", - "repo": "cachix", - "type": "github" - } - }, - "cachix_4": { "inputs": { "devenv": [ "jj-cz", @@ -185,11 +94,11 @@ "quickshell": "quickshell" }, "locked": { - "lastModified": 1774280005, - "narHash": "sha256-Sj28gSYkCgN0ZXpTMYpnpAu4lK51ieCMngOGedB82So=", + "lastModified": 1774758352, + "narHash": "sha256-zrv2EjkiGT5BYyg9kOXfo48V6bUf0nyTjis/40ca+7s=", "owner": "caelestia-dots", "repo": "shell", - "rev": "501a14bd2a8ab7703aac6a224824a23818552554", + "rev": "5c59e4490a43eb38b39133d80c47490f0963f216", "type": "github" }, "original": { @@ -219,100 +128,14 @@ "type": "github" } }, - "crate2nix": { - "inputs": { - "cachix": "cachix_2", - "crate2nix_stable": "crate2nix_stable", - "devshell": "devshell_2", - "flake-compat": "flake-compat_2", - "flake-parts": "flake-parts_2", - "nix-test-runner": "nix-test-runner_2", - "nixpkgs": [ - "devenv", - "nixpkgs" - ], - "pre-commit-hooks": "pre-commit-hooks_2" - }, - "locked": { - "lastModified": 1773440526, - "narHash": "sha256-OcX1MYqUdoalY3/vU67PEx8m6RvqGxX0LwKonjzXn7I=", - "owner": "nix-community", - "repo": "crate2nix", - "rev": "e697d3049c909580128caa856ab8eb709556a97b", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "crate2nix", - "type": "github" - } - }, - "crate2nix_stable": { - "inputs": { - "cachix": "cachix_3", - "crate2nix_stable": [ - "devenv", - "crate2nix", - "crate2nix_stable" - ], - "devshell": "devshell", - "flake-compat": "flake-compat", - "flake-parts": "flake-parts", - "nix-test-runner": "nix-test-runner", - "nixpkgs": "nixpkgs_3", - "pre-commit-hooks": "pre-commit-hooks" - }, - "locked": { - "lastModified": 1769627083, - "narHash": "sha256-SUuruvw1/moNzCZosHaa60QMTL+L9huWdsCBN6XZIic=", - "owner": "nix-community", - "repo": "crate2nix", - "rev": "7c33e664668faecf7655fa53861d7a80c9e464a2", - "type": "github" - }, - "original": { - "owner": "nix-community", - "ref": "0.15.0", - "repo": "crate2nix", - "type": "github" - } - }, "devenv": { "inputs": { "cachix": "cachix", - "crate2nix": "crate2nix", - "flake-compat": "flake-compat_3", - "flake-parts": "flake-parts_3", - "git-hooks": "git-hooks_3", + "flake-compat": "flake-compat", + "flake-parts": "flake-parts", + "git-hooks": "git-hooks", "nix": "nix", "nixd": "nixd", - "nixpkgs": [ - "nixpkgs" - ], - "rust-overlay": "rust-overlay" - }, - "locked": { - "lastModified": 1774428097, - "narHash": "sha256-yQAutPgbsVHsN/SygZDyzMRxQn6Im53PJkrI377N8Sg=", - "owner": "cachix", - "repo": "devenv", - "rev": "957d63f663f230dc8ac3b85f950690e56fe8b1e0", - "type": "github" - }, - "original": { - "owner": "cachix", - "repo": "devenv", - "type": "github" - } - }, - "devenv_2": { - "inputs": { - "cachix": "cachix_4", - "flake-compat": "flake-compat_4", - "flake-parts": "flake-parts_4", - "git-hooks": "git-hooks_4", - "nix": "nix_2", - "nixd": "nixd_2", "nixpkgs": [ "jj-cz", "nixpkgs" @@ -332,51 +155,6 @@ "type": "github" } }, - "devshell": { - "inputs": { - "nixpkgs": [ - "devenv", - "crate2nix", - "crate2nix_stable", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1768818222, - "narHash": "sha256-460jc0+CZfyaO8+w8JNtlClB2n4ui1RbHfPTLkpwhU8=", - "owner": "numtide", - "repo": "devshell", - "rev": "255a2b1725a20d060f566e4755dbf571bbbb5f76", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "devshell", - "type": "github" - } - }, - "devshell_2": { - "inputs": { - "nixpkgs": [ - "devenv", - "crate2nix", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1768818222, - "narHash": "sha256-460jc0+CZfyaO8+w8JNtlClB2n4ui1RbHfPTLkpwhU8=", - "owner": "numtide", - "repo": "devshell", - "rev": "255a2b1725a20d060f566e4755dbf571bbbb5f76", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "devshell", - "type": "github" - } - }, "fenix": { "inputs": { "nixpkgs": [ @@ -401,50 +179,6 @@ } }, "flake-compat": { - "locked": { - "lastModified": 1733328505, - "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=", - "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec", - "revCount": 69, - "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/edolstra/flake-compat/1.1.0/01948eb7-9cba-704f-bbf3-3fa956735b52/source.tar.gz" - }, - "original": { - "type": "tarball", - "url": "https://flakehub.com/f/edolstra/flake-compat/1.tar.gz" - } - }, - "flake-compat_2": { - "locked": { - "lastModified": 1733328505, - "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=", - "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec", - "revCount": 69, - "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/edolstra/flake-compat/1.1.0/01948eb7-9cba-704f-bbf3-3fa956735b52/source.tar.gz" - }, - "original": { - "type": "tarball", - "url": "https://flakehub.com/f/edolstra/flake-compat/1.tar.gz" - } - }, - "flake-compat_3": { - "flake": false, - "locked": { - "lastModified": 1767039857, - "narHash": "sha256-vNpUSpF5Nuw8xvDLj2KCwwksIbjua2LZCqhV1LNRDns=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "5edf11c44bc78a0d334f6334cdaf7d60d732daab", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, - "flake-compat_4": { "flake": false, "locked": { "lastModified": 1761588595, @@ -461,72 +195,6 @@ } }, "flake-parts": { - "inputs": { - "nixpkgs-lib": [ - "devenv", - "crate2nix", - "crate2nix_stable", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1768135262, - "narHash": "sha256-PVvu7OqHBGWN16zSi6tEmPwwHQ4rLPU9Plvs8/1TUBY=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "80daad04eddbbf5a4d883996a73f3f542fa437ac", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "flake-parts", - "type": "github" - } - }, - "flake-parts_2": { - "inputs": { - "nixpkgs-lib": [ - "devenv", - "crate2nix", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1768135262, - "narHash": "sha256-PVvu7OqHBGWN16zSi6tEmPwwHQ4rLPU9Plvs8/1TUBY=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "80daad04eddbbf5a4d883996a73f3f542fa437ac", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "flake-parts", - "type": "github" - } - }, - "flake-parts_3": { - "inputs": { - "nixpkgs-lib": [ - "devenv", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1772408722, - "narHash": "sha256-rHuJtdcOjK7rAHpHphUb1iCvgkU3GpfvicLMwwnfMT0=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "f20dc5d9b8027381c474144ecabc9034d6a839a3", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "flake-parts", - "type": "github" - } - }, - "flake-parts_4": { "inputs": { "nixpkgs-lib": [ "jj-cz", @@ -614,6 +282,24 @@ "type": "github" } }, + "flake-utils_4": { + "inputs": { + "systems": "systems_3" + }, + "locked": { + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, "flakeCompat": { "flake": false, "locked": { @@ -631,101 +317,13 @@ } }, "git-hooks": { - "inputs": { - "flake-compat": [ - "devenv", - "crate2nix", - "cachix", - "flake-compat" - ], - "gitignore": "gitignore", - "nixpkgs": [ - "devenv", - "crate2nix", - "cachix", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1765404074, - "narHash": "sha256-+ZDU2d+vzWkEJiqprvV5PR26DVFN2vgddwG5SnPZcUM=", - "owner": "cachix", - "repo": "git-hooks.nix", - "rev": "2d6f58930fbcd82f6f9fd59fb6d13e37684ca529", - "type": "github" - }, - "original": { - "owner": "cachix", - "repo": "git-hooks.nix", - "type": "github" - } - }, - "git-hooks_2": { - "inputs": { - "flake-compat": [ - "devenv", - "crate2nix", - "crate2nix_stable", - "cachix", - "flake-compat" - ], - "gitignore": "gitignore_2", - "nixpkgs": [ - "devenv", - "crate2nix", - "crate2nix_stable", - "cachix", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1765404074, - "narHash": "sha256-+ZDU2d+vzWkEJiqprvV5PR26DVFN2vgddwG5SnPZcUM=", - "owner": "cachix", - "repo": "git-hooks.nix", - "rev": "2d6f58930fbcd82f6f9fd59fb6d13e37684ca529", - "type": "github" - }, - "original": { - "owner": "cachix", - "repo": "git-hooks.nix", - "type": "github" - } - }, - "git-hooks_3": { - "inputs": { - "flake-compat": [ - "devenv", - "flake-compat" - ], - "gitignore": "gitignore_5", - "nixpkgs": [ - "devenv", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1772893680, - "narHash": "sha256-JDqZMgxUTCq85ObSaFw0HhE+lvdOre1lx9iI6vYyOEs=", - "owner": "cachix", - "repo": "git-hooks.nix", - "rev": "8baab586afc9c9b57645a734c820e4ac0a604af9", - "type": "github" - }, - "original": { - "owner": "cachix", - "repo": "git-hooks.nix", - "type": "github" - } - }, - "git-hooks_4": { "inputs": { "flake-compat": [ "jj-cz", "devenv", "flake-compat" ], - "gitignore": "gitignore_6", + "gitignore": "gitignore", "nixpkgs": [ "jj-cz", "devenv", @@ -747,124 +345,6 @@ } }, "gitignore": { - "inputs": { - "nixpkgs": [ - "devenv", - "crate2nix", - "cachix", - "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" - } - }, - "gitignore_2": { - "inputs": { - "nixpkgs": [ - "devenv", - "crate2nix", - "crate2nix_stable", - "cachix", - "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" - } - }, - "gitignore_3": { - "inputs": { - "nixpkgs": [ - "devenv", - "crate2nix", - "crate2nix_stable", - "pre-commit-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" - } - }, - "gitignore_4": { - "inputs": { - "nixpkgs": [ - "devenv", - "crate2nix", - "pre-commit-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" - } - }, - "gitignore_5": { - "inputs": { - "nixpkgs": [ - "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" - } - }, - "gitignore_6": { "inputs": { "nixpkgs": [ "jj-cz", @@ -894,11 +374,11 @@ ] }, "locked": { - "lastModified": 1774379316, - "narHash": "sha256-0nGNxWDUH2Hzlj/R3Zf4FEK6fsFNB/dvewuboSRZqiI=", + "lastModified": 1774738535, + "narHash": "sha256-2jfBEZUC67IlnxO5KItFCAd7Oc+1TvyV/jQlR+2ykGQ=", "owner": "nix-community", "repo": "home-manager", - "rev": "1eb0549a1ab3fe3f5acf86668249be15fa0e64f7", + "rev": "769e07ef8f4cf7b1ec3b96ef015abec9bc6b1e2a", "type": "github" }, "original": { @@ -910,19 +390,19 @@ "jj-cz": { "inputs": { "alejandra": "alejandra", - "devenv": "devenv_2", - "flake-utils": "flake-utils_2", + "devenv": "devenv", + "flake-utils": "flake-utils_3", "nixpkgs": [ "nixpkgs" ], - "rust-overlay": "rust-overlay_2" + "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1774423746, - "narHash": "sha256-lFPBgSZd/Mhe7we5E/jSE7HgP41Hc3P9zP6w425qq6o=", + "lastModified": 1774451186, + "narHash": "sha256-5IYhofBilDXbM6MWAZLTKxuThjtL3lGNTXdBGsbgRek=", "ref": "refs/heads/develop", - "rev": "2d3ef90c62d5beb1c8cbd6842f1bbe1f070468f4", - "revCount": 27, + "rev": "a5b2bc41aafd203203b4eba4f247a670dd9cb252", + "revCount": 29, "type": "git", "url": "https://labs.phundrak.com/phundrak/jj-cz" }, @@ -932,98 +412,6 @@ } }, "nix": { - "inputs": { - "flake-compat": [ - "devenv", - "flake-compat" - ], - "flake-parts": [ - "devenv", - "flake-parts" - ], - "git-hooks-nix": [ - "devenv", - "git-hooks" - ], - "nixpkgs": [ - "devenv", - "nixpkgs" - ], - "nixpkgs-23-11": [ - "devenv" - ], - "nixpkgs-regression": [ - "devenv" - ] - }, - "locked": { - "lastModified": 1774103430, - "narHash": "sha256-MRNVInSmvhKIg3y0UdogQJXe+omvKijGszFtYpd5r9k=", - "owner": "cachix", - "repo": "nix", - "rev": "e127c1c94cefe02d8ca4cca79ef66be4c527510e", - "type": "github" - }, - "original": { - "owner": "cachix", - "ref": "devenv-2.32", - "repo": "nix", - "type": "github" - } - }, - "nix-index-database": { - "inputs": { - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1774156144, - "narHash": "sha256-gdYe9wTPl4ignDyXUl1LlICWj41+S0GB5lG1fKP17+A=", - "owner": "nix-community", - "repo": "nix-index-database", - "rev": "55b588747fa3d7fc351a11831c4b874dab992862", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "nix-index-database", - "type": "github" - } - }, - "nix-test-runner": { - "flake": false, - "locked": { - "lastModified": 1588761593, - "narHash": "sha256-FKJykltAN/g3eIceJl4SfDnnyuH2jHImhMrXS2KvGIs=", - "owner": "stoeffel", - "repo": "nix-test-runner", - "rev": "c45d45b11ecef3eb9d834c3b6304c05c49b06ca2", - "type": "github" - }, - "original": { - "owner": "stoeffel", - "repo": "nix-test-runner", - "type": "github" - } - }, - "nix-test-runner_2": { - "flake": false, - "locked": { - "lastModified": 1588761593, - "narHash": "sha256-FKJykltAN/g3eIceJl4SfDnnyuH2jHImhMrXS2KvGIs=", - "owner": "stoeffel", - "repo": "nix-test-runner", - "rev": "c45d45b11ecef3eb9d834c3b6304c05c49b06ca2", - "type": "github" - }, - "original": { - "owner": "stoeffel", - "repo": "nix-test-runner", - "type": "github" - } - }, - "nix_2": { "inputs": { "flake-compat": [ "jj-cz", @@ -1069,33 +457,27 @@ "type": "github" } }, - "nixd": { + "nix-index-database": { "inputs": { - "flake-parts": [ - "devenv", - "flake-parts" - ], "nixpkgs": [ - "devenv", "nixpkgs" - ], - "treefmt-nix": "treefmt-nix" + ] }, "locked": { - "lastModified": 1773634079, - "narHash": "sha256-49qb4QNMv77VOeEux+sMd0uBhPvvHgVc0r938Bulvbo=", + "lastModified": 1774762074, + "narHash": "sha256-89Mh4Eb/5stVJX6kGagVMijcU2FmfeD8Qv7UXc5d92o=", "owner": "nix-community", - "repo": "nixd", - "rev": "8ecf93d4d93745e05ea53534e8b94f5e9506e6bd", + "repo": "nix-index-database", + "rev": "bc13aeaed568be76eab84df88ff39261bb52ff70", "type": "github" }, "original": { "owner": "nix-community", - "repo": "nixd", + "repo": "nix-index-database", "type": "github" } }, - "nixd_2": { + "nixd": { "inputs": { "flake-parts": [ "jj-cz", @@ -1108,7 +490,7 @@ "devenv", "nixpkgs" ], - "treefmt-nix": "treefmt-nix_2" + "treefmt-nix": "treefmt-nix" }, "locked": { "lastModified": 1763964548, @@ -1126,59 +508,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1765186076, - "narHash": "sha256-hM20uyap1a0M9d344I692r+ik4gTMyj60cQWO+hAYP8=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "addf7cf5f383a3101ecfba091b98d0a1263dc9b8", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_2": { - "locked": { - "lastModified": 1765186076, - "narHash": "sha256-hM20uyap1a0M9d344I692r+ik4gTMyj60cQWO+hAYP8=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "addf7cf5f383a3101ecfba091b98d0a1263dc9b8", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_3": { - "locked": { - "lastModified": 1769433173, - "narHash": "sha256-Gf1dFYgD344WZ3q0LPlRoWaNdNQq8kSBDLEWulRQSEs=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "13b0f9e6ac78abbbb736c635d87845c4f4bee51b", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_4": { - "locked": { - "lastModified": 1774106199, - "narHash": "sha256-US5Tda2sKmjrg2lNHQL3jRQ6p96cgfWh3J1QBliQ8Ws=", + "lastModified": 1774386573, + "narHash": "sha256-4hAV26quOxdC6iyG7kYaZcM3VOskcPUrdCQd/nx8obc=", "owner": "nixos", "repo": "nixpkgs", - "rev": "6c9a78c09ff4d6c21d0319114873508a6ec01655", + "rev": "46db2e09e1d3f113a13c0d7b81e2f221c63b8ce9", "type": "github" }, "original": { @@ -1188,71 +522,13 @@ "type": "github" } }, - "pre-commit-hooks": { - "inputs": { - "flake-compat": [ - "devenv", - "crate2nix", - "crate2nix_stable", - "flake-compat" - ], - "gitignore": "gitignore_3", - "nixpkgs": [ - "devenv", - "crate2nix", - "crate2nix_stable", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1769069492, - "narHash": "sha256-Efs3VUPelRduf3PpfPP2ovEB4CXT7vHf8W+xc49RL/U=", - "owner": "cachix", - "repo": "pre-commit-hooks.nix", - "rev": "a1ef738813b15cf8ec759bdff5761b027e3e1d23", - "type": "github" - }, - "original": { - "owner": "cachix", - "repo": "pre-commit-hooks.nix", - "type": "github" - } - }, - "pre-commit-hooks_2": { - "inputs": { - "flake-compat": [ - "devenv", - "crate2nix", - "flake-compat" - ], - "gitignore": "gitignore_4", - "nixpkgs": [ - "devenv", - "crate2nix", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1769069492, - "narHash": "sha256-Efs3VUPelRduf3PpfPP2ovEB4CXT7vHf8W+xc49RL/U=", - "owner": "cachix", - "repo": "pre-commit-hooks.nix", - "rev": "a1ef738813b15cf8ec759bdff5761b027e3e1d23", - "type": "github" - }, - "original": { - "owner": "cachix", - "repo": "pre-commit-hooks.nix", - "type": "github" - } - }, "pumo-system-info": { "inputs": { - "flake-utils": "flake-utils_3", + "flake-utils": "flake-utils_4", "nixpkgs": [ "nixpkgs" ], - "rust-overlay": "rust-overlay_3" + "rust-overlay": "rust-overlay_2" }, "locked": { "lastModified": 1748984111, @@ -1293,11 +569,11 @@ "inputs": { "caelestia-shell": "caelestia-shell", "copyparty": "copyparty", - "devenv": "devenv", + "flake-utils": "flake-utils_2", "home-manager": "home-manager", "jj-cz": "jj-cz", "nix-index-database": "nix-index-database", - "nixpkgs": "nixpkgs_4", + "nixpkgs": "nixpkgs", "pumo-system-info": "pumo-system-info", "sops-nix": "sops-nix", "spicetify": "spicetify", @@ -1323,27 +599,6 @@ } }, "rust-overlay": { - "inputs": { - "nixpkgs": [ - "devenv", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1773630837, - "narHash": "sha256-zJhgAGnbVKeBMJOb9ctZm4BGS/Rnrz+5lfSXTVah4HQ=", - "owner": "oxalica", - "repo": "rust-overlay", - "rev": "f600ea449c7b5bb596fa1cf21c871cc5b9e31316", - "type": "github" - }, - "original": { - "owner": "oxalica", - "repo": "rust-overlay", - "type": "github" - } - }, - "rust-overlay_2": { "inputs": { "nixpkgs": [ "jj-cz", @@ -1364,7 +619,7 @@ "type": "github" } }, - "rust-overlay_3": { + "rust-overlay_2": { "inputs": { "nixpkgs": [ "pumo-system-info", @@ -1392,11 +647,11 @@ ] }, "locked": { - "lastModified": 1774303811, - "narHash": "sha256-fhG4JAcLgjKwt+XHbjs8brpWnyKUfU4LikLm3s0Q/ic=", + "lastModified": 1774760784, + "narHash": "sha256-D+tgywBHldTc0klWCIC49+6Zlp57Y4GGwxP1CqfxZrY=", "owner": "Mic92", "repo": "sops-nix", - "rev": "614e256310e0a4f8a9ccae3fa80c11844fba7042", + "rev": "8adb84861fe70e131d44e1e33c426a51e2e0bfa5", "type": "github" }, "original": { @@ -1410,7 +665,7 @@ "nixpkgs": [ "nixpkgs" ], - "systems": "systems_3" + "systems": "systems_4" }, "locked": { "lastModified": 1774157037, @@ -1433,11 +688,11 @@ ] }, "locked": { - "lastModified": 1774323522, - "narHash": "sha256-S3M+Axz72O0hqBoE2hKPS8Gl0vHHoIx49vcNPdI04fI=", + "lastModified": 1774517972, + "narHash": "sha256-oPIVzGlMmfWuJlRbr87yU3cnV8NxtwTG92GqpQczlkw=", "owner": "nix-community", "repo": "srvos", - "rev": "f131044c4c7b7cda679e5da456c6fa4607664a48", + "rev": "0ddba2fbd72bb60f8b35b7de1ad67590f454d402", "type": "github" }, "original": { @@ -1491,29 +746,22 @@ "type": "github" } }, - "treefmt-nix": { - "inputs": { - "nixpkgs": [ - "devenv", - "nixd", - "nixpkgs" - ] - }, + "systems_4": { "locked": { - "lastModified": 1772660329, - "narHash": "sha256-IjU1FxYqm+VDe5qIOxoW+pISBlGvVApRjiw/Y/ttJzY=", - "owner": "numtide", - "repo": "treefmt-nix", - "rev": "3710e0e1218041bbad640352a0440114b1e10428", + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", "type": "github" }, "original": { - "owner": "numtide", - "repo": "treefmt-nix", + "owner": "nix-systems", + "repo": "default", "type": "github" } }, - "treefmt-nix_2": { + "treefmt-nix": { "inputs": { "nixpkgs": [ "jj-cz", @@ -1543,11 +791,11 @@ ] }, "locked": { - "lastModified": 1773722260, - "narHash": "sha256-U8MsSiqqYZHR3oKE+cCZ2AJt3b4LcXs+oQuNLipaO78=", + "lastModified": 1774759885, + "narHash": "sha256-Y3D2GnZTO6BhGWeVcO6qUkiO5g0dDL2tmokLVWNC1WY=", "owner": "youwen5", "repo": "zen-browser-flake", - "rev": "0e6e43342fb3e9a3439fafa777d8cdf98e4ffc49", + "rev": "16e3f4cd221a030186a96015d82dcb3fb4afa4d6", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 6bd88bb..881fa13 100644 --- a/flake.nix +++ b/flake.nix @@ -3,11 +3,7 @@ inputs = { nixpkgs.url = "github:nixos/nixpkgs?ref=nixos-unstable"; - - devenv = { - url = "github:cachix/devenv"; - inputs.nixpkgs.follows = "nixpkgs"; - }; + flake-utils.url = "github:numtide/flake-utils"; home-manager = { url = "github:nix-community/home-manager"; @@ -82,119 +78,101 @@ outputs = { self, nixpkgs, + flake-utils, home-manager, - devenv, srvos, ... - } @ inputs: let - inherit (self) outputs; - system = "x86_64-linux"; - pkgs = nixpkgs.legacyPackages.${system}; - in { - formatter.${system} = pkgs.alejandra; + } @ inputs: + flake-utils.lib.eachDefaultSystem ( + system: let + inherit (self) outputs; + pkgs = nixpkgs.legacyPackages.${system}; + in { + formatter = pkgs.alejandra; + devShells.default = pkgs.mkShell { + buildInputs = [pkgs.nh]; + }; - packages.${system} = { - devenv-up = self.devShells.${system}.default.config.procfileScript; - devenv-test = self.devShells.${system}.default.config.test; - }; - - devShells.${system}.default = devenv.lib.mkShell { - inherit inputs pkgs; - modules = [ - ( - {pkgs, ...}: { - packages = [pkgs.nh]; - git-hooks.hooks = { - alejandra.enable = true; - commitizen.enable = true; - detect-private-keys.enable = true; - end-of-file-fixer.enable = true; - deadnix.enable = true; - ripsecrets.enable = true; - statix.enable = true; + packages = { + homeConfigurations = let + extraSpecialArgs = {inherit inputs outputs system;}; + pkgs = nixpkgs.legacyPackages.x86_64-linux; + defaultUserModules = [ + inputs.sops-nix.homeManagerModules.sops + inputs.spicetify.homeManagerModules.default + inputs.caelestia-shell.homeManagerModules.default + ]; + withUserModules = modules: nixpkgs.lib.lists.flatten (defaultUserModules ++ [modules]); + in { + "phundrak@alys" = home-manager.lib.homeManagerConfiguration { + inherit extraSpecialArgs pkgs; + modules = withUserModules ./users/phundrak/host/alys.nix; }; - } - ) - ]; - }; + "creug@elcafe" = home-manager.lib.homeManagerConfiguration { + inherit extraSpecialArgs pkgs; + modules = withUserModules ./users/creug/host/elcafe.nix; + }; + "phundrak@elcafe" = home-manager.lib.homeManagerConfiguration { + inherit extraSpecialArgs pkgs; + modules = withUserModules ./users/phundrak/host/elcafe.nix; + }; + "phundrak@gampo" = home-manager.lib.homeManagerConfiguration { + inherit extraSpecialArgs pkgs; + modules = withUserModules ./users/phundrak/host/marpa.nix; + }; + "phundrak@marpa" = home-manager.lib.homeManagerConfiguration { + inherit extraSpecialArgs pkgs; + modules = withUserModules ./users/phundrak/host/marpa.nix; + }; + "phundrak@NaroMk3" = home-manager.lib.homeManagerConfiguration { + inherit extraSpecialArgs pkgs; + modules = withUserModules ./users/phundrak/host/naromk3.nix; + }; + "phundrak@tilo" = home-manager.lib.homeManagerConfiguration { + inherit extraSpecialArgs pkgs; + modules = withUserModules ./users/phundrak/host/tilo.nix; + }; + }; - homeConfigurations = let - extraSpecialArgs = {inherit inputs outputs system;}; - pkgs = nixpkgs.legacyPackages.x86_64-linux; - defaultUserModules = [ - inputs.sops-nix.homeManagerModules.sops - inputs.spicetify.homeManagerModules.default - inputs.caelestia-shell.homeManagerModules.default - ]; - withUserModules = modules: nixpkgs.lib.lists.flatten (defaultUserModules ++ [modules]); - in { - "phundrak@alys" = home-manager.lib.homeManagerConfiguration { - inherit extraSpecialArgs pkgs; - modules = withUserModules ./users/phundrak/host/alys.nix; - }; - "creug@elcafe" = home-manager.lib.homeManagerConfiguration { - inherit extraSpecialArgs pkgs; - modules = withUserModules ./users/creug/host/elcafe.nix; - }; - "phundrak@elcafe" = home-manager.lib.homeManagerConfiguration { - inherit extraSpecialArgs pkgs; - modules = withUserModules ./users/phundrak/host/elcafe.nix; - }; - "phundrak@gampo" = home-manager.lib.homeManagerConfiguration { - inherit extraSpecialArgs pkgs; - modules = withUserModules ./users/phundrak/host/marpa.nix; - }; - "phundrak@marpa" = home-manager.lib.homeManagerConfiguration { - inherit extraSpecialArgs pkgs; - modules = withUserModules ./users/phundrak/host/marpa.nix; - }; - "phundrak@NaroMk3" = home-manager.lib.homeManagerConfiguration { - inherit extraSpecialArgs pkgs; - modules = withUserModules ./users/phundrak/host/naromk3.nix; - }; - "phundrak@tilo" = home-manager.lib.homeManagerConfiguration { - inherit extraSpecialArgs pkgs; - modules = withUserModules ./users/phundrak/host/tilo.nix; - }; - }; - - nixosConfigurations = let - specialArgs = {inherit inputs outputs;}; - defaultSystemModules = [ - inputs.sops-nix.nixosModules.sops - inputs.copyparty.nixosModules.default - ]; - withSystemModules = modules: nixpkgs.lib.lists.flatten (defaultSystemModules ++ [modules]); - in { - alys = nixpkgs.lib.nixosSystem { - inherit specialArgs; - modules = withSystemModules ./hosts/alys/configuration.nix; - }; - elcafe = nixpkgs.lib.nixosSystem { - inherit specialArgs; - modules = withSystemModules ./hosts/elcafe/configuration.nix; - }; - gampo = nixpkgs.lib.nixosSystem { - inherit specialArgs; - modules = withSystemModules ./hosts/gampo/configuration.nix; - }; - marpa = nixpkgs.lib.nixosSystem { - inherit specialArgs; - modules = withSystemModules ./hosts/marpa/configuration.nix; - }; - NaroMk3 = nixpkgs.lib.nixosSystem { - inherit specialArgs; - modules = withSystemModules [ - srvos.nixosModules.server - srvos.nixosModules.hardware-hetzner-cloud - srvos.nixosModules.mixins-terminfo - ./hosts/naromk3/configuration.nix - ]; - }; - tilo = nixpkgs.lib.nixosSystem { - inherit specialArgs; - modules = withSystemModules ./hosts/tilo/configuration.nix; - }; - }; - }; + nixosConfigurations = let + specialArgs = {inherit inputs outputs;}; + defaultSystemModules = [ + inputs.sops-nix.nixosModules.sops + inputs.copyparty.nixosModules.default + ]; + withSystemModules = modules: nixpkgs.lib.lists.flatten (defaultSystemModules ++ [modules]); + in { + alys = nixpkgs.lib.nixosSystem { + inherit specialArgs; + modules = withSystemModules ./hosts/alys/configuration.nix; + }; + elcafe = nixpkgs.lib.nixosSystem { + inherit specialArgs; + modules = withSystemModules ./hosts/elcafe/configuration.nix; + }; + gampo = nixpkgs.lib.nixosSystem { + inherit specialArgs; + modules = withSystemModules ./hosts/gampo/configuration.nix; + }; + marpa = nixpkgs.lib.nixosSystem { + inherit specialArgs; + modules = withSystemModules ./hosts/marpa/configuration.nix; + }; + NaroMk3 = nixpkgs.lib.nixosSystem { + inherit specialArgs; + modules = withSystemModules [ + srvos.nixosModules.server + srvos.nixosModules.hardware-hetzner-cloud + srvos.nixosModules.mixins-terminfo + ./hosts/naromk3/configuration.nix + ]; + }; + tilo = nixpkgs.lib.nixosSystem { + inherit specialArgs; + modules = withSystemModules ./hosts/tilo/configuration.nix; + }; + }; + }; + } + ); } diff --git a/users/modules/dev/vcs/git.nix b/users/modules/dev/vcs/git.nix index 8ee2ea0..7627e55 100644 --- a/users/modules/dev/vcs/git.nix +++ b/users/modules/dev/vcs/git.nix @@ -128,7 +128,10 @@ in { "dist/" ]; signing = { - format = if cfg.publicKeyFile != null then "ssh" else "openpgp"; + format = + if cfg.publicKeyFile != null + then "ssh" + else "openpgp"; key = cfg.publicKeyFile; signByDefault = true; };