mirror of
https://git.sr.ht/~magic_rb/dotfiles
synced 2024-11-26 01:56:13 +01:00
Clean up inputs and unfree package handling
Signed-off-by: magic_rb <magic_rb@redalder.org>
This commit is contained in:
magic_rb
parent
003f9d439b
commit
0b9583b4d3
|
|
@ -3,21 +3,20 @@
|
|||
"buildbot-nix": {
|
||||
"inputs": {
|
||||
"flake-parts": "flake-parts",
|
||||
"nixpkgs": "nixpkgs",
|
||||
"nixpkgs": [
|
||||
"nixpkgs"
|
||||
],
|
||||
"treefmt-nix": "treefmt-nix"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1715218973,
|
||||
"narHash": "sha256-m0S9B5qw1g+NCxlq3CW4OtVwndbe54Qvbxe9FnbwUSM=",
|
||||
"owner": "Mic92",
|
||||
"repo": "buildbot-nix",
|
||||
"rev": "4de786e7da1151970b8b27835a700c0da4f71162",
|
||||
"type": "github"
|
||||
"lastModified": 1716142659,
|
||||
"narHash": "sha256-b1CzVmxGNkRpFZZcAlMIv6wJj1JaaQMds9SLZ0fOwNE=",
|
||||
"path": "/home/main/repos/buildbot-nix",
|
||||
"type": "path"
|
||||
},
|
||||
"original": {
|
||||
"owner": "Mic92",
|
||||
"repo": "buildbot-nix",
|
||||
"type": "github"
|
||||
"path": "/home/main/repos/buildbot-nix",
|
||||
"type": "path"
|
||||
}
|
||||
},
|
||||
"chaotic-nyx": {
|
||||
|
|
@ -173,7 +172,7 @@
|
|||
},
|
||||
"disko": {
|
||||
"inputs": {
|
||||
"nixpkgs": "nixpkgs_2"
|
||||
"nixpkgs": "nixpkgs"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1707385478,
|
||||
|
|
@ -227,22 +226,6 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"dotool": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1685633694,
|
||||
"narHash": "sha256-z0fQ+qenHjtoriYSD2sOjEvfLVtZcMJbvnjKZFRSsMA=",
|
||||
"owner": "~geb",
|
||||
"repo": "dotool",
|
||||
"rev": "eb41d9d70cf96d36a008313704933238f1e88f84",
|
||||
"type": "sourcehut"
|
||||
},
|
||||
"original": {
|
||||
"owner": "~geb",
|
||||
"repo": "dotool",
|
||||
"type": "sourcehut"
|
||||
}
|
||||
},
|
||||
"dwarffs": {
|
||||
"inputs": {
|
||||
"nix": [
|
||||
|
|
@ -404,11 +387,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1712014858,
|
||||
"narHash": "sha256-sB4SWl2lX95bExY2gMFG5HIzvva5AVMJd4Igm+GpZNw=",
|
||||
"lastModified": 1714641030,
|
||||
"narHash": "sha256-yzcRNDoyVP7+SCNX0wmuDju1NUCt8Dz9+lyUXEI0dbI=",
|
||||
"owner": "hercules-ci",
|
||||
"repo": "flake-parts",
|
||||
"rev": "9126214d0a59633752a136528f5f3b9aa8565b7d",
|
||||
"rev": "e5d10a24b66c3ea8f150e47dfdb0416ab7c3390e",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -724,7 +707,7 @@
|
|||
},
|
||||
"home-manager": {
|
||||
"inputs": {
|
||||
"nixpkgs": "nixpkgs_3"
|
||||
"nixpkgs": "nixpkgs_2"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1707175763,
|
||||
|
|
@ -744,7 +727,7 @@
|
|||
"hydra": {
|
||||
"inputs": {
|
||||
"nix": "nix",
|
||||
"nixpkgs": "nixpkgs_4",
|
||||
"nixpkgs": "nixpkgs_3",
|
||||
"nixpkgs-for-fileset": "nixpkgs-for-fileset"
|
||||
},
|
||||
"locked": {
|
||||
|
|
@ -907,7 +890,7 @@
|
|||
"microvm": {
|
||||
"inputs": {
|
||||
"flake-utils": "flake-utils",
|
||||
"nixpkgs": "nixpkgs_5",
|
||||
"nixpkgs": "nixpkgs_4",
|
||||
"spectrum": "spectrum"
|
||||
},
|
||||
"locked": {
|
||||
|
|
@ -943,7 +926,7 @@
|
|||
"nil": {
|
||||
"inputs": {
|
||||
"flake-utils": "flake-utils_2",
|
||||
"nixpkgs": "nixpkgs_6",
|
||||
"nixpkgs": "nixpkgs_5",
|
||||
"rust-overlay": "rust-overlay_2"
|
||||
},
|
||||
"locked": {
|
||||
|
|
@ -1041,7 +1024,7 @@
|
|||
"inputs": {
|
||||
"flake-parts": "flake-parts_3",
|
||||
"nix-github-actions": "nix-github-actions_2",
|
||||
"nixpkgs": "nixpkgs_8",
|
||||
"nixpkgs": "nixpkgs_7",
|
||||
"treefmt-nix": "treefmt-nix_2"
|
||||
},
|
||||
"locked": {
|
||||
|
|
@ -1061,7 +1044,7 @@
|
|||
"nix-fast-build": {
|
||||
"inputs": {
|
||||
"flake-parts": "flake-parts_4",
|
||||
"nixpkgs": "nixpkgs_9",
|
||||
"nixpkgs": "nixpkgs_8",
|
||||
"treefmt-nix": "treefmt-nix_3"
|
||||
},
|
||||
"locked": {
|
||||
|
|
@ -1165,7 +1148,7 @@
|
|||
"inputs": {
|
||||
"flake-compat": "flake-compat_3",
|
||||
"flake-parts": "flake-parts_5",
|
||||
"nixpkgs": "nixpkgs_10"
|
||||
"nixpkgs": "nixpkgs_9"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1711277484,
|
||||
|
|
@ -1185,7 +1168,7 @@
|
|||
"inputs": {
|
||||
"flake-compat": "flake-compat_2",
|
||||
"libgit2": "libgit2_2",
|
||||
"nixpkgs": "nixpkgs_7",
|
||||
"nixpkgs": "nixpkgs_6",
|
||||
"nixpkgs-regression": "nixpkgs-regression_2"
|
||||
},
|
||||
"locked": {
|
||||
|
|
@ -1202,27 +1185,9 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixinate": {
|
||||
"inputs": {
|
||||
"nixpkgs": "nixpkgs_11"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1682599469,
|
||||
"narHash": "sha256-BXptkIWvU6RyNb9V0FWK64hpXp+s7UqEUALkZLQZWyk=",
|
||||
"owner": "MagicRB",
|
||||
"repo": "nixinate",
|
||||
"rev": "dedba33b205866e620424db58842900cb5afae2c",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "MagicRB",
|
||||
"repo": "nixinate",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixng": {
|
||||
"inputs": {
|
||||
"nixpkgs": "nixpkgs_12"
|
||||
"nixpkgs": "nixpkgs_10"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1713260674,
|
||||
|
|
@ -1237,7 +1202,7 @@
|
|||
},
|
||||
"nixng_2": {
|
||||
"inputs": {
|
||||
"nixpkgs": "nixpkgs_20"
|
||||
"nixpkgs": "nixpkgs_17"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1686222921,
|
||||
|
|
@ -1257,7 +1222,7 @@
|
|||
"flake-parts": "flake-parts_6",
|
||||
"nixos-images": "nixos-images",
|
||||
"nixos-stable": "nixos-stable",
|
||||
"nixpkgs": "nixpkgs_13",
|
||||
"nixpkgs": "nixpkgs_11",
|
||||
"treefmt-nix": "treefmt-nix_4"
|
||||
},
|
||||
"locked": {
|
||||
|
|
@ -1317,16 +1282,16 @@
|
|||
},
|
||||
"nixpkgs": {
|
||||
"locked": {
|
||||
"lastModified": 1713368829,
|
||||
"narHash": "sha256-EreStuOxwalGOy5seV5PGc3zDT1Ppqj/4Q3ByAOGMnY=",
|
||||
"owner": "Nixos",
|
||||
"lastModified": 1707268954,
|
||||
"narHash": "sha256-2en1kvde3cJVc3ZnTy8QeD2oKcseLFjYPLKhIGDanQ0=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "203fac824e2fdfed2e3a832b8123d9a64ee58b43",
|
||||
"rev": "f8e2ebd66d097614d51a56a755450d4ae1632df1",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "Nixos",
|
||||
"ref": "nixos-unstable-small",
|
||||
"owner": "NixOS",
|
||||
"ref": "nixpkgs-unstable",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
|
|
@ -1347,22 +1312,6 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs-hashicorp": {
|
||||
"locked": {
|
||||
"lastModified": 1707268954,
|
||||
"narHash": "sha256-2en1kvde3cJVc3ZnTy8QeD2oKcseLFjYPLKhIGDanQ0=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "f8e2ebd66d097614d51a56a755450d4ae1632df1",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "NixOS",
|
||||
"ref": "nixos-unstable",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs-lib": {
|
||||
"locked": {
|
||||
"dir": "lib",
|
||||
|
|
@ -1469,16 +1418,16 @@
|
|||
},
|
||||
"nixpkgs-stable": {
|
||||
"locked": {
|
||||
"lastModified": 1704290814,
|
||||
"narHash": "sha256-LWvKHp7kGxk/GEtlrGYV68qIvPHkU9iToomNFGagixU=",
|
||||
"lastModified": 1716218643,
|
||||
"narHash": "sha256-i/E7gzQybvcGAYDRGDl39WL6yVk30Je/NXypBz6/nmM=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "70bdadeb94ffc8806c0570eb5c2695ad29f0e421",
|
||||
"rev": "a8695cbd09a7ecf3376bd62c798b9864d20f86ee",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "NixOS",
|
||||
"ref": "nixos-23.05",
|
||||
"ref": "nixos-23.11",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
|
|
@ -1515,38 +1464,23 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs_10": {
|
||||
"nixpkgs-unstable": {
|
||||
"locked": {
|
||||
"lastModified": 1704420045,
|
||||
"narHash": "sha256-C36QmoJd5tdQ5R9MC1jM7fBkZW9zBUqbUCsgwS6j4QU=",
|
||||
"lastModified": 1716137900,
|
||||
"narHash": "sha256-sowPU+tLQv8GlqtVtsXioTKeaQvlMz/pefcdwg8MvfM=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "c1be43e8e837b8dbee2b3665a007e761680f0c3d",
|
||||
"rev": "6c0b7a92c30122196a761b440ac0d46d3d9954f1",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"id": "nixpkgs",
|
||||
"ref": "nixos-23.11",
|
||||
"type": "indirect"
|
||||
}
|
||||
},
|
||||
"nixpkgs_11": {
|
||||
"locked": {
|
||||
"lastModified": 1653060744,
|
||||
"narHash": "sha256-kfRusllRumpt33J1hPV+CeCCylCXEU7e0gn2/cIM7cY=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "dfd82985c273aac6eced03625f454b334daae2e8",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nixos",
|
||||
"owner": "NixOS",
|
||||
"ref": "nixos-unstable",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs_12": {
|
||||
"nixpkgs_10": {
|
||||
"locked": {
|
||||
"lastModified": 1668984258,
|
||||
"narHash": "sha256-0gDMJ2T3qf58xgcSbYoXiRGUkPWmKyr5C3vcathWhKs=",
|
||||
|
|
@ -1562,7 +1496,7 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs_13": {
|
||||
"nixpkgs_11": {
|
||||
"locked": {
|
||||
"lastModified": 1702310776,
|
||||
"narHash": "sha256-T2KJpsNjAytMsP6+xrhXfAb2KTG6Yt2D4hTTugpsJFo=",
|
||||
|
|
@ -1578,7 +1512,7 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs_14": {
|
||||
"nixpkgs_12": {
|
||||
"locked": {
|
||||
"lastModified": 1707268954,
|
||||
"narHash": "sha256-2en1kvde3cJVc3ZnTy8QeD2oKcseLFjYPLKhIGDanQ0=",
|
||||
|
|
@ -1594,7 +1528,7 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs_15": {
|
||||
"nixpkgs_13": {
|
||||
"locked": {
|
||||
"lastModified": 1686412476,
|
||||
"narHash": "sha256-inl9SVk6o5h75XKC79qrDCAobTD1Jxh6kVYTZKHzewA=",
|
||||
|
|
@ -1607,23 +1541,7 @@
|
|||
"type": "indirect"
|
||||
}
|
||||
},
|
||||
"nixpkgs_16": {
|
||||
"locked": {
|
||||
"lastModified": 1689885880,
|
||||
"narHash": "sha256-2ikAcvHKkKh8J/eUrwMA+wy1poscC+oL1RkN1V3RmT8=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "fa793b06f56896b7d1909e4b69977c7bf842b2f0",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "NixOS",
|
||||
"ref": "nixos-23.05",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs_17": {
|
||||
"nixpkgs_14": {
|
||||
"locked": {
|
||||
"lastModified": 1704842529,
|
||||
"narHash": "sha256-OTeQA+F8d/Evad33JMfuXC89VMetQbsU4qcaePchGr4=",
|
||||
|
|
@ -1639,7 +1557,7 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs_18": {
|
||||
"nixpkgs_15": {
|
||||
"locked": {
|
||||
"lastModified": 1701282334,
|
||||
"narHash": "sha256-MxCVrXY6v4QmfTwIysjjaX0XUhqBbxTWWB4HXtDYsdk=",
|
||||
|
|
@ -1655,7 +1573,7 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs_19": {
|
||||
"nixpkgs_16": {
|
||||
"locked": {
|
||||
"lastModified": 1676569297,
|
||||
"narHash": "sha256-2n4C4H3/U+3YbDrQB6xIw7AaLdFISCCFwOkcETAigqU=",
|
||||
|
|
@ -1668,23 +1586,7 @@
|
|||
"type": "indirect"
|
||||
}
|
||||
},
|
||||
"nixpkgs_2": {
|
||||
"locked": {
|
||||
"lastModified": 1707268954,
|
||||
"narHash": "sha256-2en1kvde3cJVc3ZnTy8QeD2oKcseLFjYPLKhIGDanQ0=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "f8e2ebd66d097614d51a56a755450d4ae1632df1",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "NixOS",
|
||||
"ref": "nixpkgs-unstable",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs_20": {
|
||||
"nixpkgs_17": {
|
||||
"locked": {
|
||||
"lastModified": 1668984258,
|
||||
"narHash": "sha256-0gDMJ2T3qf58xgcSbYoXiRGUkPWmKyr5C3vcathWhKs=",
|
||||
|
|
@ -1700,7 +1602,7 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs_21": {
|
||||
"nixpkgs_18": {
|
||||
"locked": {
|
||||
"lastModified": 1693565476,
|
||||
"narHash": "sha256-ya00zHt7YbPo3ve/wNZ/6nts61xt7wK/APa6aZAfey0=",
|
||||
|
|
@ -1716,7 +1618,7 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs_3": {
|
||||
"nixpkgs_2": {
|
||||
"locked": {
|
||||
"lastModified": 1706732774,
|
||||
"narHash": "sha256-hqJlyJk4MRpcItGYMF+3uHe8HvxNETWvlGtLuVpqLU0=",
|
||||
|
|
@ -1732,7 +1634,7 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs_4": {
|
||||
"nixpkgs_3": {
|
||||
"locked": {
|
||||
"lastModified": 1705033721,
|
||||
"narHash": "sha256-K5eJHmL1/kev6WuqyqqbS1cdNnSidIZ3jeqJ7GbrYnQ=",
|
||||
|
|
@ -1748,7 +1650,7 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs_5": {
|
||||
"nixpkgs_4": {
|
||||
"locked": {
|
||||
"lastModified": 1702312524,
|
||||
"narHash": "sha256-gkZJRDBUCpTPBvQk25G0B7vfbpEYM5s5OZqghkjZsnE=",
|
||||
|
|
@ -1764,7 +1666,7 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs_6": {
|
||||
"nixpkgs_5": {
|
||||
"locked": {
|
||||
"lastModified": 1704161960,
|
||||
"narHash": "sha256-QGua89Pmq+FBAro8NriTuoO/wNaUtugt29/qqA8zeeM=",
|
||||
|
|
@ -1780,7 +1682,7 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs_7": {
|
||||
"nixpkgs_6": {
|
||||
"locked": {
|
||||
"lastModified": 1705033721,
|
||||
"narHash": "sha256-K5eJHmL1/kev6WuqyqqbS1cdNnSidIZ3jeqJ7GbrYnQ=",
|
||||
|
|
@ -1796,7 +1698,7 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs_8": {
|
||||
"nixpkgs_7": {
|
||||
"locked": {
|
||||
"lastModified": 1703134684,
|
||||
"narHash": "sha256-SQmng1EnBFLzS7WSRyPM9HgmZP2kLJcPAz+Ug/nug6o=",
|
||||
|
|
@ -1812,7 +1714,7 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs_9": {
|
||||
"nixpkgs_8": {
|
||||
"locked": {
|
||||
"lastModified": 1698890957,
|
||||
"narHash": "sha256-DJ+SppjpPBoJr0Aro9TAcP3sxApCSieY6BYBCoWGUX8=",
|
||||
|
|
@ -1828,9 +1730,24 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs_9": {
|
||||
"locked": {
|
||||
"lastModified": 1704420045,
|
||||
"narHash": "sha256-C36QmoJd5tdQ5R9MC1jM7fBkZW9zBUqbUCsgwS6j4QU=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "c1be43e8e837b8dbee2b3665a007e761680f0c3d",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"id": "nixpkgs",
|
||||
"ref": "nixos-23.11",
|
||||
"type": "indirect"
|
||||
}
|
||||
},
|
||||
"notnft": {
|
||||
"inputs": {
|
||||
"nixpkgs": "nixpkgs_15"
|
||||
"nixpkgs": "nixpkgs_13"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1700483422,
|
||||
|
|
@ -1846,42 +1763,6 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"numen": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1687545106,
|
||||
"narHash": "sha256-hBtNubasdPlvrUuX5+wxZXrfbCy5cBIauxuKMMXljmY=",
|
||||
"owner": "~geb",
|
||||
"repo": "numen",
|
||||
"rev": "80eaf6cef677a9353d29ad7d663885406404c3c3",
|
||||
"type": "sourcehut"
|
||||
},
|
||||
"original": {
|
||||
"owner": "~geb",
|
||||
"repo": "numen",
|
||||
"type": "sourcehut"
|
||||
}
|
||||
},
|
||||
"numen-nix": {
|
||||
"inputs": {
|
||||
"dotool": "dotool",
|
||||
"nixpkgs": "nixpkgs_16",
|
||||
"numen": "numen"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1699002865,
|
||||
"narHash": "sha256-uvgO61FUuqLVW3uzoTYvwWwHMJ5cmIk1SGqP8E+X3C8=",
|
||||
"owner": "anpandey",
|
||||
"repo": "numen-nix",
|
||||
"rev": "b9b81a41b1da7d36ce074bc8894ecd64cdf7b945",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "anpandey",
|
||||
"repo": "numen-nix",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"org-special-block-extras": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
|
|
@ -1919,7 +1800,7 @@
|
|||
"flake-compat": "flake-compat_4",
|
||||
"flake-utils": "flake-utils_3",
|
||||
"gitignore": "gitignore",
|
||||
"nixpkgs": "nixpkgs_17",
|
||||
"nixpkgs": "nixpkgs_14",
|
||||
"nixpkgs-stable": "nixpkgs-stable_2"
|
||||
},
|
||||
"locked": {
|
||||
|
|
@ -1999,14 +1880,12 @@
|
|||
"nix-fast-build": "nix-fast-build",
|
||||
"nix-gaming": "nix-gaming",
|
||||
"nix-snapshotter": "nix-snapshotter",
|
||||
"nixinate": "nixinate",
|
||||
"nixng": "nixng",
|
||||
"nixos-anywhere": "nixos-anywhere",
|
||||
"nixpkgs": "nixpkgs_14",
|
||||
"nixpkgs-hashicorp": "nixpkgs-hashicorp",
|
||||
"nixpkgs": "nixpkgs_12",
|
||||
"nixpkgs-stable": "nixpkgs-stable",
|
||||
"nixpkgs-unstable": "nixpkgs-unstable",
|
||||
"notnft": "notnft",
|
||||
"numen-nix": "numen-nix",
|
||||
"pre-commit-hooks": "pre-commit-hooks",
|
||||
"secret": "secret",
|
||||
"thingiverse-downloader": "thingiverse-downloader",
|
||||
|
|
@ -2262,11 +2141,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1711963903,
|
||||
"narHash": "sha256-N3QDhoaX+paWXHbEXZapqd1r95mdshxToGowtjtYkGI=",
|
||||
"lastModified": 1714058656,
|
||||
"narHash": "sha256-Qv4RBm4LKuO4fNOfx9wl40W2rBbv5u5m+whxRYUMiaA=",
|
||||
"owner": "numtide",
|
||||
"repo": "treefmt-nix",
|
||||
"rev": "49dc4a92b02b8e68798abd99184f228243b6e3ac",
|
||||
"rev": "c6aaf729f34a36c445618580a9f95a48f5e4e03f",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -2406,7 +2285,7 @@
|
|||
"nixng": [
|
||||
"nixng"
|
||||
],
|
||||
"nixpkgs": "nixpkgs_18"
|
||||
"nixpkgs": "nixpkgs_15"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1713624078,
|
||||
|
|
@ -2422,7 +2301,7 @@
|
|||
"uterranix": {
|
||||
"inputs": {
|
||||
"flake-parts": "flake-parts_8",
|
||||
"nixpkgs": "nixpkgs_19",
|
||||
"nixpkgs": "nixpkgs_16",
|
||||
"terranix": "terranix"
|
||||
},
|
||||
"locked": {
|
||||
|
|
@ -2483,7 +2362,7 @@
|
|||
"modus-themes": "modus-themes",
|
||||
"nix-mode": "nix-mode",
|
||||
"nixng": "nixng_2",
|
||||
"nixpkgs": "nixpkgs_21",
|
||||
"nixpkgs": "nixpkgs_18",
|
||||
"org-special-block-extras": "org-special-block-extras",
|
||||
"org-thtml": "org-thtml",
|
||||
"s-el": "s-el",
|
||||
|
|
|
|||
281
flake.lock
281
flake.lock
|
|
@ -3,21 +3,20 @@
|
|||
"buildbot-nix": {
|
||||
"inputs": {
|
||||
"flake-parts": "flake-parts",
|
||||
"nixpkgs": "nixpkgs",
|
||||
"nixpkgs": [
|
||||
"nixpkgs"
|
||||
],
|
||||
"treefmt-nix": "treefmt-nix"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1715218973,
|
||||
"narHash": "sha256-m0S9B5qw1g+NCxlq3CW4OtVwndbe54Qvbxe9FnbwUSM=",
|
||||
"owner": "Mic92",
|
||||
"repo": "buildbot-nix",
|
||||
"rev": "4de786e7da1151970b8b27835a700c0da4f71162",
|
||||
"type": "github"
|
||||
"lastModified": 1716142659,
|
||||
"narHash": "sha256-b1CzVmxGNkRpFZZcAlMIv6wJj1JaaQMds9SLZ0fOwNE=",
|
||||
"path": "/home/main/repos/buildbot-nix",
|
||||
"type": "path"
|
||||
},
|
||||
"original": {
|
||||
"owner": "Mic92",
|
||||
"repo": "buildbot-nix",
|
||||
"type": "github"
|
||||
"path": "/home/main/repos/buildbot-nix",
|
||||
"type": "path"
|
||||
}
|
||||
},
|
||||
"chaotic-nyx": {
|
||||
|
|
@ -173,7 +172,7 @@
|
|||
},
|
||||
"disko": {
|
||||
"inputs": {
|
||||
"nixpkgs": "nixpkgs_2"
|
||||
"nixpkgs": "nixpkgs"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1707385478,
|
||||
|
|
@ -227,22 +226,6 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"dotool": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1685633694,
|
||||
"narHash": "sha256-z0fQ+qenHjtoriYSD2sOjEvfLVtZcMJbvnjKZFRSsMA=",
|
||||
"owner": "~geb",
|
||||
"repo": "dotool",
|
||||
"rev": "eb41d9d70cf96d36a008313704933238f1e88f84",
|
||||
"type": "sourcehut"
|
||||
},
|
||||
"original": {
|
||||
"owner": "~geb",
|
||||
"repo": "dotool",
|
||||
"type": "sourcehut"
|
||||
}
|
||||
},
|
||||
"dwarffs": {
|
||||
"inputs": {
|
||||
"nix": [
|
||||
|
|
@ -404,11 +387,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1712014858,
|
||||
"narHash": "sha256-sB4SWl2lX95bExY2gMFG5HIzvva5AVMJd4Igm+GpZNw=",
|
||||
"lastModified": 1714641030,
|
||||
"narHash": "sha256-yzcRNDoyVP7+SCNX0wmuDju1NUCt8Dz9+lyUXEI0dbI=",
|
||||
"owner": "hercules-ci",
|
||||
"repo": "flake-parts",
|
||||
"rev": "9126214d0a59633752a136528f5f3b9aa8565b7d",
|
||||
"rev": "e5d10a24b66c3ea8f150e47dfdb0416ab7c3390e",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -724,7 +707,7 @@
|
|||
},
|
||||
"home-manager": {
|
||||
"inputs": {
|
||||
"nixpkgs": "nixpkgs_3"
|
||||
"nixpkgs": "nixpkgs_2"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1707175763,
|
||||
|
|
@ -744,7 +727,7 @@
|
|||
"hydra": {
|
||||
"inputs": {
|
||||
"nix": "nix",
|
||||
"nixpkgs": "nixpkgs_4",
|
||||
"nixpkgs": "nixpkgs_3",
|
||||
"nixpkgs-for-fileset": "nixpkgs-for-fileset"
|
||||
},
|
||||
"locked": {
|
||||
|
|
@ -907,7 +890,7 @@
|
|||
"microvm": {
|
||||
"inputs": {
|
||||
"flake-utils": "flake-utils",
|
||||
"nixpkgs": "nixpkgs_5",
|
||||
"nixpkgs": "nixpkgs_4",
|
||||
"spectrum": "spectrum"
|
||||
},
|
||||
"locked": {
|
||||
|
|
@ -943,7 +926,7 @@
|
|||
"nil": {
|
||||
"inputs": {
|
||||
"flake-utils": "flake-utils_2",
|
||||
"nixpkgs": "nixpkgs_6",
|
||||
"nixpkgs": "nixpkgs_5",
|
||||
"rust-overlay": "rust-overlay_2"
|
||||
},
|
||||
"locked": {
|
||||
|
|
@ -1041,7 +1024,7 @@
|
|||
"inputs": {
|
||||
"flake-parts": "flake-parts_3",
|
||||
"nix-github-actions": "nix-github-actions_2",
|
||||
"nixpkgs": "nixpkgs_8",
|
||||
"nixpkgs": "nixpkgs_7",
|
||||
"treefmt-nix": "treefmt-nix_2"
|
||||
},
|
||||
"locked": {
|
||||
|
|
@ -1061,7 +1044,7 @@
|
|||
"nix-fast-build": {
|
||||
"inputs": {
|
||||
"flake-parts": "flake-parts_4",
|
||||
"nixpkgs": "nixpkgs_9",
|
||||
"nixpkgs": "nixpkgs_8",
|
||||
"treefmt-nix": "treefmt-nix_3"
|
||||
},
|
||||
"locked": {
|
||||
|
|
@ -1165,7 +1148,7 @@
|
|||
"inputs": {
|
||||
"flake-compat": "flake-compat_3",
|
||||
"flake-parts": "flake-parts_5",
|
||||
"nixpkgs": "nixpkgs_10"
|
||||
"nixpkgs": "nixpkgs_9"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1711277484,
|
||||
|
|
@ -1185,7 +1168,7 @@
|
|||
"inputs": {
|
||||
"flake-compat": "flake-compat_2",
|
||||
"libgit2": "libgit2_2",
|
||||
"nixpkgs": "nixpkgs_7",
|
||||
"nixpkgs": "nixpkgs_6",
|
||||
"nixpkgs-regression": "nixpkgs-regression_2"
|
||||
},
|
||||
"locked": {
|
||||
|
|
@ -1202,27 +1185,9 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixinate": {
|
||||
"inputs": {
|
||||
"nixpkgs": "nixpkgs_11"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1682599469,
|
||||
"narHash": "sha256-BXptkIWvU6RyNb9V0FWK64hpXp+s7UqEUALkZLQZWyk=",
|
||||
"owner": "MagicRB",
|
||||
"repo": "nixinate",
|
||||
"rev": "dedba33b205866e620424db58842900cb5afae2c",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "MagicRB",
|
||||
"repo": "nixinate",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixng": {
|
||||
"inputs": {
|
||||
"nixpkgs": "nixpkgs_12"
|
||||
"nixpkgs": "nixpkgs_10"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1713260674,
|
||||
|
|
@ -1237,7 +1202,7 @@
|
|||
},
|
||||
"nixng_2": {
|
||||
"inputs": {
|
||||
"nixpkgs": "nixpkgs_20"
|
||||
"nixpkgs": "nixpkgs_17"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1686222921,
|
||||
|
|
@ -1257,7 +1222,7 @@
|
|||
"flake-parts": "flake-parts_6",
|
||||
"nixos-images": "nixos-images",
|
||||
"nixos-stable": "nixos-stable",
|
||||
"nixpkgs": "nixpkgs_13",
|
||||
"nixpkgs": "nixpkgs_11",
|
||||
"treefmt-nix": "treefmt-nix_4"
|
||||
},
|
||||
"locked": {
|
||||
|
|
@ -1317,16 +1282,16 @@
|
|||
},
|
||||
"nixpkgs": {
|
||||
"locked": {
|
||||
"lastModified": 1713368829,
|
||||
"narHash": "sha256-EreStuOxwalGOy5seV5PGc3zDT1Ppqj/4Q3ByAOGMnY=",
|
||||
"owner": "Nixos",
|
||||
"lastModified": 1707268954,
|
||||
"narHash": "sha256-2en1kvde3cJVc3ZnTy8QeD2oKcseLFjYPLKhIGDanQ0=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "203fac824e2fdfed2e3a832b8123d9a64ee58b43",
|
||||
"rev": "f8e2ebd66d097614d51a56a755450d4ae1632df1",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "Nixos",
|
||||
"ref": "nixos-unstable-small",
|
||||
"owner": "NixOS",
|
||||
"ref": "nixpkgs-unstable",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
|
|
@ -1347,22 +1312,6 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs-hashicorp": {
|
||||
"locked": {
|
||||
"lastModified": 1707268954,
|
||||
"narHash": "sha256-2en1kvde3cJVc3ZnTy8QeD2oKcseLFjYPLKhIGDanQ0=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "f8e2ebd66d097614d51a56a755450d4ae1632df1",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "NixOS",
|
||||
"ref": "nixos-unstable",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs-lib": {
|
||||
"locked": {
|
||||
"dir": "lib",
|
||||
|
|
@ -1469,16 +1418,16 @@
|
|||
},
|
||||
"nixpkgs-stable": {
|
||||
"locked": {
|
||||
"lastModified": 1704290814,
|
||||
"narHash": "sha256-LWvKHp7kGxk/GEtlrGYV68qIvPHkU9iToomNFGagixU=",
|
||||
"lastModified": 1716218643,
|
||||
"narHash": "sha256-i/E7gzQybvcGAYDRGDl39WL6yVk30Je/NXypBz6/nmM=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "70bdadeb94ffc8806c0570eb5c2695ad29f0e421",
|
||||
"rev": "a8695cbd09a7ecf3376bd62c798b9864d20f86ee",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "NixOS",
|
||||
"ref": "nixos-23.05",
|
||||
"ref": "nixos-23.11",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
|
|
@ -1515,38 +1464,23 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs_10": {
|
||||
"nixpkgs-unstable": {
|
||||
"locked": {
|
||||
"lastModified": 1704420045,
|
||||
"narHash": "sha256-C36QmoJd5tdQ5R9MC1jM7fBkZW9zBUqbUCsgwS6j4QU=",
|
||||
"lastModified": 1716137900,
|
||||
"narHash": "sha256-sowPU+tLQv8GlqtVtsXioTKeaQvlMz/pefcdwg8MvfM=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "c1be43e8e837b8dbee2b3665a007e761680f0c3d",
|
||||
"rev": "6c0b7a92c30122196a761b440ac0d46d3d9954f1",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"id": "nixpkgs",
|
||||
"ref": "nixos-23.11",
|
||||
"type": "indirect"
|
||||
}
|
||||
},
|
||||
"nixpkgs_11": {
|
||||
"locked": {
|
||||
"lastModified": 1653060744,
|
||||
"narHash": "sha256-kfRusllRumpt33J1hPV+CeCCylCXEU7e0gn2/cIM7cY=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "dfd82985c273aac6eced03625f454b334daae2e8",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nixos",
|
||||
"owner": "NixOS",
|
||||
"ref": "nixos-unstable",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs_12": {
|
||||
"nixpkgs_10": {
|
||||
"locked": {
|
||||
"lastModified": 1668984258,
|
||||
"narHash": "sha256-0gDMJ2T3qf58xgcSbYoXiRGUkPWmKyr5C3vcathWhKs=",
|
||||
|
|
@ -1562,7 +1496,7 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs_13": {
|
||||
"nixpkgs_11": {
|
||||
"locked": {
|
||||
"lastModified": 1702310776,
|
||||
"narHash": "sha256-T2KJpsNjAytMsP6+xrhXfAb2KTG6Yt2D4hTTugpsJFo=",
|
||||
|
|
@ -1578,7 +1512,7 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs_14": {
|
||||
"nixpkgs_12": {
|
||||
"locked": {
|
||||
"lastModified": 1707268954,
|
||||
"narHash": "sha256-2en1kvde3cJVc3ZnTy8QeD2oKcseLFjYPLKhIGDanQ0=",
|
||||
|
|
@ -1594,7 +1528,7 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs_15": {
|
||||
"nixpkgs_13": {
|
||||
"locked": {
|
||||
"lastModified": 1686412476,
|
||||
"narHash": "sha256-inl9SVk6o5h75XKC79qrDCAobTD1Jxh6kVYTZKHzewA=",
|
||||
|
|
@ -1607,23 +1541,7 @@
|
|||
"type": "indirect"
|
||||
}
|
||||
},
|
||||
"nixpkgs_16": {
|
||||
"locked": {
|
||||
"lastModified": 1689885880,
|
||||
"narHash": "sha256-2ikAcvHKkKh8J/eUrwMA+wy1poscC+oL1RkN1V3RmT8=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "fa793b06f56896b7d1909e4b69977c7bf842b2f0",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "NixOS",
|
||||
"ref": "nixos-23.05",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs_17": {
|
||||
"nixpkgs_14": {
|
||||
"locked": {
|
||||
"lastModified": 1704842529,
|
||||
"narHash": "sha256-OTeQA+F8d/Evad33JMfuXC89VMetQbsU4qcaePchGr4=",
|
||||
|
|
@ -1639,7 +1557,7 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs_18": {
|
||||
"nixpkgs_15": {
|
||||
"locked": {
|
||||
"lastModified": 1701282334,
|
||||
"narHash": "sha256-MxCVrXY6v4QmfTwIysjjaX0XUhqBbxTWWB4HXtDYsdk=",
|
||||
|
|
@ -1655,7 +1573,7 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs_19": {
|
||||
"nixpkgs_16": {
|
||||
"locked": {
|
||||
"lastModified": 1676569297,
|
||||
"narHash": "sha256-2n4C4H3/U+3YbDrQB6xIw7AaLdFISCCFwOkcETAigqU=",
|
||||
|
|
@ -1668,23 +1586,7 @@
|
|||
"type": "indirect"
|
||||
}
|
||||
},
|
||||
"nixpkgs_2": {
|
||||
"locked": {
|
||||
"lastModified": 1707268954,
|
||||
"narHash": "sha256-2en1kvde3cJVc3ZnTy8QeD2oKcseLFjYPLKhIGDanQ0=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "f8e2ebd66d097614d51a56a755450d4ae1632df1",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "NixOS",
|
||||
"ref": "nixpkgs-unstable",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs_20": {
|
||||
"nixpkgs_17": {
|
||||
"locked": {
|
||||
"lastModified": 1668984258,
|
||||
"narHash": "sha256-0gDMJ2T3qf58xgcSbYoXiRGUkPWmKyr5C3vcathWhKs=",
|
||||
|
|
@ -1700,7 +1602,7 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs_21": {
|
||||
"nixpkgs_18": {
|
||||
"locked": {
|
||||
"lastModified": 1693565476,
|
||||
"narHash": "sha256-ya00zHt7YbPo3ve/wNZ/6nts61xt7wK/APa6aZAfey0=",
|
||||
|
|
@ -1716,7 +1618,7 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs_3": {
|
||||
"nixpkgs_2": {
|
||||
"locked": {
|
||||
"lastModified": 1706732774,
|
||||
"narHash": "sha256-hqJlyJk4MRpcItGYMF+3uHe8HvxNETWvlGtLuVpqLU0=",
|
||||
|
|
@ -1732,7 +1634,7 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs_4": {
|
||||
"nixpkgs_3": {
|
||||
"locked": {
|
||||
"lastModified": 1705033721,
|
||||
"narHash": "sha256-K5eJHmL1/kev6WuqyqqbS1cdNnSidIZ3jeqJ7GbrYnQ=",
|
||||
|
|
@ -1748,7 +1650,7 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs_5": {
|
||||
"nixpkgs_4": {
|
||||
"locked": {
|
||||
"lastModified": 1702312524,
|
||||
"narHash": "sha256-gkZJRDBUCpTPBvQk25G0B7vfbpEYM5s5OZqghkjZsnE=",
|
||||
|
|
@ -1764,7 +1666,7 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs_6": {
|
||||
"nixpkgs_5": {
|
||||
"locked": {
|
||||
"lastModified": 1704161960,
|
||||
"narHash": "sha256-QGua89Pmq+FBAro8NriTuoO/wNaUtugt29/qqA8zeeM=",
|
||||
|
|
@ -1780,7 +1682,7 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs_7": {
|
||||
"nixpkgs_6": {
|
||||
"locked": {
|
||||
"lastModified": 1705033721,
|
||||
"narHash": "sha256-K5eJHmL1/kev6WuqyqqbS1cdNnSidIZ3jeqJ7GbrYnQ=",
|
||||
|
|
@ -1796,7 +1698,7 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs_8": {
|
||||
"nixpkgs_7": {
|
||||
"locked": {
|
||||
"lastModified": 1703134684,
|
||||
"narHash": "sha256-SQmng1EnBFLzS7WSRyPM9HgmZP2kLJcPAz+Ug/nug6o=",
|
||||
|
|
@ -1812,7 +1714,7 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs_9": {
|
||||
"nixpkgs_8": {
|
||||
"locked": {
|
||||
"lastModified": 1698890957,
|
||||
"narHash": "sha256-DJ+SppjpPBoJr0Aro9TAcP3sxApCSieY6BYBCoWGUX8=",
|
||||
|
|
@ -1828,9 +1730,24 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs_9": {
|
||||
"locked": {
|
||||
"lastModified": 1704420045,
|
||||
"narHash": "sha256-C36QmoJd5tdQ5R9MC1jM7fBkZW9zBUqbUCsgwS6j4QU=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "c1be43e8e837b8dbee2b3665a007e761680f0c3d",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"id": "nixpkgs",
|
||||
"ref": "nixos-23.11",
|
||||
"type": "indirect"
|
||||
}
|
||||
},
|
||||
"notnft": {
|
||||
"inputs": {
|
||||
"nixpkgs": "nixpkgs_15"
|
||||
"nixpkgs": "nixpkgs_13"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1700483422,
|
||||
|
|
@ -1846,42 +1763,6 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"numen": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1687545106,
|
||||
"narHash": "sha256-hBtNubasdPlvrUuX5+wxZXrfbCy5cBIauxuKMMXljmY=",
|
||||
"owner": "~geb",
|
||||
"repo": "numen",
|
||||
"rev": "80eaf6cef677a9353d29ad7d663885406404c3c3",
|
||||
"type": "sourcehut"
|
||||
},
|
||||
"original": {
|
||||
"owner": "~geb",
|
||||
"repo": "numen",
|
||||
"type": "sourcehut"
|
||||
}
|
||||
},
|
||||
"numen-nix": {
|
||||
"inputs": {
|
||||
"dotool": "dotool",
|
||||
"nixpkgs": "nixpkgs_16",
|
||||
"numen": "numen"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1699002865,
|
||||
"narHash": "sha256-uvgO61FUuqLVW3uzoTYvwWwHMJ5cmIk1SGqP8E+X3C8=",
|
||||
"owner": "anpandey",
|
||||
"repo": "numen-nix",
|
||||
"rev": "b9b81a41b1da7d36ce074bc8894ecd64cdf7b945",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "anpandey",
|
||||
"repo": "numen-nix",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"org-special-block-extras": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
|
|
@ -1919,7 +1800,7 @@
|
|||
"flake-compat": "flake-compat_4",
|
||||
"flake-utils": "flake-utils_3",
|
||||
"gitignore": "gitignore",
|
||||
"nixpkgs": "nixpkgs_17",
|
||||
"nixpkgs": "nixpkgs_14",
|
||||
"nixpkgs-stable": "nixpkgs-stable_2"
|
||||
},
|
||||
"locked": {
|
||||
|
|
@ -1999,14 +1880,12 @@
|
|||
"nix-fast-build": "nix-fast-build",
|
||||
"nix-gaming": "nix-gaming",
|
||||
"nix-snapshotter": "nix-snapshotter",
|
||||
"nixinate": "nixinate",
|
||||
"nixng": "nixng",
|
||||
"nixos-anywhere": "nixos-anywhere",
|
||||
"nixpkgs": "nixpkgs_14",
|
||||
"nixpkgs-hashicorp": "nixpkgs-hashicorp",
|
||||
"nixpkgs": "nixpkgs_12",
|
||||
"nixpkgs-stable": "nixpkgs-stable",
|
||||
"nixpkgs-unstable": "nixpkgs-unstable",
|
||||
"notnft": "notnft",
|
||||
"numen-nix": "numen-nix",
|
||||
"pre-commit-hooks": "pre-commit-hooks",
|
||||
"secret": "secret",
|
||||
"thingiverse-downloader": "thingiverse-downloader",
|
||||
|
|
@ -2264,11 +2143,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1711963903,
|
||||
"narHash": "sha256-N3QDhoaX+paWXHbEXZapqd1r95mdshxToGowtjtYkGI=",
|
||||
"lastModified": 1714058656,
|
||||
"narHash": "sha256-Qv4RBm4LKuO4fNOfx9wl40W2rBbv5u5m+whxRYUMiaA=",
|
||||
"owner": "numtide",
|
||||
"repo": "treefmt-nix",
|
||||
"rev": "49dc4a92b02b8e68798abd99184f228243b6e3ac",
|
||||
"rev": "c6aaf729f34a36c445618580a9f95a48f5e4e03f",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -2408,7 +2287,7 @@
|
|||
"nixng": [
|
||||
"nixng"
|
||||
],
|
||||
"nixpkgs": "nixpkgs_18"
|
||||
"nixpkgs": "nixpkgs_15"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1713624078,
|
||||
|
|
@ -2424,7 +2303,7 @@
|
|||
"uterranix": {
|
||||
"inputs": {
|
||||
"flake-parts": "flake-parts_8",
|
||||
"nixpkgs": "nixpkgs_19",
|
||||
"nixpkgs": "nixpkgs_16",
|
||||
"terranix": "terranix"
|
||||
},
|
||||
"locked": {
|
||||
|
|
@ -2485,7 +2364,7 @@
|
|||
"modus-themes": "modus-themes",
|
||||
"nix-mode": "nix-mode",
|
||||
"nixng": "nixng_2",
|
||||
"nixpkgs": "nixpkgs_21",
|
||||
"nixpkgs": "nixpkgs_18",
|
||||
"org-special-block-extras": "org-special-block-extras",
|
||||
"org-thtml": "org-thtml",
|
||||
"s-el": "s-el",
|
||||
|
|
|
|||
17
flake.nix
17
flake.nix
|
|
@ -4,9 +4,8 @@
|
|||
{
|
||||
inputs = {
|
||||
nixpkgs.url = "github:NixOS/nixpkgs?ref=nixos-unstable";
|
||||
nixpkgs-stable.url = "github:NixOS/nixpkgs?ref=nixos-23.05";
|
||||
nixpkgs-hashicorp.url = "github:NixOS/nixpkgs?ref=nixos-unstable";
|
||||
nixinate.url = "github:MagicRB/nixinate";
|
||||
nixpkgs-unstable.url = "github:NixOS/nixpkgs?ref=nixos-unstable";
|
||||
nixpkgs-stable.url = "github:NixOS/nixpkgs?ref=nixos-23.11";
|
||||
home-manager.url = "github:nix-community/home-manager?ref=master";
|
||||
nixng.url = "path:///home/main/repos/NixNG"; # "github:nix-community/NixNG";
|
||||
flake-parts.url = "github:hercules-ci/flake-parts";
|
||||
|
|
@ -21,7 +20,6 @@
|
|||
microvm.url = "github:astro/microvm.nix";
|
||||
notnft.url = "github:chayleaf/notnft";
|
||||
impermenance.url = "github:MagicRB/impermanence";
|
||||
numen-nix.url = "github:anpandey/numen-nix";
|
||||
hydra.url = "github:NixOS/hydra";
|
||||
nix.url = "github:NixOS/nix";
|
||||
thingiverse-downloader.url = "sourcehut:~magic_rb/thingiverse_downloader";
|
||||
|
|
@ -33,7 +31,8 @@
|
|||
pre-commit-hooks.url = "github:cachix/pre-commit-hooks.nix";
|
||||
nix-eval-jobs.url = "github:nix-community/nix-eval-jobs";
|
||||
nix-fast-build.url = "github:Mic92/nix-fast-build";
|
||||
buildbot-nix.url = "github:Mic92/buildbot-nix";
|
||||
buildbot-nix.url = "path:///home/main/repos/buildbot-nix"; # "github:magicrb/buildbot-nix?ref=github_app";
|
||||
buildbot-nix.inputs.nixpkgs.follows = "nixpkgs";
|
||||
haumea = {
|
||||
url = "github:nix-community/haumea/v0.2.2";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
|
|
@ -181,13 +180,7 @@
|
|||
recurseIntoAttrs = attrs: attrs // {recurseForDerivations = {};};
|
||||
in {
|
||||
nixng = recurseIntoAttrs (mapAttrs (_: v: v.config.system.build.toplevel) config.flake.nixngConfigurations);
|
||||
nixos = recurseIntoAttrs (mapAttrs (_: v: v.config.system.build.toplevel) {
|
||||
inherit
|
||||
(config.flake.nixosConfigurations)
|
||||
blowhole
|
||||
heater
|
||||
;
|
||||
});
|
||||
nixos = recurseIntoAttrs (mapAttrs (_: v: v.config.system.build.toplevel) config.flake.nixosConfigurations);
|
||||
packages =
|
||||
recurseIntoAttrs
|
||||
(mapAttrs (_: v: recurseIntoAttrs v)
|
||||
|
|
|
|||
|
|
@ -3,7 +3,6 @@
|
|||
lib,
|
||||
config,
|
||||
pkgs,
|
||||
pkgs-hashicorp,
|
||||
secret,
|
||||
...
|
||||
}: let
|
||||
|
|
@ -44,7 +43,7 @@ in {
|
|||
enable = true;
|
||||
|
||||
extraSettingsPaths = singleton "/run/secrets/consul.json";
|
||||
package = pkgs-hashicorp.consul;
|
||||
package = pkgs.consul;
|
||||
|
||||
settings = {
|
||||
datacenter = "homelab-1";
|
||||
|
|
|
|||
|
|
@ -33,16 +33,6 @@ in {
|
|||
config,
|
||||
...
|
||||
}: {
|
||||
_module.args.pkgs-hashicorp = import inputs.nixpkgs-hashicorp {
|
||||
system = pkgs.stdenv.system;
|
||||
config.allowUnfreePredicate = pkg:
|
||||
builtins.elem (lib'.getName pkg) [
|
||||
"consul"
|
||||
"vault-bin"
|
||||
"vault"
|
||||
];
|
||||
};
|
||||
|
||||
imports = [
|
||||
./bind.nix
|
||||
./consul.nix
|
||||
|
|
|
|||
|
|
@ -2,7 +2,6 @@
|
|||
inputs',
|
||||
lib,
|
||||
pkgs,
|
||||
pkgs-hashicorp,
|
||||
secret,
|
||||
config,
|
||||
config',
|
||||
|
|
@ -82,7 +81,7 @@ in {
|
|||
config = {
|
||||
nixpkgs.config.allowUnfreePredicate = pkg:
|
||||
builtins.elem (lib.getName pkg) [
|
||||
"consul-1.17.2"
|
||||
"consul"
|
||||
];
|
||||
nixpkgs.overlays = config.nixpkgs.overlays;
|
||||
|
||||
|
|
@ -94,7 +93,6 @@ in {
|
|||
networking.firewall.interfaces.eth0.allowedTCPPorts = [19000];
|
||||
|
||||
services.hashicorp-envoy.mainsail = {
|
||||
consulPackage = pkgs-hashicorp.consul;
|
||||
envoyPackage = inputs'.nixpkgs-stable.legacyPackages.${pkgs.stdenv.system}.envoy;
|
||||
service = {
|
||||
name = "mainsail";
|
||||
|
|
@ -173,7 +171,7 @@ in {
|
|||
microsteps = "16";
|
||||
endstop_pin = "P1.25"; # P1.24 for Z-max"
|
||||
position_min = "-4.5";
|
||||
position_endstop = "-3.003";
|
||||
position_endstop = "-2.903";
|
||||
position_max = "250";
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -267,7 +267,7 @@ in {
|
|||
|
||||
adminBind = "127.0.0.1:19100";
|
||||
hotRestart = false;
|
||||
consulPackage = inputs'.nixpkgs-hashicorp.legacyPackages.${pkgs.stdenv.system}.consul;
|
||||
consulPackage = pkgs.consul;
|
||||
extraConsulArgs = ["-ignore-envoy-compatibility"];
|
||||
};
|
||||
|
||||
|
|
@ -481,7 +481,7 @@ in {
|
|||
address = "10.64.99.2:19000";
|
||||
adminBind = "127.0.0.1:19100";
|
||||
hotRestart = false;
|
||||
consulPackage = inputs'.nixpkgs-hashicorp.legacyPackages.${pkgs.stdenv.system}.consul;
|
||||
consulPackage = pkgs.consul;
|
||||
extraConsulArgs = ["-ignore-envoy-compatibility"];
|
||||
};
|
||||
|
||||
|
|
@ -566,7 +566,7 @@ in {
|
|||
address = "10.64.99.2:19001";
|
||||
adminBind = "127.0.0.1:19101";
|
||||
hotRestart = false;
|
||||
consulPackage = inputs'.nixpkgs-hashicorp.legacyPackages.${pkgs.stdenv.system}.consul;
|
||||
consulPackage = pkgs.consul;
|
||||
extraConsulArgs = ["-ignore-envoy-compatibility"];
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -2,12 +2,20 @@
|
|||
inputs',
|
||||
config',
|
||||
config,
|
||||
lib,
|
||||
...
|
||||
}: {
|
||||
imports = [
|
||||
../../common/nixpkgs.nix
|
||||
];
|
||||
|
||||
nixpkgs.config.allowUnfreePredicate = pkg:
|
||||
builtins.elem (lib.getName pkg) [
|
||||
"consul"
|
||||
"vault"
|
||||
"vault-bin"
|
||||
];
|
||||
|
||||
nixpkgs.overlays =
|
||||
(with config'.flake.overlays; [
|
||||
udp-over-tcp
|
||||
|
|
|
|||
|
|
@ -3,7 +3,6 @@
|
|||
lib,
|
||||
config,
|
||||
pkgs,
|
||||
pkgs-hashicorp,
|
||||
secret,
|
||||
config',
|
||||
...
|
||||
|
|
@ -57,7 +56,7 @@ in {
|
|||
extraSettingsPaths = [
|
||||
"/run/secrets/nomad.json"
|
||||
];
|
||||
package = pkgs-hashicorp.nomad_1_5.overrideAttrs (old: {
|
||||
package = pkgs.nomad_1_5.overrideAttrs (old: {
|
||||
patches = with config'.flake.patches; [
|
||||
hashicorp-nomad.revert-change-consul-si-tokens-to-be-local
|
||||
hashicorp-nomad.add-nix-integration
|
||||
|
|
|
|||
|
|
@ -4,7 +4,6 @@
|
|||
config,
|
||||
tf,
|
||||
inputs',
|
||||
pkgs-hashicorp,
|
||||
...
|
||||
}: let
|
||||
inherit
|
||||
|
|
@ -30,7 +29,7 @@ in {
|
|||
|
||||
services.hashicorp.vault-agent = {
|
||||
enable = true;
|
||||
package = pkgs-hashicorp.vault;
|
||||
package = pkgs.vault-bin;
|
||||
|
||||
command = "agent";
|
||||
|
||||
|
|
|
|||
|
|
@ -2,7 +2,6 @@
|
|||
lib,
|
||||
config,
|
||||
pkgs,
|
||||
pkgs-hashicorp,
|
||||
secret,
|
||||
inputs',
|
||||
...
|
||||
|
|
@ -15,8 +14,7 @@
|
|||
in {
|
||||
services.hashicorp.vault = {
|
||||
enable = true;
|
||||
|
||||
package = pkgs-hashicorp.vault-bin;
|
||||
package = pkgs.vault-bin;
|
||||
|
||||
settings = {
|
||||
backend."file".path = "/var/lib/vault";
|
||||
|
|
|
|||
|
|
@ -1,12 +1,20 @@
|
|||
{
|
||||
inputs',
|
||||
config',
|
||||
lib,
|
||||
...
|
||||
}: {
|
||||
imports = [
|
||||
../../common/nixpkgs.nix
|
||||
];
|
||||
|
||||
nixpkgs.config.allowUnfreePredicate = pkg:
|
||||
builtins.elem (lib.getName pkg) [
|
||||
"steamcmd"
|
||||
"steam-run"
|
||||
"steam-original"
|
||||
];
|
||||
|
||||
nixpkgs.overlays =
|
||||
(with config'.flake.overlays; [
|
||||
emacsclient-remote
|
||||
|
|
|
|||
|
|
@ -35,7 +35,7 @@ in {
|
|||
}: {
|
||||
imports = [
|
||||
"${inputs.nixpkgs}/nixos/modules/installer/cd-dvd/installation-cd-graphical-base.nix"
|
||||
../../common/nixpkgs.nix
|
||||
./nixpkgs.nix
|
||||
];
|
||||
|
||||
environment.systemPackages = [
|
||||
|
|
|
|||
11
nixos/systems/liveusb/nixpkgs.nix
Normal file
11
nixos/systems/liveusb/nixpkgs.nix
Normal file
|
|
@ -0,0 +1,11 @@
|
|||
{lib, ...}: {
|
||||
imports = [
|
||||
../../common/nixpkgs.nix
|
||||
];
|
||||
|
||||
nixpkgs.config.allowUnfreePredicate = pkg:
|
||||
builtins.elem (lib.getName pkg) [
|
||||
"nvidia-x11"
|
||||
"nvidia-settings"
|
||||
];
|
||||
}
|
||||
|
|
@ -2,12 +2,22 @@
|
|||
inputs',
|
||||
config',
|
||||
config,
|
||||
lib,
|
||||
...
|
||||
}: {
|
||||
imports = [
|
||||
../../common/nixpkgs.nix
|
||||
];
|
||||
|
||||
nixpkgs.config.allowUnfreePredicate = pkg:
|
||||
builtins.elem (lib.getName pkg) [
|
||||
"slack"
|
||||
"unrar"
|
||||
"steam"
|
||||
"steam-original"
|
||||
"steam-run"
|
||||
];
|
||||
|
||||
nixpkgs.overlays =
|
||||
(with config'.flake.overlays; [
|
||||
udp-over-tcp
|
||||
|
|
|
|||
|
|
@ -3,7 +3,6 @@
|
|||
lib,
|
||||
config,
|
||||
pkgs,
|
||||
pkgs-hashicorp,
|
||||
secret,
|
||||
...
|
||||
}: let
|
||||
|
|
@ -15,9 +14,9 @@
|
|||
in {
|
||||
services.hashicorp.consul = {
|
||||
enable = true;
|
||||
package = pkgs.consul;
|
||||
|
||||
extraSettingsPaths = singleton "/run/secrets/consul.json";
|
||||
package = pkgs-hashicorp.consul;
|
||||
|
||||
settings = {
|
||||
datacenter = "do-1";
|
||||
|
|
|
|||
|
|
@ -29,20 +29,9 @@ in {
|
|||
singleton
|
||||
({
|
||||
pkgs,
|
||||
pkgs-hashicorp,
|
||||
config,
|
||||
...
|
||||
}: {
|
||||
_module.args.pkgs-hashicorp = import inputs.nixpkgs-hashicorp {
|
||||
system = pkgs.stdenv.system;
|
||||
config.allowUnfreePredicate = pkg:
|
||||
builtins.elem (lib'.getName pkg) [
|
||||
"consul"
|
||||
"vault-bin"
|
||||
"vault"
|
||||
];
|
||||
};
|
||||
|
||||
imports = [
|
||||
./consul.nix
|
||||
./nomad.nix
|
||||
|
|
|
|||
|
|
@ -1,12 +1,20 @@
|
|||
{
|
||||
inputs',
|
||||
config',
|
||||
lib,
|
||||
...
|
||||
}: {
|
||||
imports = [
|
||||
../../common/nixpkgs.nix
|
||||
];
|
||||
|
||||
nixpkgs.config.allowUnfreePredicate = pkg:
|
||||
builtins.elem (lib.getName pkg) [
|
||||
"consul"
|
||||
"vault"
|
||||
"vault-bin"
|
||||
];
|
||||
|
||||
nixpkgs.overlays =
|
||||
(with config'.flake.overlays; [
|
||||
udp-over-tcp
|
||||
|
|
|
|||
|
|
@ -3,7 +3,6 @@
|
|||
config,
|
||||
config',
|
||||
pkgs,
|
||||
pkgs-hashicorp,
|
||||
inputs',
|
||||
secret,
|
||||
...
|
||||
|
|
@ -23,7 +22,7 @@
|
|||
extraSettingsPaths = [
|
||||
"/run/secrets/nomad.json"
|
||||
];
|
||||
package = pkgs-hashicorp.nomad_1_5.overrideAttrs (old: {
|
||||
package = pkgs.nomad_1_5.overrideAttrs (old: {
|
||||
patches = with config'.flake.patches; [
|
||||
hashicorp-nomad.revert-change-consul-si-tokens-to-be-local
|
||||
hashicorp-nomad.add-nix-integration
|
||||
|
|
|
|||
|
|
@ -2,7 +2,6 @@
|
|||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
pkgs-hashicorp,
|
||||
secret,
|
||||
inputs',
|
||||
...
|
||||
|
|
@ -14,7 +13,7 @@
|
|||
in {
|
||||
services.hashicorp.vault-agent = {
|
||||
enable = true;
|
||||
package = pkgs-hashicorp.vault;
|
||||
package = pkgs.vault-bin;
|
||||
|
||||
command = "agent";
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue