From 7c6e07b3704f6358141539fe538044c38401eba2 Mon Sep 17 00:00:00 2001 From: Ryan Lahfa Date: Mon, 23 Feb 2026 15:32:02 +0100 Subject: [PATCH 1/3] npins/sources: use teams branch Signed-off-by: Ryan Lahfa --- npins/sources.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/npins/sources.json b/npins/sources.json index 1987375..e89d55c 100644 --- a/npins/sources.json +++ b/npins/sources.json @@ -66,11 +66,11 @@ "owner": "cloud-gouv", "repo": "securix" }, - "branch": "main", + "branch": "teams-inventory-v2", "submodules": false, - "revision": "f7b4cd1535886edb6760e0b7c3d17fef4b806cf6", - "url": "https://github.com/cloud-gouv/securix/archive/f7b4cd1535886edb6760e0b7c3d17fef4b806cf6.tar.gz", - "hash": "14mym9npvc58ra6hcncdzrqax2yf4afqiql9a1mc90lr2b137gfy" + "revision": "14e49c4847f7f5daa0881d0d597ebef5cf40122a", + "url": "https://github.com/cloud-gouv/securix/archive/14e49c4847f7f5daa0881d0d597ebef5cf40122a.tar.gz", + "hash": "1rfxh640aiaf150my0s4ppaqjqijhvwf7wn32jgkk4fqwr5sm7h2" }, "snowboot": { "type": "Git", From 7e76fbe70cf43aa1220da623873616f93a9954d3 Mon Sep 17 00:00:00 2001 From: Ryan Lahfa Date: Mon, 23 Feb 2026 15:32:03 +0100 Subject: [PATCH 2/3] inventory/users/heloise: enter into eng team Signed-off-by: Ryan Lahfa --- default.nix | 38 +++++++++++++++++++++++-------------- inventory/users/heloise.nix | 2 ++ 2 files changed, 26 insertions(+), 14 deletions(-) diff --git a/default.nix b/default.nix index 3fec19a..d2e4cf2 100644 --- a/default.nix +++ b/default.nix @@ -212,20 +212,30 @@ rec { }; # { , , ... } - terminals = mapAttrs ( - serial: - { machineModule, userModules }: - securix.lib.mkTerminal { - name = serial; - userSpecificModule = { }; - vpnProfiles = { }; - modules = [ - machineModule - ./common - ] - ++ userModules; - } - ) (securix.lib.readInventory2 { dir = ./inventory; }); + terminals = + mapAttrs + ( + serial: + { machineModule, userModules }: + securix.lib.mkTerminal { + name = serial; + userSpecificModule = { }; + vpnProfiles = { }; + modules = [ + machineModule + ./common + ] + ++ userModules; + } + ) + ( + securix.lib.readInventory2 { + dir = ./inventory; + teams = { + engineering = [ ./developer ]; + }; + } + ); # Toplevel registry: # iterate over all terminals and perform: $serial $toplevel generation. diff --git a/inventory/users/heloise.nix b/inventory/users/heloise.nix index 39b3f36..3b553a7 100644 --- a/inventory/users/heloise.nix +++ b/inventory/users/heloise.nix @@ -10,5 +10,7 @@ # password is `test` hashedPassword = "$y$j9T$zk4xGLyshz7RzqnMX6M8O0$AybRelILMkQSWcQZV4s.ykRNi/UlgaCUaDwdee0n7N2"; defaultLoginShell = pkgs.zsh; + + teams = [ "engineering" ]; }; } From d931475babe4f2a290e90170b147167810621038 Mon Sep 17 00:00:00 2001 From: Ryan Lahfa Date: Mon, 23 Feb 2026 15:32:04 +0100 Subject: [PATCH 3/3] common: drop i18n change It is conflicting with Securix's en_US default. Signed-off-by: Ryan Lahfa --- common/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/common/default.nix b/common/default.nix index 6a6991b..dc84dd2 100644 --- a/common/default.nix +++ b/common/default.nix @@ -52,7 +52,6 @@ # It's mostly meant for French audiences, you can adapt # Better: you can let users override it! - i18n.defaultLocale = lib.mkDefault "fr_FR.UTF-8"; console = { keyMap = lib.mkDefault "fr"; };