AtaraxiaDev/nixos-config
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

update vscode-server

Browse Source
This commit is contained in:
Dmitriy Kholkin 2023-03-23 01:51:53 +03:00
parent cf71ecde9f
commit b108f041d9
3 changed files with 18 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
flake.lock generated
View File

@ -1313,7 +1313,7 @@
"rnix-lsp": "rnix-lsp", "rnix-lsp": "rnix-lsp",
"rycee": "rycee", "rycee": "rycee",
"simple-nixos-mailserver": "simple-nixos-mailserver", "simple-nixos-mailserver": "simple-nixos-mailserver",
"vscode-server-fixup": "vscode-server-fixup", "vscode-server": "vscode-server",
"webcord": "webcord", "webcord": "webcord",
"zsh-autosuggestions": "zsh-autosuggestions", "zsh-autosuggestions": "zsh-autosuggestions",
"zsh-nix-shell": "zsh-nix-shell", "zsh-nix-shell": "zsh-nix-shell",
@ -1437,22 +1437,22 @@
"type": "github" "type": "github"
} }
}, },
"vscode-server-fixup": { "vscode-server": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
] ]
}, },
"locked": { "locked": {
"lastModified": 1657846023, "lastModified": 1676159144,
"narHash": "sha256-W7XkZ96U/fRzZDU6YGGBQGgxo6A6RJzOrfSRweCZfjw=", "narHash": "sha256-/TJD9hZ0+u7oSJkNxmAE/UlxndFkZCu1fC6re7I/DYY=",
"owner": "MatthewCash", "owner": "msteen",
"repo": "nixos-vscode-server", "repo": "nixos-vscode-server",
"rev": "58a5bbc00235d212a3c99bb62113504abf13da50", "rev": "43ca5e6d4e45ae6933aaeb1850b4cdf62c25a11f",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "MatthewCash", "owner": "msteen",
"repo": "nixos-vscode-server", "repo": "nixos-vscode-server",
"type": "github" "type": "github"
} }

10
flake.nix
View File

@ -75,8 +75,9 @@
url = "gitlab:simple-nixos-mailserver/nixos-mailserver"; url = "gitlab:simple-nixos-mailserver/nixos-mailserver";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
vscode-server-fixup = { vscode-server = {
url = "github:MatthewCash/nixos-vscode-server"; url = "github:msteen/nixos-vscode-server";
# url = "github:MatthewCash/nixos-vscode-server";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
webcord = { webcord = {
@ -150,7 +151,10 @@
}; };
Home-Hypervisor = { Home-Hypervisor = {
system = builtins.readFile (./machines/Home-Hypervisor/system); 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; }; specialArgs = { inherit inputs; };
}; };
Flakes-ISO = { Flakes-ISO = {

15
profiles/servers/vscode-server.nix
View File

@ -1,19 +1,8 @@
{ config, lib, pkgs, inputs, ... }: { { 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 = { services.vscode-server = {
enable = true; enable = true;
extensions = if extensions.success then extensions.value nodejsPackage = pkgs.nodejs-16_x;
else with inputs.nix-vscode-marketplace.packages.${pkgs.system}.vscode; [ #installPath = "~/.vscode-server-oss";
bbenoist.nix
];
immutableExtensionsDir = true;
};
}; };
persist.state.homeDirectories = [ ".vscode-server" ]; persist.state.homeDirectories = [ ".vscode-server" ];