Skip to content

Commit f354c0e

Browse files
authored
treewide: switch "code-oss" to "vscodium" (#152)
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
1 parent ae2ef55 commit f354c0e

18 files changed

+1
-1154
lines changed

home/lyc/configurations/aplax/default.nix

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@
2929
qemu
3030
telegram-desktop
3131

32-
code-oss
3332
ollama
3433

3534
ocaml

home/lyc/modules/programs/vscode/settings.json

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -180,20 +180,6 @@
180180
"python.languageServer": "None",
181181
"python.terminal.activateEnvironment": false,
182182
"remote.SSH.enableRemoteCommand": true,
183-
"remote.SSH.experimental.connections": {
184-
"adrastea-v6": {
185-
"listeningOn": "/run/user/1000/code-default.socket"
186-
},
187-
"adrastea-zxy": {
188-
"listeningOn": "/run/user/1001/code.socket"
189-
},
190-
"adrastea-zxy-v6": {
191-
"listeningOn": "/run/user/1001/code.socket"
192-
},
193-
"metis": {
194-
"listeningOn": "/run/user/1002/code.socket"
195-
}
196-
},
197183
"remote.SSH.remotePlatform": {
198184
"adrastea": "linux",
199185
"adrastea-pub": "linux",

home/lyc/modules/programs/zsh/zshrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,4 +51,4 @@ zle -N down-line-or-beginning-search
5151
[[ -n "${key[Down]}" ]] && bindkey -- "${key[Down]}" down-line-or-beginning-search
5252

5353

54-
export EDITOR="code-oss --wait"
54+
export EDITOR="codium --wait"

nixos/configurations/adrastea/default.nix

Lines changed: 0 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -21,38 +21,6 @@
2121
rust.enable = true;
2222
python.enable = true;
2323
};
24-
services."code-server".default = {
25-
exe = "${pkgs.code-oss.rehweb}/bin/code-server-oss";
26-
socketPath = "$XDG_RUNTIME_DIR/code-default.socket";
27-
};
28-
services."code-server".fhs =
29-
let
30-
name = "vscode-env";
31-
fhs = pkgs.buildFHSEnv {
32-
inherit name;
33-
targetPkgs =
34-
pkgs:
35-
(with pkgs; [
36-
stdenv.cc
37-
perl
38-
python3
39-
cudatoolkit
40-
libGL
41-
glib
42-
zlib
43-
git
44-
openssh
45-
])
46-
++ [ config.boot.kernelPackages.nvidia_x11 ];
47-
runScript = pkgs.writeShellScript "code-oss-server.sh" ''
48-
${pkgs.code-oss.rehweb}/bin/code-server-oss $@
49-
'';
50-
};
51-
in
52-
{
53-
exe = "${fhs}/bin/${name}";
54-
socketPath = "$XDG_RUNTIME_DIR/code.socket";
55-
};
5624
};
5725

5826
imports = [
@@ -139,8 +107,6 @@
139107
nodejs
140108
yarn
141109

142-
code-oss
143-
144110
kitty.terminfo
145111

146112
nixfmt-rfc-style

nixos/configurations/aplaz/default.nix

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -137,8 +137,6 @@ in
137137

138138
nodejs
139139
yarn
140-
141-
(code-oss.override { disableMangle = true; })
142140
];
143141

144142
hardware.bluetooth.enable = true;

nixos/configurations/metis/default.nix

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,6 @@
99
boot.loader.systemd-boot.enable = true;
1010
boot.loader.efi.canTouchEfiVariables = true;
1111

12-
inclyc.services."code-server".default = {
13-
exe = "${pkgs.code-oss.rehweb}/bin/code-server-oss";
14-
socketPath = "$XDG_RUNTIME_DIR/code.socket";
15-
};
16-
1712
nix.registry.sys = {
1813
from = {
1914
type = "indirect";

nixos/modules/code-server.nix

Lines changed: 0 additions & 50 deletions
This file was deleted.

nixos/modules/default.nix

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,6 @@
2121
# Language-specific environments
2222
./rust.nix
2323
./python.nix
24-
25-
# Services to external world
26-
./code-server.nix
2724
];
2825

2926
home-manager = {

pkgs/code-oss/common.nix

Lines changed: 0 additions & 78 deletions
This file was deleted.

0 commit comments

Comments
 (0)