Skip to content

Commit

Permalink
Merge pull request #135 from holochain/pr_work_on_x64-linux-dev-01
Browse files Browse the repository at this point in the history
x64-linux-dev-01: accept GIT_AUTHOR_* env vars in SSH sessions; add nixos-vscode-server
  • Loading branch information
steveej authored Jul 31, 2024
2 parents 19bbbfc + d7cc7fb commit 8e8c35b
Show file tree
Hide file tree
Showing 3 changed files with 99 additions and 18 deletions.
82 changes: 68 additions & 14 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 8 additions & 4 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -73,10 +73,12 @@
flake = false;
};

keys_zippy = {
url = "https://github.com/zippy.keys";
flake = false;
};
# hash mismatch 20240710
# keys_zippy = {
# url = "https://github.com/zippy.keys";
# flake = false;
# };

keys_artbrock = {
url = "https://github.com/artbrock.keys";
flake = false;
Expand Down Expand Up @@ -114,6 +116,8 @@
holoNixpkgs.url = "https://hydra.holo.host/channel/custom/holo-nixpkgs/2112/holo-nixpkgs/nixexprs.tar.xz";

nixpkgsPulumi.url = "github:steveej-forks/nixpkgs/pulumi-version-bump";

nixos-vscode-server.url = "github:nix-community/nixos-vscode-server";
};

outputs = inputs @ {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,18 +27,41 @@ in {
home-manager.users.dev = {pkgs, ...}: {
home.packages = [
# additional packages for this user go here
pkgs.nil
pkgs.wget
pkgs.file
];
};

services.openssh.settings.AcceptEnv = builtins.concatStringsSep " " [
"GIT_AUTHOR_*"
"GIT_COMMITTER_*"
];
}

../../nixos/dev-minio.nix
{
services.devMinio.enable = true;
}

inputs.nixos-vscode-server.nixosModules.default
({
config,
pkgs,
...
}: {
services.vscode-server = {
enable = true;
installPath = "$HOME/.vscodium-server";
nodejsPackage = pkgs.nodejs_18;
};
})
];

nix.settings.system-features = [
"big-parallel"
"kvm"
"nixos-test"
];

networking = {
Expand Down

0 comments on commit 8e8c35b

Please sign in to comment.