Skip to content

Commit

Permalink
treewide: switch "code-oss" to "vscodium" (#152)
Browse files Browse the repository at this point in the history
The "Code - OSS" repository has altered its dependency manager to "npm"
which caused numerous issues for nixpkgs.
The most critical issue is the offline cache produced by npm is
completely non-reproducible.
As a result, it is currently challenging to update the version of
"code-oss" (build-from-source version).

For now, I am switching from "code-oss" to "vscodium" the binary
releases maintained by the community.


Link: microsoft/vscode#196795
Link: microsoft/vscode#226927
Link: NixOS/nixpkgs#318673
  • Loading branch information
inclyc authored Oct 10, 2024
1 parent ae2ef55 commit f354c0e
Show file tree
Hide file tree
Showing 18 changed files with 1 addition and 1,154 deletions.
1 change: 0 additions & 1 deletion home/lyc/configurations/aplax/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@
qemu
telegram-desktop

code-oss
ollama

ocaml
Expand Down
14 changes: 0 additions & 14 deletions home/lyc/modules/programs/vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -180,20 +180,6 @@
"python.languageServer": "None",
"python.terminal.activateEnvironment": false,
"remote.SSH.enableRemoteCommand": true,
"remote.SSH.experimental.connections": {
"adrastea-v6": {
"listeningOn": "/run/user/1000/code-default.socket"
},
"adrastea-zxy": {
"listeningOn": "/run/user/1001/code.socket"
},
"adrastea-zxy-v6": {
"listeningOn": "/run/user/1001/code.socket"
},
"metis": {
"listeningOn": "/run/user/1002/code.socket"
}
},
"remote.SSH.remotePlatform": {
"adrastea": "linux",
"adrastea-pub": "linux",
Expand Down
2 changes: 1 addition & 1 deletion home/lyc/modules/programs/zsh/zshrc
Original file line number Diff line number Diff line change
Expand Up @@ -51,4 +51,4 @@ zle -N down-line-or-beginning-search
[[ -n "${key[Down]}" ]] && bindkey -- "${key[Down]}" down-line-or-beginning-search


export EDITOR="code-oss --wait"
export EDITOR="codium --wait"
34 changes: 0 additions & 34 deletions nixos/configurations/adrastea/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -21,38 +21,6 @@
rust.enable = true;
python.enable = true;
};
services."code-server".default = {
exe = "${pkgs.code-oss.rehweb}/bin/code-server-oss";
socketPath = "$XDG_RUNTIME_DIR/code-default.socket";
};
services."code-server".fhs =
let
name = "vscode-env";
fhs = pkgs.buildFHSEnv {
inherit name;
targetPkgs =
pkgs:
(with pkgs; [
stdenv.cc
perl
python3
cudatoolkit
libGL
glib
zlib
git
openssh
])
++ [ config.boot.kernelPackages.nvidia_x11 ];
runScript = pkgs.writeShellScript "code-oss-server.sh" ''
${pkgs.code-oss.rehweb}/bin/code-server-oss $@
'';
};
in
{
exe = "${fhs}/bin/${name}";
socketPath = "$XDG_RUNTIME_DIR/code.socket";
};
};

imports = [
Expand Down Expand Up @@ -139,8 +107,6 @@
nodejs
yarn

code-oss

kitty.terminfo

nixfmt-rfc-style
Expand Down
2 changes: 0 additions & 2 deletions nixos/configurations/aplaz/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -137,8 +137,6 @@ in

nodejs
yarn

(code-oss.override { disableMangle = true; })
];

hardware.bluetooth.enable = true;
Expand Down
5 changes: 0 additions & 5 deletions nixos/configurations/metis/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,6 @@
boot.loader.systemd-boot.enable = true;
boot.loader.efi.canTouchEfiVariables = true;

inclyc.services."code-server".default = {
exe = "${pkgs.code-oss.rehweb}/bin/code-server-oss";
socketPath = "$XDG_RUNTIME_DIR/code.socket";
};

nix.registry.sys = {
from = {
type = "indirect";
Expand Down
50 changes: 0 additions & 50 deletions nixos/modules/code-server.nix

This file was deleted.

3 changes: 0 additions & 3 deletions nixos/modules/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,6 @@
# Language-specific environments
./rust.nix
./python.nix

# Services to external world
./code-server.nix
];

home-manager = {
Expand Down
78 changes: 0 additions & 78 deletions pkgs/code-oss/common.nix

This file was deleted.

Loading

0 comments on commit f354c0e

Please sign in to comment.