diff --git a/flake.lock b/flake.lock index bfa95b0..cb08aeb 100644 --- a/flake.lock +++ b/flake.lock @@ -233,22 +233,6 @@ "type": "github" } }, - "flake-compat_3": { - "flake": false, - "locked": { - "lastModified": 1673956053, - "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, "flake-parts": { "inputs": { "nixpkgs-lib": "nixpkgs-lib" @@ -456,24 +440,6 @@ "inputs": { "systems": "systems_4" }, - "locked": { - "lastModified": 1685518550, - "narHash": "sha256-o2d0KcvaXzTrPRIo0kOLV0/QXHhDQ5DTi+OxcjO8xqY=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "a1720a10a6cfe8234c0e93907ffe81be440f4cef", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_4": { - "inputs": { - "systems": "systems_5" - }, "locked": { "lastModified": 1694529238, "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=", @@ -510,27 +476,6 @@ "type": "github" } }, - "gitignore_2": { - "inputs": { - "nixpkgs": [ - "pre-commit-hooks", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1660459072, - "narHash": "sha256-8DFJjXG8zqoONA1vXtgeKXy68KdJL5UaXR8NtVMUbx8=", - "owner": "hercules-ci", - "repo": "gitignore.nix", - "rev": "a20de23b925fd8264fd7fad6454652e142fd7f73", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "gitignore.nix", - "type": "github" - } - }, "home-manager": { "inputs": { "nixpkgs": [ @@ -859,22 +804,6 @@ "type": "github" } }, - "nixpkgs-stable_2": { - "locked": { - "lastModified": 1685801374, - "narHash": "sha256-otaSUoFEMM+LjBI1XL/xGB5ao6IwnZOXc47qhIgJe8U=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "c37ca420157f4abc31e26f436c1145f8951ff373", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-23.05", - "repo": "nixpkgs", - "type": "github" - } - }, "nixpkgs_10": { "locked": { "lastModified": 1702312524, @@ -892,22 +821,6 @@ } }, "nixpkgs_11": { - "locked": { - "lastModified": 1702312524, - "narHash": "sha256-gkZJRDBUCpTPBvQk25G0B7vfbpEYM5s5OZqghkjZsnE=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "a9bf124c46ef298113270b1f84a164865987a91c", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_12": { "locked": { "lastModified": 1700612854, "narHash": "sha256-yrQ8osMD+vDLGFX7pcwsY/Qr5PUd6OmDMYJZzZi0+zc=", @@ -923,7 +836,7 @@ "type": "github" } }, - "nixpkgs_13": { + "nixpkgs_12": { "locked": { "lastModified": 1698318101, "narHash": "sha256-gUihHt3yPD7bVqg+k/UVHgngyaJ3DMEBchbymBMvK1E=", @@ -939,7 +852,7 @@ "type": "github" } }, - "nixpkgs_14": { + "nixpkgs_13": { "locked": { "lastModified": 1695644571, "narHash": "sha256-asS9dCCdlt1lPq0DLwkVBbVoEKuEuz+Zi3DG7pR/RxA=", @@ -1037,16 +950,16 @@ }, "nixpkgs_7": { "locked": { - "lastModified": 1689261696, - "narHash": "sha256-LzfUtFs9MQRvIoQ3MfgSuipBVMXslMPH/vZ+nM40LkA=", + "lastModified": 1702312524, + "narHash": "sha256-gkZJRDBUCpTPBvQk25G0B7vfbpEYM5s5OZqghkjZsnE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "df1eee2aa65052a18121ed4971081576b25d6b5c", + "rev": "a9bf124c46ef298113270b1f84a164865987a91c", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixpkgs-unstable", + "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" } @@ -1083,28 +996,6 @@ "type": "github" } }, - "pre-commit-hooks": { - "inputs": { - "flake-compat": "flake-compat_3", - "flake-utils": "flake-utils_3", - "gitignore": "gitignore_2", - "nixpkgs": "nixpkgs_7", - "nixpkgs-stable": "nixpkgs-stable_2" - }, - "locked": { - "lastModified": 1702456155, - "narHash": "sha256-I2XhXGAecdGlqi6hPWYT83AQtMgL+aa3ulA85RAEgOk=", - "owner": "cachix", - "repo": "pre-commit-hooks.nix", - "rev": "007a45d064c1c32d04e1b8a0de5ef00984c419bc", - "type": "github" - }, - "original": { - "owner": "cachix", - "repo": "pre-commit-hooks.nix", - "type": "github" - } - }, "pre-commit-hooks-nix": { "inputs": { "flake-compat": [ @@ -1139,7 +1030,7 @@ "projet-audionumerique": { "inputs": { "flake-parts": "flake-parts_5", - "nixpkgs": "nixpkgs_8" + "nixpkgs": "nixpkgs_7" }, "locked": { "lastModified": 1702487657, @@ -1158,7 +1049,7 @@ "projet-intelligence-artificielle-multimedia": { "inputs": { "flake-parts": "flake-parts_6", - "nixpkgs": "nixpkgs_9" + "nixpkgs": "nixpkgs_8" }, "locked": { "lastModified": 1702567767, @@ -1177,7 +1068,7 @@ "projet-oral-anglais": { "inputs": { "flake-parts": "flake-parts_7", - "nixpkgs": "nixpkgs_10" + "nixpkgs": "nixpkgs_9" }, "locked": { "lastModified": 1702566510, @@ -1196,7 +1087,7 @@ "projet-oral-japonais": { "inputs": { "flake-parts": "flake-parts_8", - "nixpkgs": "nixpkgs_11" + "nixpkgs": "nixpkgs_10" }, "locked": { "lastModified": 1702567061, @@ -1214,8 +1105,8 @@ }, "resume": { "inputs": { - "flake-utils": "flake-utils_4", - "nixpkgs": "nixpkgs_12", + "flake-utils": "flake-utils_3", + "nixpkgs": "nixpkgs_11", "typst": "typst" }, "locked": { @@ -1244,7 +1135,6 @@ "nixos-anywhere": "nixos-anywhere", "nixos-hardware": "nixos-hardware", "nixpkgs": "nixpkgs_6", - "pre-commit-hooks": "pre-commit-hooks", "projet-audionumerique": "projet-audionumerique", "projet-intelligence-artificielle-multimedia": "projet-intelligence-artificielle-multimedia", "projet-oral-anglais": "projet-oral-anglais", @@ -1378,21 +1268,6 @@ "type": "github" } }, - "systems_6": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, "treefmt-nix": { "inputs": { "nixpkgs": [ @@ -1416,7 +1291,7 @@ }, "treefmt-nix_2": { "inputs": { - "nixpkgs": "nixpkgs_14" + "nixpkgs": "nixpkgs_13" }, "locked": { "lastModified": 1702461037, @@ -1436,8 +1311,8 @@ "inputs": { "crane": "crane_3", "flake-parts": "flake-parts_9", - "nixpkgs": "nixpkgs_13", - "systems": "systems_6" + "nixpkgs": "nixpkgs_12", + "systems": "systems_5" }, "locked": { "lastModified": 1700840283, diff --git a/flake.nix b/flake.nix index 05a6486..fceafdd 100644 --- a/flake.nix +++ b/flake.nix @@ -1,7 +1,6 @@ { description = "Laureηt's infrastructure"; - # TODO: setup le formatter comme sioodmy # TODO: rekey les secrets + changer la key de hydrogen # TODO: luks encrypt hydrogen (dropbear ?) # TODO: dégager btfrs de neodymium, ext4 ftw @@ -27,7 +26,6 @@ nixos-hardware.url = "github:nixos/nixos-hardware"; disko.url = "github:nix-community/disko"; nixos-anywhere.url = "github:nix-community/nixos-anywhere"; - pre-commit-hooks.url = "github:cachix/pre-commit-hooks.nix"; treefmt-nix.url = "github:numtide/treefmt-nix"; resume.url = "git+https://git.fainsin.bzh/Laurent/resume"; @@ -41,12 +39,10 @@ nixConfig = { extra-substituters = [ "https://nix-community.cachix.org" - # "https://pre-commit-hooks.cachix.org" "https://hyprland.cachix.org" ]; extra-trusted-public-keys = [ "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" - # "pre-commit-hooks.cachix.org-1:Pkk3Panw5AW24TOv6kz3PvLhlH8puAsJTBbOPmBo7Rc=" "hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc=" ]; }; @@ -54,7 +50,6 @@ outputs = { agenix, flake-parts, - pre-commit-hooks, treefmt-nix, ... } @ inputs: @@ -63,7 +58,6 @@ imports = [ flake-parts.flakeModules.easyOverlay - pre-commit-hooks.flakeModule treefmt-nix.flakeModule ]; @@ -82,14 +76,6 @@ }; }; - pre-commit = { - settings.excludes = ["flake.lock"]; - settings.hooks = { - alejandra.enable = true; - deadnix.enable = true; - }; - }; - devShells.default = pkgs.mkShell { packages = [ formatter # defined above