M-Labs/it-infra
M-Labs
/
it-infra
8
0
Fork 6
Code Issues 10 Pull Requests Releases Wiki Activity

nixops: remove old rpi

This commit is contained in:
Sebastien Bourdeauducq 2024-02-16 18:10:05 +08:00
parent 219268fcfd
commit 38dbad4488
3 changed files with 1 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
nixops/experimental-users.nix
View File

@ -1,4 +0,0 @@
{ pkgs, ... }:
{
}

2
nixops/nixops.nix
View File

@ -6,8 +6,6 @@
network.enableRollback = true; network.enableRollback = true;
rpi-1 = import ./rpi.nix { host = "rpi-1"; rpi4 = true; }; rpi-1 = import ./rpi.nix { host = "rpi-1"; rpi4 = true; };
rpi-2 = import ./rpi.nix { host = "rpi-2"; rpi4 = false; experimental-users = true; };
rpi-3 = import ./rpi.nix { host = "rpi-3"; rpi4 = true; };
rpi-4 = import ./rpi.nix { host = "rpi-4"; rpi4 = true; }; rpi-4 = import ./rpi.nix { host = "rpi-4"; rpi4 = true; };
zeus = import ./desktop.nix { host = "zeus"; }; zeus = import ./desktop.nix { host = "zeus"; };
hera = import ./desktop.nix { host = "hera"; }; hera = import ./desktop.nix { host = "hera"; };

5
nixops/rpi.nix
View File

@ -34,15 +34,12 @@ in
networking.hostName = host; networking.hostName = host;
networking.firewall.allowedTCPPorts = if host == "rpi-2" then [ 6000 ] else [];
time.timeZone = "Asia/Hong_Kong"; time.timeZone = "Asia/Hong_Kong";
users.extraGroups.plugdev = { }; users.extraGroups.plugdev = { };
users.mutableUsers = false; users.mutableUsers = false;
users.defaultUserShell = pkgs.fish; users.defaultUserShell = pkgs.fish;
users.extraUsers = (import ./common-users.nix { inherit pkgs; }) // users.extraUsers = (import ./common-users.nix { inherit pkgs; }) // {
(pkgs.lib.optionalAttrs experimental-users (import ./experimental-users.nix { inherit pkgs; })) // {
nixbld = { nixbld = {
isNormalUser = true; isNormalUser = true;
extraGroups = ["plugdev" "dialout"]; extraGroups = ["plugdev" "dialout"];