From ea877330d0571465c5cccaca70b73ea5ee1388a1 Mon Sep 17 00:00:00 2001 From: Stefan Junker Date: Wed, 10 Jul 2024 11:14:45 +0200 Subject: [PATCH 1/5] x64-linux-dev-01: accept GIT_AUTHOR_* env vars in SSH sessions this allows devs to override this variable via their SSH config --- .../nixosConfigurations.x64-linux-dev-01/configuration.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/modules/flake-parts/nixosConfigurations.x64-linux-dev-01/configuration.nix b/modules/flake-parts/nixosConfigurations.x64-linux-dev-01/configuration.nix index ed4267fa..1224ea94 100644 --- a/modules/flake-parts/nixosConfigurations.x64-linux-dev-01/configuration.nix +++ b/modules/flake-parts/nixosConfigurations.x64-linux-dev-01/configuration.nix @@ -29,6 +29,11 @@ in { # additional packages for this user go here ]; }; + + services.openssh.settings.AcceptEnv = builtins.concatStringsSep " " [ + "GIT_AUTHOR_NAME" + "GIT_AUTHOR_EMAIL" + ]; } ../../nixos/dev-minio.nix From 94effe9bc3f90e5a38433e3da9d6578ca35637fb Mon Sep 17 00:00:00 2001 From: Stefan Junker Date: Wed, 10 Jul 2024 11:44:23 +0200 Subject: [PATCH 2/5] chore: disable keys_zippy due to hash mismatch --- flake.lock | 13 ------------- flake.nix | 10 ++++++---- 2 files changed, 6 insertions(+), 17 deletions(-) diff --git a/flake.lock b/flake.lock index cbf6d8d2..99f8f40a 100644 --- a/flake.lock +++ b/flake.lock @@ -955,18 +955,6 @@ "url": "https://github.com/ThetaSinner.keys" } }, - "keys_zippy": { - "flake": false, - "locked": { - "narHash": "sha256-0OoNLGRMmWmezTJGQdbQno6BCYHnuuuUKVfY48chkOw=", - "type": "file", - "url": "https://github.com/zippy.keys" - }, - "original": { - "type": "file", - "url": "https://github.com/zippy.keys" - } - }, "lair": { "flake": false, "locked": { @@ -1674,7 +1662,6 @@ "keys_jost-s": "keys_jost-s", "keys_steveej": "keys_steveej", "keys_thetasinner": "keys_thetasinner", - "keys_zippy": "keys_zippy", "microvm": "microvm", "nixos-anywhere": "nixos-anywhere", "nixos-generators": "nixos-generators", diff --git a/flake.nix b/flake.nix index f176c073..4e0a7a25 100644 --- a/flake.nix +++ b/flake.nix @@ -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; From 0c6aba93d052ddc69f8a55ebc6ad9dc84fc8a692 Mon Sep 17 00:00:00 2001 From: Stefan Junker Date: Wed, 10 Jul 2024 11:14:45 +0200 Subject: [PATCH 3/5] x64-linux-dev-01: accept GIT_COMMITTER_* env vars in SSH sessions this allows devs to override this variable via their SSH config --- .../nixosConfigurations.x64-linux-dev-01/configuration.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/flake-parts/nixosConfigurations.x64-linux-dev-01/configuration.nix b/modules/flake-parts/nixosConfigurations.x64-linux-dev-01/configuration.nix index 1224ea94..1be6e790 100644 --- a/modules/flake-parts/nixosConfigurations.x64-linux-dev-01/configuration.nix +++ b/modules/flake-parts/nixosConfigurations.x64-linux-dev-01/configuration.nix @@ -31,8 +31,8 @@ in { }; services.openssh.settings.AcceptEnv = builtins.concatStringsSep " " [ - "GIT_AUTHOR_NAME" - "GIT_AUTHOR_EMAIL" + "GIT_AUTHOR_*" + "GIT_COMMITTER_*" ]; } From 05b949bfee3c716190825fe022824d5bcf039a49 Mon Sep 17 00:00:00 2001 From: Stefan Junker Date: Thu, 18 Jul 2024 13:10:20 +0200 Subject: [PATCH 4/5] x64-linux-dev: add nixos-vscode-server for remote development this module is merely for patching the binaries that are installed by vscodium's remote-SSH plugin. it doesn't provide any actual servers. --- flake.lock | 69 ++++++++++++++++++- flake.nix | 2 + .../configuration.nix | 16 +++++ 3 files changed, 86 insertions(+), 1 deletion(-) diff --git a/flake.lock b/flake.lock index 99f8f40a..0079020a 100644 --- a/flake.lock +++ b/flake.lock @@ -585,6 +585,24 @@ "inputs": { "systems": "systems_5" }, + "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_6": { + "inputs": { + "systems": "systems_6" + }, "locked": { "lastModified": 1709126324, "narHash": "sha256-q6EQdSeUZOG26WelxqkmR7kArjgWCdw5sfJVHPH/7j8=", @@ -1260,6 +1278,25 @@ "type": "github" } }, + "nixos-vscode-server": { + "inputs": { + "flake-utils": "flake-utils_5", + "nixpkgs": "nixpkgs_5" + }, + "locked": { + "lastModified": 1713958148, + "narHash": "sha256-8PDNi/dgoI2kyM7uSiU4eoLBqUKoA+3TXuz+VWmuCOc=", + "owner": "nix-community", + "repo": "nixos-vscode-server", + "rev": "fc900c16efc6a5ed972fb6be87df018bcf3035bc", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "nixos-vscode-server", + "type": "github" + } + }, "nixpkgs": { "locked": { "lastModified": 1677534593, @@ -1521,6 +1558,20 @@ "type": "indirect" } }, + "nixpkgs_5": { + "locked": { + "lastModified": 1682134069, + "narHash": "sha256-TnI/ZXSmRxQDt2sjRYK/8j8iha4B4zP2cnQCZZ3vp7k=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "fd901ef4bf93499374c5af385b2943f5801c0833", + "type": "github" + }, + "original": { + "id": "nixpkgs", + "type": "indirect" + } + }, "npm-to-nix": { "flake": false, "locked": { @@ -1665,6 +1716,7 @@ "microvm": "microvm", "nixos-anywhere": "nixos-anywhere", "nixos-generators": "nixos-generators", + "nixos-vscode-server": "nixos-vscode-server", "nixpkgs": [ "nixpkgs-23-11" ], @@ -1923,12 +1975,27 @@ "type": "github" } }, + "systems_6": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "threefold-rfs": { "inputs": { "crane": [ "crane" ], - "flake-utils": "flake-utils_5", + "flake-utils": "flake-utils_6", "nixpkgs": [ "nixpkgs" ], diff --git a/flake.nix b/flake.nix index 4e0a7a25..20064f58 100644 --- a/flake.nix +++ b/flake.nix @@ -116,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 @ { diff --git a/modules/flake-parts/nixosConfigurations.x64-linux-dev-01/configuration.nix b/modules/flake-parts/nixosConfigurations.x64-linux-dev-01/configuration.nix index 1be6e790..830cf72f 100644 --- a/modules/flake-parts/nixosConfigurations.x64-linux-dev-01/configuration.nix +++ b/modules/flake-parts/nixosConfigurations.x64-linux-dev-01/configuration.nix @@ -27,6 +27,9 @@ in { home-manager.users.dev = {pkgs, ...}: { home.packages = [ # additional packages for this user go here + pkgs.nil + pkgs.wget + pkgs.file ]; }; @@ -40,6 +43,19 @@ in { { 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 = [ From d7cc7fbb774a656012f708454a878ac984039fae Mon Sep 17 00:00:00 2001 From: Stefan Junker Date: Mon, 29 Jul 2024 14:50:56 +0200 Subject: [PATCH 5/5] feat(x86-linux-dev-01/nix): add features kvm and nixos-test --- .../nixosConfigurations.x64-linux-dev-01/configuration.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/modules/flake-parts/nixosConfigurations.x64-linux-dev-01/configuration.nix b/modules/flake-parts/nixosConfigurations.x64-linux-dev-01/configuration.nix index 830cf72f..a591d96d 100644 --- a/modules/flake-parts/nixosConfigurations.x64-linux-dev-01/configuration.nix +++ b/modules/flake-parts/nixosConfigurations.x64-linux-dev-01/configuration.nix @@ -60,6 +60,8 @@ in { nix.settings.system-features = [ "big-parallel" + "kvm" + "nixos-test" ]; networking = {