treewide: use microsoft vscode variant (#167)

inclyc · Jan 5, 2025 · b2e9cc5 · b2e9cc5
2 parents 0e41698 + 1e728c2
commit b2e9cc5
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 6 deletions.
diff --git 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))
       // (

diff --git 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

diff --git 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
@@ -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
@@ -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
@@ -24,7 +24,7 @@
   };
 
   imports = [
-    # Codium server, for easy FHS access.
+    # vscode server, for easy FHS access.
     ./code-server
     ./game.nix
     ./gitea.nix