Merge branch 'pr/new-server' into 'master'
167.233.1.14: configure for vscode remote-ssh target See merge request steveeJ/infra!67
This commit is contained in:
commit
e9aacda0a6
4 changed files with 26 additions and 18 deletions
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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";
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue