Skip to content

Commit

Permalink
Avoid to use buildFHSEnv for zed-editor to fix ENOSPC error (#810)
Browse files Browse the repository at this point in the history
Revert ae380db to fix GH-809

Simply disables JSON/JSONC/YAML LSP to suppress noisy message `checking for updates to json language server`.

TOML LSP does not make problems for now

Several added config about JSON LSP is not working. Added for daily testing.
  • Loading branch information
kachick authored Oct 1, 2024
1 parent 96c4d9c commit 630d812
Show file tree
Hide file tree
Showing 3 changed files with 36 additions and 15 deletions.
27 changes: 27 additions & 0 deletions config/zed/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,33 @@
"tabs": {
"file_icons": true
},
"lsp": {
"vscode-json-language-server": {
"binary": {
"path": "/run/current-system/sw/bin/vscode-json-language-server",
"arguments": ["--stdio"]
}
},
"json-language-server": {
"binary": {
"path": "/run/current-system/sw/bin/vscode-json-language-server",
"arguments": ["--stdio"]
}
}
},
"languages": {
"JSON": {
// "enable_language_server": false, // Didn't disable with this option
"language_servers": ["vscode-json-language-server", "!json-language-server"]
},
"JSONC": {
// "enable_language_server": false, // Didn't disable with this option
"language_servers": ["vscode-json-language-server", "!json-language-server"]
},
"YAML": {
"enable_language_server": false
}
},
"auto_install_extensions": {
"nix": true,
"toml": true,
Expand Down
2 changes: 1 addition & 1 deletion home-manager/helix.nix
Original file line number Diff line number Diff line change
Expand Up @@ -224,7 +224,7 @@ in
# https://github.com/helix-editor/helix/blob/24.03/languages.toml#L94
vscode-langservers-extracted

## Not helpful. Didin't activated?
## Not helpful. Didn't activated?
#
# https://github.com/helix-editor/helix/blob/24.03/languages.toml#L1202
# nodePackages.yaml-language-server
Expand Down
22 changes: 8 additions & 14 deletions nixos/desktop/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -8,18 +8,6 @@
...
}:

let
# https://github.com/NixOS/nixpkgs/issues/309662#issuecomment-2155122284
zed-fhs = pkgs.buildFHSUserEnv {
name = "zed";
targetPkgs = pkgs: [
# version in nixos-24.05 does not enable IME
edge-pkgs.zed-editor
];
runScript = "zed";
meta.mainProgram = "zed";
};
in
{
imports = [
(import ./font.nix { inherit pkgs homemade-pkgs; })
Expand Down Expand Up @@ -109,7 +97,11 @@ in
services.blueman.enable = true;

environment.systemPackages =
[ zed-fhs ]
[
# version in nixos-24.05 does not enable IME
# Don't use `buildFHSEnv` even through want to apply LSP smart. See GH-809
edge-pkgs.zed-editor
]
++ (with pkgs; [
firefox

Expand All @@ -126,6 +118,8 @@ in

lapce # IME is not working on Windows, but stable even around IME on Wayland than vscode

vscode-langservers-extracted

# gnome-music does not support flac.
# tramhao/termusic and tsirysndr/music-player does not figure how to use.
rhythmbox
Expand Down Expand Up @@ -237,7 +231,7 @@ in
);

environment.variables = {
VISUAL = "${lib.getExe zed-fhs} --wait";
VISUAL = "${lib.getExe edge-pkgs.zed-editor} --wait";

# Don't set *IM_MODULE in KDE: https://discuss.kde.org/t/kde-plasma-wayland/9014
# QT_IM_MODULE = "fcitx";
Expand Down

0 comments on commit 630d812

Please sign in to comment.