From 19da95bdc8d54fbbe7a295eead860c46a8a48d89 Mon Sep 17 00:00:00 2001 From: RGBCube Date: Sun, 14 May 2023 15:32:39 +0300 Subject: [PATCH] Add language servers for Helix --- flake.lock | 24 +++++----- machines/asus/helix/default.nix | 78 +++++++++++++++++++++++++++++++-- machines/asus/packages.nix | 2 +- 3 files changed, 88 insertions(+), 16 deletions(-) diff --git a/flake.lock b/flake.lock index 4841c0b..2e1e922 100644 --- a/flake.lock +++ b/flake.lock @@ -8,11 +8,11 @@ "rust-analyzer-src": "rust-analyzer-src" }, "locked": { - "lastModified": 1683354017, - "narHash": "sha256-r0BrHDaljUKyQS5FgA4P9xgK+dGa8L0XDL0vBdriEM8=", + "lastModified": 1684045209, + "narHash": "sha256-d6WRNsb5+P7wocC/wCMjkvF0pycKuZ7SHgj5NGmESNQ=", "owner": "nix-community", "repo": "fenix", - "rev": "65fdcbdc0bf35510a013d8a0883b0fa7a4ecd2a8", + "rev": "7c8be7e3312ba06dc95491a44c3c9ba71a175bc4", "type": "github" }, "original": { @@ -28,11 +28,11 @@ ] }, "locked": { - "lastModified": 1683276747, - "narHash": "sha256-T3st1VBg3wmhHyBQb0z12sTSGsQgiu3mxkS61nLO8Xs=", + "lastModified": 1684058710, + "narHash": "sha256-A0Qix+nPSjxO9kn2iFxciui0UolDancvFSWQGxU453s=", "owner": "nix-community", "repo": "home-manager", - "rev": "669669fcb403e3137dfe599bbcc26e60502c3543", + "rev": "db3d440e2664e8aaf67742b6fd545cf148fe5016", "type": "github" }, "original": { @@ -43,11 +43,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1683014792, - "narHash": "sha256-6Va9iVtmmsw4raBc3QKvQT2KT/NGRWlvUlJj46zN8B8=", + "lastModified": 1683408522, + "narHash": "sha256-9kcPh6Uxo17a3kK3XCHhcWiV1Yu1kYj22RHiymUhMkU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "1a411f23ba299db155a5b45d5e145b85a7aafc42", + "rev": "897876e4c484f1e8f92009fd11b7d988a121a4e7", "type": "github" }, "original": { @@ -67,11 +67,11 @@ "rust-analyzer-src": { "flake": false, "locked": { - "lastModified": 1683321754, - "narHash": "sha256-qvyrgObeXw+h+P0VAvaARjRUWn5Ey1ckbs+1El2dc0Y=", + "lastModified": 1684005690, + "narHash": "sha256-m0Dya15vVk4swQdWKqDYHmdU3cirySRjaQ6EgMa2Mcg=", "owner": "rust-lang", "repo": "rust-analyzer", - "rev": "a4966c92829f945d3846eb0ca0e240ac7f7c8c60", + "rev": "cbd14e98403dc5e19f19fdf913808656d81a0516", "type": "github" }, "original": { diff --git a/machines/asus/helix/default.nix b/machines/asus/helix/default.nix index df10c64..1469f25 100644 --- a/machines/asus/helix/default.nix +++ b/machines/asus/helix/default.nix @@ -1,6 +1,6 @@ -{ homeConfiguration, enabled, ... }: +{ pkgs, homeConfiguration, homePackages, enabled, ... }: -homeConfiguration "nixos" { +(homeConfiguration "nixos" { programs.nushell = { environmentVariables = { EDITOR = "hx"; @@ -28,5 +28,77 @@ homeConfiguration "nixos" { whitespace.render.tab = "all"; whitespace.characters.tab = "→"; }; + + settings.languages = [ + { + name = "bash"; + language-server.command = "${pkgs.nodePackages.bash-language-server}/bin/bash-language-server"; + } + { + name = "python"; + roots = [ "pyproject.toml" ]; + config = {}; + auto-format = true; + formatter = { + command = "black"; + args = [ "-" "--quiet" ]; + }; + language-server = { + command = "${pkgs.nodePackages.pyright}/bin/pyright-langserver"; + args = [ "--stdio" ]; + }; + } + { + name = "yaml"; + language-server.command = "${pkgs.nodePackages.yaml-language-server}/bin/yaml-language-server"; + } + ] ++ builtins.map (language: { + name = language; + language-server.command = "${pkgs.nodePackages.typescript-language-server}/bin/typescript-language-server"; + }) [ "javascript" "jsx" "typescript" "tsx" ]; }; -} +}) + +// + +(with pkgs; homePackages "nixos" [ + # BASH + nodePackages.bash-language-server + + # CMAKE + cmake-language-server + + # GO + gopls + + # KOTLIN + kotlin-language-server + + # PYTHON + nodePackages.pyright + black + + # JAVASCRIPT/TYPESCRIPT + nodePackages.typescript-language-server + + # LATEX + texlab + + # LUA + lua-language-server + + # MARKDOWN + marksman + + # NIX + nil + + # RUST + rust-analyzer + + # YAML + nodePackages.yaml-language-server + + # ZIG + zls +]) diff --git a/machines/asus/packages.nix b/machines/asus/packages.nix index 3380312..46b5e54 100644 --- a/machines/asus/packages.nix +++ b/machines/asus/packages.nix @@ -7,7 +7,7 @@ thefuck wine - gcc + llvmPackages_16.clang-unwrapped go (fenix.complete.withComponents [