From 7c69793d45e61323840428c4622cb9dac31eda53 Mon Sep 17 00:00:00 2001 From: Stefan Junker Date: Wed, 25 Nov 2020 23:27:29 +0100 Subject: [PATCH] 167.233.1.14: configure for vscode remote-ssh target --- .../configuration/graphical-fullblown.nix | 30 +++++++++---------- .../configuration/text-minimal.nix | 4 +-- nix/os/devices/167.233.1.14/pkg.nix | 8 ++++- nix/os/devices/167.233.1.14/system.nix | 2 ++ 4 files changed, 26 insertions(+), 18 deletions(-) diff --git a/nix/home-manager/configuration/graphical-fullblown.nix b/nix/home-manager/configuration/graphical-fullblown.nix index 9c9ba2b..e020e56 100644 --- a/nix/home-manager/configuration/graphical-fullblown.nix +++ b/nix/home-manager/configuration/graphical-fullblown.nix @@ -168,21 +168,21 @@ in { # unstablepkgs.atom xclip xsel - unstablepkgs.vscode - # (vscode-with-extensions.override { - # # When the extension is already available in the default extensions set. - # vscodeExtensions = with vscode-extensions; [ - # ] - # # Concise version from the vscode market place when not available in the default set. - # ++ vscode-utils.extensionsFromVscodeMarketplace [ - # { - # name = "vsliveshare"; - # publisher = "MS-vsliveshare"; - # version = "0.3.198"; - # sha256 = "019ffyxca3qnqyz1fr7vh0plfdkc3ikr8v295z846lghvwlzjqdh"; - # } - # ]; - # }) + (unstablepkgs.vscode-with-extensions.override { + vscodeExtensions = + (with unstablepkgs.vscode-extensions; [ + bbenoist.Nix + ms-vscode-remote.remote-ssh + ]) + ++ unstablepkgs.vscode-utils.extensionsFromVscodeMarketplace [ + { + name = "remote-ssh-edit"; + publisher = "ms-vscode-remote"; + version = "0.56.0"; + sha256 = "1gy03ff2xqg7q3y4j47z2l94x5gbw0mjd5h4cl3n0q3iaswk1c1r"; + } + ]; + }) # Image/Graphic/Design Tools gnome3.eog diff --git a/nix/home-manager/configuration/text-minimal.nix b/nix/home-manager/configuration/text-minimal.nix index b6c9880..5937909 100644 --- a/nix/home-manager/configuration/text-minimal.nix +++ b/nix/home-manager/configuration/text-minimal.nix @@ -1,4 +1,4 @@ -{ pkgs }: +{ pkgs, extraPackages ? [] }: let zshCurried = import ../programs/zsh.nix { inherit pkgs; }; @@ -26,7 +26,7 @@ in { home.sessionVariables = { }; - home.packages = [] + home.packages = extraPackages ++ (with pkgs; [ iperf3 telnet diff --git a/nix/os/devices/167.233.1.14/pkg.nix b/nix/os/devices/167.233.1.14/pkg.nix index 91301be..1bc1187 100644 --- a/nix/os/devices/167.233.1.14/pkg.nix +++ b/nix/os/devices/167.233.1.14/pkg.nix @@ -8,7 +8,13 @@ nixpkgs.config.packageOverrides = pkgs: with pkgs; { nixPath = (import ../../../default.nix { versionsPath = ./versions.nix; }).nixPath; }; - home-manager.users.steveej = import ../../../home-manager/configuration/text-minimal.nix { inherit pkgs; }; + home-manager.users.steveej = import ../../../home-manager/configuration/text-minimal.nix { + inherit pkgs; + extraPackages = [ + # required by vscode's remote-ssh plugin + pkgs.nodejs + ]; + }; nix.buildMachines = [ { hostName = "localhost"; diff --git a/nix/os/devices/167.233.1.14/system.nix b/nix/os/devices/167.233.1.14/system.nix index a007429..e57d1b0 100644 --- a/nix/os/devices/167.233.1.14/system.nix +++ b/nix/os/devices/167.233.1.14/system.nix @@ -92,6 +92,8 @@ in { networking.useHostResolvConf = true; + services.openssh.forwardX11 = true; + # This value determines the NixOS release from which the default # settings for stateful data, like file locations and database versions # on your system were taken. It‘s perfectly fine and recommended to leave -- 2.49.0