From 9afc2612c23a54382373f82dad6842f6969e6eae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Moritz=20B=C3=B6hme?= Date: Thu, 29 May 2025 13:19:57 +0200 Subject: [PATCH] feat(helix): switch to git version --- flake.lock | 43 +++++++++++++++++++++++++++++++ flake.nix | 4 +++ modules/moritz/profiles/helix.nix | 3 +++ 3 files changed, 50 insertions(+) diff --git a/flake.lock b/flake.lock index d9dac24..7c5ec08 100644 --- a/flake.lock +++ b/flake.lock @@ -452,6 +452,27 @@ "type": "github" } }, + "helix": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ], + "rust-overlay": "rust-overlay" + }, + "locked": { + "lastModified": 1748359092, + "narHash": "sha256-bfQVlnTe1PZ3DfulcHUwJzh6qcir0n1F8B0xYUV+Vu0=", + "owner": "helix-editor", + "repo": "helix", + "rev": "2bd7452fe0309e273d06280d15caad6943034377", + "type": "github" + }, + "original": { + "owner": "helix-editor", + "repo": "helix", + "type": "github" + } + }, "hercules-ci-effects": { "inputs": { "flake-parts": "flake-parts_2", @@ -992,6 +1013,7 @@ "flake-parts": "flake-parts", "flake-utils": "flake-utils", "git-hooks": "git-hooks", + "helix": "helix", "home-manager": "home-manager", "impermanence": "impermanence", "jovian": "jovian", @@ -1029,6 +1051,27 @@ "type": "github" } }, + "rust-overlay": { + "inputs": { + "nixpkgs": [ + "helix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1740623427, + "narHash": "sha256-3SdPQrZoa4odlScFDUHd4CUPQ/R1gtH4Mq9u8CBiK8M=", + "owner": "oxalica", + "repo": "rust-overlay", + "rev": "d342e8b5fd88421ff982f383c853f0fc78a847ab", + "type": "github" + }, + "original": { + "owner": "oxalica", + "repo": "rust-overlay", + "type": "github" + } + }, "sops-nix": { "inputs": { "nixpkgs": [ diff --git a/flake.nix b/flake.nix index 99847b2..05b4b98 100644 --- a/flake.nix +++ b/flake.nix @@ -139,6 +139,9 @@ neovim-nightly-overlay.url = "github:nix-community/neovim-nightly-overlay"; nixvim.url = "github:nix-community/nixvim"; + # Helix + helix.url = "github:helix-editor/helix"; + # Laptop asus-touchpad-numpad-driver.url = "github:MoritzBoehme/asus-touchpad-numpad-driver/german-layout"; asus-touchpad-numpad-driver.flake = false; @@ -159,6 +162,7 @@ flake-utils.inputs.systems.follows = "systems"; git-hooks.inputs.flake-compat.follows = "flake-compat"; git-hooks.inputs.nixpkgs.follows = "nixpkgs"; + helix.inputs.nixpkgs.follows = "nixpkgs"; home-manager.inputs.nixpkgs.follows = "nixpkgs"; jovian.inputs.nixpkgs.follows = "nixpkgs"; neovim-nightly-overlay.inputs.flake-compat.follows = "flake-compat"; diff --git a/modules/moritz/profiles/helix.nix b/modules/moritz/profiles/helix.nix index 3147810..cd0a6f6 100644 --- a/modules/moritz/profiles/helix.nix +++ b/modules/moritz/profiles/helix.nix @@ -1,6 +1,8 @@ { lib, config, + inputs, + pkgs, ... }: let inherit (lib) mkEnableOption mkIf; @@ -12,6 +14,7 @@ in { my.shell.variables.EDITOR = lib.mkForce "hx"; home-manager.users.moritz = { programs.helix = { + package = inputs.helix.packages.${pkgs.system}.default; enable = true; settings.editor = { line-number = "relative";