diff --git a/flake.lock b/flake.lock index de8b431..c7f8f50 100644 --- a/flake.lock +++ b/flake.lock @@ -39,6 +39,38 @@ "type": "github" } }, + "crane": { + "flake": false, + "locked": { + "lastModified": 1670900067, + "narHash": "sha256-VXVa+KBfukhmWizaiGiHRVX/fuk66P8dgSFfkVN4/MY=", + "owner": "ipetkov", + "repo": "crane", + "rev": "59b31b41a589c0a65e4a1f86b0e5eac68081468b", + "type": "github" + }, + "original": { + "owner": "ipetkov", + "repo": "crane", + "type": "github" + } + }, + "devshell": { + "flake": false, + "locked": { + "lastModified": 1667210711, + "narHash": "sha256-IoErjXZAkzYWHEpQqwu/DeRNJGFdR7X2OGbkhMqMrpw=", + "owner": "numtide", + "repo": "devshell", + "rev": "96a9dd12b8a447840cc246e17a47b81a4268bba7", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "devshell", + "type": "github" + } + }, "doom-emacs": { "flake": false, "locked": { @@ -114,6 +146,71 @@ "type": "github" } }, + "dream2nix": { + "inputs": { + "alejandra": [ + "helix", + "nci" + ], + "all-cabal-json": [ + "helix", + "nci" + ], + "crane": "crane", + "devshell": [ + "helix", + "nci", + "devshell" + ], + "flake-parts": "flake-parts", + "flake-utils-pre-commit": [ + "helix", + "nci" + ], + "ghc-utils": [ + "helix", + "nci" + ], + "gomod2nix": [ + "helix", + "nci" + ], + "mach-nix": [ + "helix", + "nci" + ], + "nix-pypi-fetcher": [ + "helix", + "nci" + ], + "nixpkgs": [ + "helix", + "nci", + "nixpkgs" + ], + "poetry2nix": [ + "helix", + "nci" + ], + "pre-commit-hooks": [ + "helix", + "nci" + ] + }, + "locked": { + "lastModified": 1671323629, + "narHash": "sha256-9KHTPjIDjfnzZ4NjpE3gGIVHVHopy6weRDYO/7Y3hF8=", + "owner": "nix-community", + "repo": "dream2nix", + "rev": "2d7d68505c8619410df2c6b6463985f97cbcba6e", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "dream2nix", + "type": "github" + } + }, "emacs-overlay": { "flake": false, "locked": { @@ -307,6 +404,24 @@ "type": "github" } }, + "flake-parts": { + "inputs": { + "nixpkgs-lib": "nixpkgs-lib" + }, + "locked": { + "lastModified": 1668450977, + "narHash": "sha256-cfLhMhnvXn6x1vPm+Jow3RiFAUSCw/l1utktCw5rVA4=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "d591857e9d7dd9ddbfba0ea02b43b927c3c0f1fa", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, "flake-utils": { "locked": { "lastModified": 1667395993, @@ -323,6 +438,21 @@ } }, "flake-utils_2": { + "locked": { + "lastModified": 1659877975, + "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_3": { "locked": { "lastModified": 1667395993, "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", @@ -375,6 +505,26 @@ "type": "github" } }, + "helix": { + "inputs": { + "nci": "nci", + "nixpkgs": "nixpkgs_4", + "rust-overlay": "rust-overlay" + }, + "locked": { + "lastModified": 1674109388, + "narHash": "sha256-IWV7MmZ2SyO4jtbxwdtso3QT9OBYFzhIwVU6+FyUWdU=", + "owner": "helix-editor", + "repo": "helix", + "rev": "efeec1282cd82e255f54b10e94c51f51294598eb", + "type": "github" + }, + "original": { + "owner": "helix-editor", + "repo": "helix", + "type": "github" + } + }, "homeManager": { "inputs": { "nixpkgs": [ @@ -434,6 +584,33 @@ "type": "github" } }, + "nci": { + "inputs": { + "devshell": "devshell", + "dream2nix": "dream2nix", + "nixpkgs": [ + "helix", + "nixpkgs" + ], + "rust-overlay": [ + "helix", + "rust-overlay" + ] + }, + "locked": { + "lastModified": 1671430291, + "narHash": "sha256-UIc7H8F3N8rK72J/Vj5YJdV72tvDvYjH+UPsOFvlcsE=", + "owner": "yusdacra", + "repo": "nix-cargo-integration", + "rev": "b1b0d38b8c3b0d0e6a38638d5bbe10b0bc67522c", + "type": "github" + }, + "original": { + "owner": "yusdacra", + "repo": "nix-cargo-integration", + "type": "github" + } + }, "nix-straight": { "flake": false, "locked": { @@ -481,6 +658,24 @@ "type": "github" } }, + "nixpkgs-lib": { + "locked": { + "dir": "lib", + "lastModified": 1665349835, + "narHash": "sha256-UK4urM3iN80UXQ7EaOappDzcisYIuEURFRoGQ/yPkug=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "34c5293a71ffdb2fe054eb5288adc1882c1eb0b1", + "type": "github" + }, + "original": { + "dir": "lib", + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "nixpkgs-stable": { "locked": { "lastModified": 1671271954, @@ -560,6 +755,22 @@ } }, "nixpkgs_4": { + "locked": { + "lastModified": 1671359686, + "narHash": "sha256-3MpC6yZo+Xn9cPordGz2/ii6IJpP2n8LE8e/ebUXLrs=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "04f574a1c0fde90b51bf68198e2297ca4e7cccf4", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_5": { "locked": { "lastModified": 1671271357, "narHash": "sha256-xRJdLbWK4v2SewmSStYrcLa0YGJpleufl44A19XSW8k=", @@ -575,7 +786,7 @@ "type": "github" } }, - "nixpkgs_5": { + "nixpkgs_6": { "locked": { "lastModified": 1656239181, "narHash": "sha256-wW1xRFBn376yGloXZ4QzBE4hjipMawpV18Lshd9QSPw=", @@ -705,9 +916,9 @@ "preCommitHooks": { "inputs": { "flake-compat": "flake-compat_3", - "flake-utils": "flake-utils_2", + "flake-utils": "flake-utils_3", "gitignore": "gitignore", - "nixpkgs": "nixpkgs_4", + "nixpkgs": "nixpkgs_5", "nixpkgs-stable": "nixpkgs-stable" }, "locked": { @@ -744,7 +955,7 @@ "inputs": { "fan-control": "fan-control", "kernel-src": "kernel-src", - "nixpkgs": "nixpkgs_5" + "nixpkgs": "nixpkgs_6" }, "locked": { "lastModified": 1672309501, @@ -766,6 +977,7 @@ "comma": "comma", "doomEmacs": "doomEmacs", "emacsSource": "emacsSource", + "helix": "helix", "homeManager": "homeManager", "nixosHardware": "nixosHardware", "nixpkgsStable": "nixpkgsStable", @@ -791,6 +1003,28 @@ "type": "github" } }, + "rust-overlay": { + "inputs": { + "flake-utils": "flake-utils_2", + "nixpkgs": [ + "helix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1671416426, + "narHash": "sha256-kpSH1Jrxfk2qd0pRPJn1eQdIOseGv5JuE+YaOrqU9s4=", + "owner": "oxalica", + "repo": "rust-overlay", + "rev": "fbaaff24f375ac25ec64268b0a0d63f91e474b7d", + "type": "github" + }, + "original": { + "owner": "oxalica", + "repo": "rust-overlay", + "type": "github" + } + }, "sln-mode": { "flake": false, "locked": { diff --git a/flake.nix b/flake.nix index 01d0714..7670ca7 100644 --- a/flake.nix +++ b/flake.nix @@ -19,6 +19,7 @@ url = "git://git.savannah.gnu.org/emacs.git?rev=72a94f91fd0570556ce770dc3a39e658f7588f7e"; flake = false; }; + helix.url = "github:helix-editor/helix"; }; outputs = {self, ...} @ inputs: let utils = import ./utils inputs; @@ -51,10 +52,12 @@ extra-substituters = [ "https://aciceri-fleet.cachix.org" "https://rock5b-nixos.cachix.org" + "https://helix.cachix.org" ]; extra-trusted-public-keys = [ "aciceri-fleet.cachix.org-1:e1AodrwmzRWy0eQi3lUY71M41fp9Sq+UpuKKv705xsI=" "rock5b-nixos.cachix.org-1:bXHDewFS0d8pT90A+/YZan/3SjcyuPZ/QRgRSuhSPnA=" + "helix.cachix.org-1:ejp9KQpR1FBI2onstMQ34yogDm4OgU2ru6lIwPvuCVs=" ]; }; } diff --git a/utils/default.nix b/utils/default.nix index c11bb37..9bea149 100644 --- a/utils/default.nix +++ b/utils/default.nix @@ -9,6 +9,7 @@ preCommitHooks, rock5b, emacsSource, + helix, self, ... }: let @@ -32,7 +33,7 @@ inherit system; modules = [ - { + ({pkgs, ...}: { networking.hostName = lib.mkForce name; home-manager.users.ccr.imports = [ doomEmacs.hmModule @@ -48,9 +49,12 @@ agenix.overlay comma.overlays.default nur.overlay - (_: _: {inherit emacsSource;}) + (_: _: { + inherit emacsSource; + helix = helix.packages.${pkgs.system}.default; + }) ]; - } + }) (../hosts + "/${name}") homeManager.nixosModule agenix.nixosModule