NotAShelf/nvf
2
1
Fork 0
mirror of https://github.com/NotAShelf/nvf.git synced 2025-12-16 09:01:03 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

languages/nu: TS parser is now in nixpkgs

Browse source
This commit is contained in:
Soliprem 2024-11-27 20:55:36 +01:00
commit d3f87d5c39
1 changed files with 4 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

31
modules/plugins/languages/nu.nix
View file

@ -2,14 +2,13 @@
lib, lib,
pkgs, pkgs,
config, config,
pkgsPath,
... ...
}: let }: let
inherit (lib.options) mkEnableOption mkOption mkPackageOption; inherit (lib.options) mkEnableOption mkOption;
inherit (lib.types) str either package listOf enum; inherit (lib.types) str either package listOf enum;
inherit (lib.modules) mkIf mkMerge; inherit (lib.modules) mkIf mkMerge;
inherit (lib.nvim.lua) expToLua; inherit (lib.nvim.lua) expToLua;
inherit (pkgs) fetchFromGitHub; inherit (lib.nvim.types) mkGrammarOption;
inherit (builtins) attrNames isList; inherit (builtins) attrNames isList;
defaultServer = "nushell"; defaultServer = "nushell";
@ -30,18 +29,10 @@
}; };
}; };
# FIX: uncomment formatting parts, once https://github.com/NixOS/nixpkgs/pull/341647 makes it into nixos-unstable
# defaultFormat = "nufmt"; # defaultFormat = "nufmt";
# formats = { # formats = {
# nufmt = { # nufmt = {
# package = pkgs.nufmt.overrideAttrs { # package = pkgs.nufmt;
# src = fetchFromGitHub {
# owner = "nushell";
# repo = "nufmt";
# rev = "63549df4406216cce7e744576b1ee8fcaba9a30a";
# hash = "sha256-Y7LvsCuirhYPjuQSF0w7me8vYrV39i4OhVvyI3XskpE=";
# };
# };
# nullConfig = '' # nullConfig = ''
# table.insert( # table.insert(
# ls_sources, # ls_sources,
@ -68,21 +59,7 @@ in {
treesitter = { treesitter = {
enable = mkEnableOption "Nu treesitter" // {default = config.vim.languages.enableTreesitter;}; enable = mkEnableOption "Nu treesitter" // {default = config.vim.languages.enableTreesitter;};
package = mkOption { package = mkGrammarOption pkgs "nu";
description = "The Nu treesitter package to use.";
type = package;
default = pkgs.callPackage (pkgsPath + /pkgs/development/tools/parsing/tree-sitter/grammar.nix) {} {
language = "nu";
inherit (pkgs.tree-sitter) version;
src = fetchFromGitHub {
owner = "nushell";
repo = "tree-sitter-nu";
rev = "0bb9a602d9bc94b66fab96ce51d46a5a227ab76c";
hash = "sha256-A5GiOpITOv3H0wytCv6t43buQ8IzxEXrk3gTlOrO0K0=";
};
};
defaultText = "See code";
};
}; };
lsp = { lsp = {