diff --git a/editors/helix/default.nix b/editors/helix/default.nix index d72f235..4d5be36 100644 --- a/editors/helix/default.nix +++ b/editors/helix/default.nix @@ -2,12 +2,7 @@ # # SPDX-License-Identifier: LGPL-3.0-or-later -{ - flake-parts-lib, - inputs, - lib, - ... -}: +{ flake-parts-lib, lib, ... }: { imports = [ ../../base ]; options.perSystem = flake-parts-lib.mkPerSystemOption ( @@ -78,7 +73,7 @@ category = "󰤀 Helix"; } ]; - packages = [ inputs.helix.packages.${system}.helix ]; + packages = [ pkgs.helix ]; devshell.startup.helix_config.text = '' mkdir -p .helix ${pkgs.uutils-coreutils-noprefix}/bin/rm -rf ./${helix.directory.name} diff --git a/flake.lock b/flake.lock index 645bff3..e5d4c33 100644 --- a/flake.lock +++ b/flake.lock @@ -128,25 +128,6 @@ "type": "github" } }, - "helix": { - "inputs": { - "nixpkgs": "nixpkgs_3", - "rust-overlay": "rust-overlay" - }, - "locked": { - "lastModified": 1752674572, - "narHash": "sha256-rCAwXmLQJQVHRpquWTQV1fDurHhf4beUzqDi6FVkdEo=", - "owner": "helix-editor", - "repo": "helix", - "rev": "2ee11a0a9d9b9951b5b64b54be05379cc030230b", - "type": "github" - }, - "original": { - "owner": "helix-editor", - "repo": "helix", - "type": "github" - } - }, "lix": { "flake": false, "locked": { @@ -216,27 +197,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1740560979, - "narHash": "sha256-Vr3Qi346M+8CjedtbyUevIGDZW8LcA1fTG0ugPY/Hic=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "5135c59491985879812717f4c9fea69604e7f26f", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_4": { - "locked": { - "lastModified": 1751949589, - "narHash": "sha256-mgFxAPLWw0Kq+C8P3dRrZrOYEQXOtKuYVlo9xvPntt8=", + "lastModified": 1752809442, + "narHash": "sha256-7fALxZGWDspRe79LaDwIdmkDl568Cphfvr83PGCXUUQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9b008d60392981ad674e04016d25619281550a9d", + "rev": "e821e03193486359aa942372be2d9c1f377b7a18", "type": "github" }, "original": { @@ -246,7 +211,7 @@ "type": "github" } }, - "nixpkgs_5": { + "nixpkgs_4": { "locked": { "lastModified": 1747958103, "narHash": "sha256-qmmFCrfBwSHoWw7cVK4Aj+fns+c54EBP8cGqp/yK410=", @@ -267,33 +232,11 @@ "devshell": "devshell", "flake-parts": "flake-parts", "git-hooks-nix": "git-hooks-nix", - "helix": "helix", "lix-module": "lix-module", - "nixpkgs": "nixpkgs_4", + "nixpkgs": "nixpkgs_3", "treefmt-nix": "treefmt-nix" } }, - "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" - } - }, "systems": { "locked": { "lastModified": 1681028828, @@ -311,7 +254,7 @@ }, "treefmt-nix": { "inputs": { - "nixpkgs": "nixpkgs_5" + "nixpkgs": "nixpkgs_4" }, "locked": { "lastModified": 1752055615, diff --git a/flake.nix b/flake.nix index e215a19..8f1e5dc 100644 --- a/flake.nix +++ b/flake.nix @@ -17,7 +17,6 @@ }; nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable"; treefmt-nix.url = "github:numtide/treefmt-nix"; - helix.url = "github:helix-editor/helix"; }; outputs = # https://flake.parts/options/flake-parts.html @@ -38,15 +37,9 @@ dictionary = [ "Asahi" "Catppuccin" - "Devshell" - "Flake" - "Jujutsu" - "LanguageTool" "LLMs" - "LTeX" - "NixOS" "Nushell" - "REUSE" + "Reece" "SOPS" "Stylix" ]; diff --git a/languages/en-us/default.nix b/languages/en-us/default.nix index 3edb5e4..86277f6 100644 --- a/languages/en-us/default.nix +++ b/languages/en-us/default.nix @@ -100,6 +100,17 @@ }; in { + languages.en-us.dictionary = [ + "Devshell" + "FileCopyrightText" + "Flake" + "Jujutsu" + "LanguageTool" + "LTeX" + "NixOS" + "REUSE" + "SPDX" + ]; editors.helix.languages.language-server = { # https://ltex-plus.github.io/ltex-plus/supported-languages.html ltex-ls-plus = {