From a4f16014211ec3f5c95a388a69b62773674a55f4 Mon Sep 17 00:00:00 2001 From: Aria Nolan Date: Tue, 10 Oct 2023 00:11:57 -0400 Subject: [PATCH] bash lsp causing issues --- flake.nix | 6 +++--- helix/default.nix | 28 +--------------------------- helix/languages.nix | 8 ++++---- 3 files changed, 8 insertions(+), 34 deletions(-) diff --git a/flake.nix b/flake.nix index 325e859..94a614e 100644 --- a/flake.nix +++ b/flake.nix @@ -14,12 +14,12 @@ }; }; - outputs = inputs @ { nixpkgs, home-manager, ... }: + outputs = inputs: let system = "x86_64-linux"; - pkgs = nixpkgs.legacyPackages.${system}; + pkgs = inputs.nixpkgs.legacyPackages.${system}; in { - homeConfigurations."tacocat" = home-manager.lib.homeManagerConfiguration { + homeConfigurations."tacocat" = inputs.home-manager.lib.homeManagerConfiguration { inherit pkgs; # Specify your home configuration modules here, for example, diff --git a/helix/default.nix b/helix/default.nix index e62d2ba..48fcb4d 100644 --- a/helix/default.nix +++ b/helix/default.nix @@ -22,7 +22,7 @@ clang-tools marksman nil - nodePackages.bash-language-server + # nodePackages.bash-language-server nodePackages.vscode-css-languageserver-bin nodePackages.vscode-langservers-extracted shellcheck @@ -55,31 +55,5 @@ }; }; }; -# languages = { -# language = [{ -# name = "nix"; -# scope = "flake.nix"; -# roots = [ "flake.nix" "flake.lock" ]; -# injection-regex = "nix"; -# auto-format = false; -# file-types = [ "nix" ]; -# comment-token = "#"; -# indent = { -# tab-width = 2; -# unit = " "; -# }; -# language-servers = [ "${pkgs.nil}" ]; -# formatter = { -# command = "${pkgs.nixpkgs-fmt}"; -# }; -# }]; -# grammar = [{ -# name = "nix"; -# source = { -# git = "https://github.com/nix-community/tree-sitter-nix"; -# rev = "66e3e9ce9180ae08fc57372061006ef83f0abde7"; -# }; -# }]; -# }; }; } diff --git a/helix/languages.nix b/helix/languages.nix index 4ab1890..68bc102 100644 --- a/helix/languages.nix +++ b/helix/languages.nix @@ -3,10 +3,10 @@ { programs.helix.languages = { language-server = { - bash-language-server = { - command = "${pkgs.nodePackages.bash-language-server}/bin/bash-language-server"; - args = ["start"]; - }; + # bash-language-server = { + # command = "${pkgs.nodePackages.bash-language-server}/bin/bash-language-server"; + # args = ["start"]; + # }; clangd = { command = "${pkgs.clang-tools}/bin/clangd";