update vscode-server
This commit is contained in:
parent
cf71ecde9f
commit
b108f041d9
14
flake.lock
generated
14
flake.lock
generated
@ -1313,7 +1313,7 @@
|
||||
"rnix-lsp": "rnix-lsp",
|
||||
"rycee": "rycee",
|
||||
"simple-nixos-mailserver": "simple-nixos-mailserver",
|
||||
"vscode-server-fixup": "vscode-server-fixup",
|
||||
"vscode-server": "vscode-server",
|
||||
"webcord": "webcord",
|
||||
"zsh-autosuggestions": "zsh-autosuggestions",
|
||||
"zsh-nix-shell": "zsh-nix-shell",
|
||||
@ -1437,22 +1437,22 @@
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"vscode-server-fixup": {
|
||||
"vscode-server": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1657846023,
|
||||
"narHash": "sha256-W7XkZ96U/fRzZDU6YGGBQGgxo6A6RJzOrfSRweCZfjw=",
|
||||
"owner": "MatthewCash",
|
||||
"lastModified": 1676159144,
|
||||
"narHash": "sha256-/TJD9hZ0+u7oSJkNxmAE/UlxndFkZCu1fC6re7I/DYY=",
|
||||
"owner": "msteen",
|
||||
"repo": "nixos-vscode-server",
|
||||
"rev": "58a5bbc00235d212a3c99bb62113504abf13da50",
|
||||
"rev": "43ca5e6d4e45ae6933aaeb1850b4cdf62c25a11f",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "MatthewCash",
|
||||
"owner": "msteen",
|
||||
"repo": "nixos-vscode-server",
|
||||
"type": "github"
|
||||
}
|
||||
|
10
flake.nix
10
flake.nix
@ -75,8 +75,9 @@
|
||||
url = "gitlab:simple-nixos-mailserver/nixos-mailserver";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
vscode-server-fixup = {
|
||||
url = "github:MatthewCash/nixos-vscode-server";
|
||||
vscode-server = {
|
||||
url = "github:msteen/nixos-vscode-server";
|
||||
# url = "github:MatthewCash/nixos-vscode-server";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
webcord = {
|
||||
@ -150,7 +151,10 @@
|
||||
};
|
||||
Home-Hypervisor = {
|
||||
system = builtins.readFile (./machines/Home-Hypervisor/system);
|
||||
modules = [ (import (./machines/Home-Hypervisor)) { device = "Home-Hypervisor"; mainuser = "ataraxia"; } ];
|
||||
modules = [
|
||||
(import (./machines/Home-Hypervisor)) { device = "Home-Hypervisor"; mainuser = "ataraxia"; }
|
||||
inputs.vscode-server.nixosModule
|
||||
];
|
||||
specialArgs = { inherit inputs; };
|
||||
};
|
||||
Flakes-ISO = {
|
||||
|
@ -1,19 +1,8 @@
|
||||
{ config, lib, pkgs, inputs, ... }: {
|
||||
home-manager.sharedModules = [
|
||||
inputs.vscode-server-fixup.nixosModules.home-manager.nixos-vscode-server
|
||||
];
|
||||
|
||||
home-manager.users.${config.mainuser} = let
|
||||
extensions = builtins.tryEval config.home-manager.users.${config.mainuser}.programs.vscode.extensions;
|
||||
in {
|
||||
services.vscode-server = {
|
||||
enable = true;
|
||||
extensions = if extensions.success then extensions.value
|
||||
else with inputs.nix-vscode-marketplace.packages.${pkgs.system}.vscode; [
|
||||
bbenoist.nix
|
||||
];
|
||||
immutableExtensionsDir = true;
|
||||
};
|
||||
services.vscode-server = {
|
||||
enable = true;
|
||||
nodejsPackage = pkgs.nodejs-16_x;
|
||||
#installPath = "~/.vscode-server-oss";
|
||||
};
|
||||
|
||||
persist.state.homeDirectories = [ ".vscode-server" ];
|
||||
|
Loading…
x
Reference in New Issue
Block a user