Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

treewide: use microsoft vscode variant #167

Merged
merged 3 commits into from
Jan 5, 2025
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion home/lyc/modules/programs/vscode/vscode.nix
Original file line number Diff line number Diff line change
@@ -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))
// (
2 changes: 1 addition & 1 deletion home/lyc/modules/programs/zsh/zshrc
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion nixos/configurations/adrastea/code-server/README.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
# Code server

This submodule declares using vscodium web services.
This submodule declares using vscode web services.
2 changes: 1 addition & 1 deletion nixos/configurations/adrastea/code-server/default.nix
Original file line number Diff line number Diff line change
@@ -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}"
];
Original file line number Diff line number Diff line change
@@ -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",
]
)
2 changes: 1 addition & 1 deletion nixos/configurations/adrastea/default.nix
Original file line number Diff line number Diff line change
@@ -24,7 +24,7 @@
};

imports = [
# Codium server, for easy FHS access.
# vscode server, for easy FHS access.
./code-server
./game.nix
./gitea.nix