From 8896c8d836c97f9eb41dd836bd3defb1a3bedd5b Mon Sep 17 00:00:00 2001 From: ulic-youthlic Date: Tue, 7 Apr 2026 07:27:53 +0800 Subject: [PATCH] feat: Use helix with steel script --- flake.lock | 137 ++++-------------------- flake.nix | 7 +- home/modules/programs/helix/default.nix | 3 +- pkgs/helix/package.nix | 6 ++ 4 files changed, 35 insertions(+), 118 deletions(-) diff --git a/flake.lock b/flake.lock index fec3889..cbd12b4 100644 --- a/flake.lock +++ b/flake.lock @@ -117,7 +117,9 @@ }, "dae-flake": { "inputs": { - "flake-parts": "flake-parts", + "flake-parts": [ + "flake-parts" + ], "nixpkgs": "nixpkgs" }, "locked": { @@ -315,24 +317,6 @@ } }, "flake-parts": { - "inputs": { - "nixpkgs-lib": "nixpkgs-lib" - }, - "locked": { - "lastModified": 1767609335, - "narHash": "sha256-feveD98mQpptwrAEggBQKJTYbvwwglSbOv53uCfH9PY=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "250481aafeb741edfe23d29195671c19b36b6dca", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "flake-parts", - "type": "github" - } - }, - "flake-parts_2": { "inputs": { "nixpkgs-lib": [ "nixpkgs" @@ -352,7 +336,7 @@ "type": "github" } }, - "flake-parts_3": { + "flake-parts_2": { "inputs": { "nixpkgs-lib": [ "neovim-nightly", @@ -373,43 +357,7 @@ "type": "github" } }, - "flake-parts_4": { - "inputs": { - "nixpkgs-lib": "nixpkgs-lib_2" - }, - "locked": { - "lastModified": 1775087534, - "narHash": "sha256-91qqW8lhL7TLwgQWijoGBbiD4t7/q75KTi8NxjVmSmA=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "3107b77cd68437b9a76194f0f7f9c55f2329ca5b", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "flake-parts", - "type": "github" - } - }, - "flake-parts_5": { - "inputs": { - "nixpkgs-lib": "nixpkgs-lib_3" - }, - "locked": { - "lastModified": 1775087534, - "narHash": "sha256-91qqW8lhL7TLwgQWijoGBbiD4t7/q75KTi8NxjVmSmA=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "3107b77cd68437b9a76194f0f7f9c55f2329ca5b", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "flake-parts", - "type": "github" - } - }, - "flake-parts_6": { + "flake-parts_3": { "inputs": { "nixpkgs-lib": [ "nixvim", @@ -430,7 +378,7 @@ "type": "github" } }, - "flake-parts_7": { + "flake-parts_4": { "inputs": { "nixpkgs-lib": [ "nur", @@ -575,16 +523,16 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1775452794, - "narHash": "sha256-9R53RmtSpTJUQm6cfL8OQ96lphV0xG90wCbq+rIEfac=", - "owner": "helix-editor", + "lastModified": 1775225367, + "narHash": "sha256-SYie7U6/Iv+ZDiUIaISToWfGko6VqIjuE5PVOiMUutc=", + "owner": "mattwparas", "repo": "helix", - "rev": "ac2c26e05f2a72fe6ac9a2fbca4125110898630b", + "rev": "9738d1fd84eff3fb48e29637bf28826ea64a655b", "type": "github" }, "original": { - "owner": "helix-editor", - "ref": "master", + "owner": "mattwparas", + "ref": "steel-event-system", "repo": "helix", "type": "github" } @@ -633,7 +581,7 @@ }, "neovim-nightly": { "inputs": { - "flake-parts": "flake-parts_3", + "flake-parts": "flake-parts_2", "neovim-src": "neovim-src", "nixpkgs": "nixpkgs_5" }, @@ -730,7 +678,9 @@ "cachyos-kernel": "cachyos-kernel", "cachyos-kernel-patches": "cachyos-kernel-patches", "flake-compat": "flake-compat_3", - "flake-parts": "flake-parts_4", + "flake-parts": [ + "flake-parts" + ], "nixpkgs": "nixpkgs_6" }, "locked": { @@ -772,7 +722,9 @@ }, "nix-gaming": { "inputs": { - "flake-parts": "flake-parts_5", + "flake-parts": [ + "flake-parts" + ], "git-hooks": "git-hooks", "nixpkgs": "nixpkgs_7" }, @@ -846,51 +798,6 @@ "type": "github" } }, - "nixpkgs-lib": { - "locked": { - "lastModified": 1765674936, - "narHash": "sha256-k00uTP4JNfmejrCLJOwdObYC9jHRrr/5M/a/8L2EIdo=", - "owner": "nix-community", - "repo": "nixpkgs.lib", - "rev": "2075416fcb47225d9b68ac469a5c4801a9c4dd85", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "nixpkgs.lib", - "type": "github" - } - }, - "nixpkgs-lib_2": { - "locked": { - "lastModified": 1774748309, - "narHash": "sha256-+U7gF3qxzwD5TZuANzZPeJTZRHS29OFQgkQ2kiTJBIQ=", - "owner": "nix-community", - "repo": "nixpkgs.lib", - "rev": "333c4e0545a6da976206c74db8773a1645b5870a", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "nixpkgs.lib", - "type": "github" - } - }, - "nixpkgs-lib_3": { - "locked": { - "lastModified": 1774748309, - "narHash": "sha256-+U7gF3qxzwD5TZuANzZPeJTZRHS29OFQgkQ2kiTJBIQ=", - "owner": "nix-community", - "repo": "nixpkgs.lib", - "rev": "333c4e0545a6da976206c74db8773a1645b5870a", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "nixpkgs.lib", - "type": "github" - } - }, "nixpkgs-patch-rqbit-bump": { "flake": false, "locked": { @@ -1125,7 +1032,7 @@ }, "nixvim": { "inputs": { - "flake-parts": "flake-parts_6", + "flake-parts": "flake-parts_3", "nixpkgs": "nixpkgs_9", "systems": "systems_4" }, @@ -1189,7 +1096,7 @@ }, "nur": { "inputs": { - "flake-parts": "flake-parts_7", + "flake-parts": "flake-parts_4", "nixpkgs": "nixpkgs_10" }, "locked": { @@ -1276,7 +1183,7 @@ "deploy-rs": "deploy-rs", "disko": "disko", "emacs-overlay": "emacs-overlay", - "flake-parts": "flake-parts_2", + "flake-parts": "flake-parts", "helix": "helix", "home-manager": "home-manager", "lanzaboote": "lanzaboote", diff --git a/flake.nix b/flake.nix index 046d39b..bb0cf7e 100644 --- a/flake.nix +++ b/flake.nix @@ -67,13 +67,14 @@ type = "github"; owner = "xddxdd"; repo = "nix-cachyos-kernel"; + inputs.flake-parts.follows = "flake-parts"; }; helix = { type = "github"; - owner = "helix-editor"; + owner = "mattwparas"; repo = "helix"; - ref = "master"; + ref = "steel-event-system"; }; home-manager = { @@ -222,6 +223,7 @@ type = "github"; owner = "fufexan"; repo = "nix-gaming"; + inputs.flake-parts.follows = "flake-parts"; }; noctalia = { @@ -243,6 +245,7 @@ type = "github"; owner = "daeuniverse"; repo = "flake.nix"; + inputs.flake-parts.follows = "flake-parts"; }; }; } diff --git a/home/modules/programs/helix/default.nix b/home/modules/programs/helix/default.nix index 15f82c5..b231e11 100644 --- a/home/modules/programs/helix/default.nix +++ b/home/modules/programs/helix/default.nix @@ -48,6 +48,7 @@ in { }; config = lib.mkMerge [ (lib.mkIf cfg.enable { + home.packages = lib.singleton pkgs.steel; programs.helix = { enable = true; defaultEditor = true; @@ -55,7 +56,7 @@ in { settings = with lib; pipe ./config.toml [ builtins.readFile - builtins.fromTOML + fromTOML ]; languages = lib.recursiveUpdate { language-server = { diff --git a/pkgs/helix/package.nix b/pkgs/helix/package.nix index c876272..8f8a661 100644 --- a/pkgs/helix/package.nix +++ b/pkgs/helix/package.nix @@ -19,6 +19,12 @@ }; in { env.HELIX_DEFAULT_RUNTIME = toString helix-runtime; + cargoBuildFeatures = + (prev.cargoBuildFeatures or []) + ++ [ + "git" + "steel" + ]; } ); in