From 9a695e8c3281efad4ecbaca96d3ae5235a63eee1 Mon Sep 17 00:00:00 2001 From: RGBCube Date: Sun, 14 May 2023 15:44:52 +0300 Subject: [PATCH] Fix fields getting overwritten --- machines/asus/helix/default.nix | 44 ++----------------------- machines/asus/helix/languageServers.nix | 43 ++++++++++++++++++++++++ 2 files changed, 46 insertions(+), 41 deletions(-) create mode 100644 machines/asus/helix/languageServers.nix diff --git a/machines/asus/helix/default.nix b/machines/asus/helix/default.nix index 1469f25..7c36a30 100644 --- a/machines/asus/helix/default.nix +++ b/machines/asus/helix/default.nix @@ -1,4 +1,4 @@ -{ pkgs, homeConfiguration, homePackages, enabled, ... }: +{ homeConfiguration, imports, enabled, ... }: (homeConfiguration "nixos" { programs.nushell = { @@ -61,44 +61,6 @@ // -(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 +(imports [ + ./languageServers.nix ]) diff --git a/machines/asus/helix/languageServers.nix b/machines/asus/helix/languageServers.nix new file mode 100644 index 0000000..65d8998 --- /dev/null +++ b/machines/asus/helix/languageServers.nix @@ -0,0 +1,43 @@ +{ pkgs, homePackages, ... }: + +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 +]