Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion common/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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";
};
Expand Down
38 changes: 24 additions & 14 deletions default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -212,20 +212,30 @@ rec {
};

# { <serial number1>, <serial number2>, ... }
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.
Expand Down
2 changes: 2 additions & 0 deletions inventory/users/heloise.nix
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,7 @@
# password is `test`
hashedPassword = "$y$j9T$zk4xGLyshz7RzqnMX6M8O0$AybRelILMkQSWcQZV4s.ykRNi/UlgaCUaDwdee0n7N2";
defaultLoginShell = pkgs.zsh;

teams = [ "engineering" ];
};
}
8 changes: 4 additions & 4 deletions npins/sources.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
Loading