From ac959fc50f48335027e13190c12ac2e60ae18cd7 Mon Sep 17 00:00:00 2001 From: Yingchi Long Date: Sun, 5 Jan 2025 10:14:03 +0800 Subject: [PATCH 1/3] nixos/configurations/adrastea/code-server: use microsoft variant --- nixos/configurations/adrastea/code-server/README.md | 2 +- nixos/configurations/adrastea/code-server/default.nix | 2 +- nixos/configurations/adrastea/code-server/start-code-server.py | 3 ++- nixos/configurations/adrastea/default.nix | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/nixos/configurations/adrastea/code-server/README.md b/nixos/configurations/adrastea/code-server/README.md index 6e17478..8ef20ca 100644 --- a/nixos/configurations/adrastea/code-server/README.md +++ b/nixos/configurations/adrastea/code-server/README.md @@ -1,3 +1,3 @@ # Code server -This submodule declares using vscodium web services. +This submodule declares using vscode web services. diff --git a/nixos/configurations/adrastea/code-server/default.nix b/nixos/configurations/adrastea/code-server/default.nix index f941805..32d147c 100644 --- a/nixos/configurations/adrastea/code-server/default.nix +++ b/nixos/configurations/adrastea/code-server/default.nix @@ -28,7 +28,7 @@ let ${builtins.readFile ./start-code-server.py} ''}"; Environment = [ - "WebHost=${pkgs.vscodium-web-host}" + "WebHost=${pkgs.vscode-web-host}" "Port=${port}" "ConnectionTokenFile=${config.sops.secrets.${secretName}.path}" ]; diff --git a/nixos/configurations/adrastea/code-server/start-code-server.py b/nixos/configurations/adrastea/code-server/start-code-server.py index 7ebc2c5..c6f2bd5 100644 --- a/nixos/configurations/adrastea/code-server/start-code-server.py +++ b/nixos/configurations/adrastea/code-server/start-code-server.py @@ -4,12 +4,13 @@ subprocess.run( [ - f"{os.environ["WebHost"]}/bin/codium-server", + f"{os.environ["WebHost"]}/bin/code-server", "--host", "127.0.0.1", "--port", os.environ["Port"], "--connection-token-file", os.environ["ConnectionTokenFile"], + "--accept-server-license-terms", ] ) diff --git a/nixos/configurations/adrastea/default.nix b/nixos/configurations/adrastea/default.nix index f865375..b8e398a 100644 --- a/nixos/configurations/adrastea/default.nix +++ b/nixos/configurations/adrastea/default.nix @@ -24,7 +24,7 @@ }; imports = [ - # Codium server, for easy FHS access. + # vscode server, for easy FHS access. ./code-server ./game.nix ./gitea.nix From 963f011d6fe8aea9bc4108acd4801af476053321 Mon Sep 17 00:00:00 2001 From: Yingchi Long Date: Sun, 5 Jan 2025 16:53:20 +0800 Subject: [PATCH 2/3] home/lyc/modules/programs/vscode: use microsoft variant --- home/lyc/modules/programs/vscode/vscode.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home/lyc/modules/programs/vscode/vscode.nix b/home/lyc/modules/programs/vscode/vscode.nix index 9297c8d..bfb0ba0 100644 --- a/home/lyc/modules/programs/vscode/vscode.nix +++ b/home/lyc/modules/programs/vscode/vscode.nix @@ -4,7 +4,7 @@ enable = lib.mkDefault false; # Use open-source version of microsoft/vscode - package = pkgs.vscodium; + package = pkgs.vscode; userSettings = (builtins.fromJSON (builtins.readFile ./settings.json)) // ( From 1e728c23a3d10abfba17f432bbe84a4865bb5592 Mon Sep 17 00:00:00 2001 From: Yingchi Long Date: Sun, 5 Jan 2025 16:58:14 +0800 Subject: [PATCH 3/3] home/lyc/modules/programs/zsh/zshrc: EDITOR = "code --wait" --- home/lyc/modules/programs/zsh/zshrc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home/lyc/modules/programs/zsh/zshrc b/home/lyc/modules/programs/zsh/zshrc index 0c585f5..208c6c1 100644 --- a/home/lyc/modules/programs/zsh/zshrc +++ b/home/lyc/modules/programs/zsh/zshrc @@ -51,7 +51,7 @@ zle -N down-line-or-beginning-search [[ -n "${key[Down]}" ]] && bindkey -- "${key[Down]}" down-line-or-beginning-search -export EDITOR="codium --wait" +export EDITOR="code --wait" # Enable word movement with Ctrl + Arrow keys bindkey '^[[1;5D' backward-word # Ctrl + Left Arrow