From afc22aafdeb69cee50e3a2ec2542ed1fb90f72f2 Mon Sep 17 00:00:00 2001 From: Sridhar Ratnakumar Date: Wed, 24 May 2023 19:57:49 -0400 Subject: [PATCH] vscode-server: use insiders --- flake.lock | 77 +++++++++++++++++++++++++++------ flake.nix | 2 +- home/vscode-server.nix | 1 + nixos/gui/desktopish/vscode.nix | 8 ++-- 4 files changed, 70 insertions(+), 18 deletions(-) diff --git a/flake.lock b/flake.lock index 1fbbe3a..e934bcd 100644 --- a/flake.lock +++ b/flake.lock @@ -542,6 +542,24 @@ } }, "flake-utils_6": { + "inputs": { + "systems": "systems_2" + }, + "locked": { + "lastModified": 1681202837, + "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "cfacdce06f30d2b68473a46042957675eebb3401", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_7": { "locked": { "lastModified": 1659877975, "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", @@ -869,17 +887,20 @@ } }, "nixos-vscode-server": { - "flake": false, + "inputs": { + "flake-utils": "flake-utils_6", + "nixpkgs": "nixpkgs_10" + }, "locked": { - "lastModified": 1676159144, - "narHash": "sha256-/TJD9hZ0+u7oSJkNxmAE/UlxndFkZCu1fC6re7I/DYY=", - "owner": "msteen", + "lastModified": 1684517665, + "narHash": "sha256-SaAr66uCQ8CF75jIr23FZjk1+9Kfwm5sQnwV25206Gs=", + "owner": "nix-community", "repo": "nixos-vscode-server", - "rev": "43ca5e6d4e45ae6933aaeb1850b4cdf62c25a11f", + "rev": "1e1358493df6529d4c7bc4cc3066f76fd16d4ae6", "type": "github" }, "original": { - "owner": "msteen", + "owner": "nix-community", "repo": "nixos-vscode-server", "type": "github" } @@ -993,7 +1014,7 @@ "nixpkgs-match": { "inputs": { "flake-parts": "flake-parts_5", - "nixpkgs": "nixpkgs_11" + "nixpkgs": "nixpkgs_12" }, "locked": { "lastModified": 1672924430, @@ -1026,6 +1047,19 @@ } }, "nixpkgs_10": { + "locked": { + "lastModified": 1682526928, + "narHash": "sha256-2cKh4O6t1rQ8Ok+v16URynmb0rV7oZPEbXkU0owNLQs=", + "path": "/nix/store/wsci3as2flp84w6w5gzbyphxzf6ilasd-source", + "rev": "d6b863fd9b7bb962e6f9fdf292419a775e772891", + "type": "path" + }, + "original": { + "id": "nixpkgs", + "type": "indirect" + } + }, + "nixpkgs_11": { "locked": { "lastModified": 1682526928, "narHash": "sha256-2cKh4O6t1rQ8Ok+v16URynmb0rV7oZPEbXkU0owNLQs=", @@ -1041,7 +1075,7 @@ "type": "github" } }, - "nixpkgs_11": { + "nixpkgs_12": { "locked": { "lastModified": 1672756850, "narHash": "sha256-Smbq3+fitwA13qsTMeaaurv09/KVbZfW7m7lINwzDGA=", @@ -1057,7 +1091,7 @@ "type": "github" } }, - "nixpkgs_12": { + "nixpkgs_13": { "locked": { "lastModified": 1679793451, "narHash": "sha256-JafTtgMDATE8dZOImBhWMA9RCn9AP8FVOpN+9K/tTlg=", @@ -1071,7 +1105,7 @@ "type": "indirect" } }, - "nixpkgs_13": { + "nixpkgs_14": { "locked": { "lastModified": 1683475240, "narHash": "sha256-sy6MYoCaIZsOenYplbzVXI4Ce9Bp/vIOpuFa97+a6wc=", @@ -1248,7 +1282,7 @@ }, "nuenv_2": { "inputs": { - "nixpkgs": "nixpkgs_12", + "nixpkgs": "nixpkgs_13", "rust-overlay": "rust-overlay_2" }, "locked": { @@ -1401,7 +1435,7 @@ "nixos-hardware": "nixos-hardware", "nixos-shell": "nixos-shell", "nixos-vscode-server": "nixos-vscode-server", - "nixpkgs": "nixpkgs_10", + "nixpkgs": "nixpkgs_11", "nixpkgs-match": "nixpkgs-match", "nuenv": "nuenv_2", "sops-nix": "sops-nix", @@ -1450,7 +1484,7 @@ }, "rust-overlay_2": { "inputs": { - "flake-utils": "flake-utils_6", + "flake-utils": "flake-utils_7", "nixpkgs": [ "nuenv", "nixpkgs" @@ -1488,7 +1522,7 @@ }, "sops-nix": { "inputs": { - "nixpkgs": "nixpkgs_13", + "nixpkgs": "nixpkgs_14", "nixpkgs-stable": "nixpkgs-stable" }, "locked": { @@ -1521,6 +1555,21 @@ "type": "github" } }, + "systems_2": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "treefmt-nix": { "locked": { "lastModified": 1672170030, diff --git a/flake.nix b/flake.nix index f634deb..f45d65b 100644 --- a/flake.nix +++ b/flake.nix @@ -23,8 +23,8 @@ # Software inputs nixos-shell.url = "github:Mic92/nixos-shell"; - nixos-vscode-server.url = "github:msteen/nixos-vscode-server"; nixos-vscode-server.flake = false; + nixos-vscode-server.url = "github:nix-community/nixos-vscode-server"; emanote.url = "github:srid/emanote"; nixpkgs-match.url = "github:srid/nixpkgs-match"; nuenv.url = "github:DeterminateSystems/nuenv"; diff --git a/home/vscode-server.nix b/home/vscode-server.nix index b259bc3..891d465 100644 --- a/home/vscode-server.nix +++ b/home/vscode-server.nix @@ -5,4 +5,5 @@ ]; services.vscode-server.enable = true; + services.vscode-server.installPath = "~/.vscode-server-insiders"; } diff --git a/nixos/gui/desktopish/vscode.nix b/nixos/gui/desktopish/vscode.nix index da3e0c9..02f0081 100644 --- a/nixos/gui/desktopish/vscode.nix +++ b/nixos/gui/desktopish/vscode.nix @@ -1,8 +1,10 @@ { pkgs, flake, ... }: { - imports = [ - flake.inputs.nixos-vscode-server.nixosModules.system + /* imports = [ + flake.inputs.nixos-vscode-server.nixosModules.default ]; - services.auto-fix-vscode-server.enable = true; + services.vscode-server.enable = true; + services.vscode-server.installPath = "~/.vscode-server-insiders"; + */ # https://unix.stackexchange.com/q/659901/14042 services.gnome.gnome-keyring.enable = true;