+3

data/default.nix

reviewed

··· 1 1 { 2 2 + imports = [ 3 3 + ./oidc.nix 4 4 + ]; 2 5 flake.data = { 3 6 hosts = fromTOML (builtins.readFile ./hosts.toml); 4 7 services = fromTOML (builtins.readFile ./services.toml);

+13

data/oidc.nix

reviewed

··· 1 1 + { 2 2 + self, 3 3 + lib, 4 4 + ... 5 5 + }: 6 6 + let 7 7 + clientList = lib.concatLists ( 8 8 + lib.mapAttrsToList (c: _: (c.config.dish.oidcClients or [ ])) self.nixosConfigurations 9 9 + ); 10 10 + in 11 11 + { 12 12 + flake.data.oidcClients = clientList; 13 13 + }

+2 -5

flake.nix

reviewed

··· 130 130 ./hosts 131 131 ./neovim 132 132 ./data 133 133 + # Called fmodule instead of flake-module to clean up autosuggestions 134 134 + (import ./fmodule.nix) 133 135 ]; 134 134 - 135 135 - # # Flake attributes 136 136 - # flake = { 137 137 - # 138 138 - # }; 139 136 140 137 # Per-system stuff 141 138 perSystem =

+10

fmodule.nix

reviewed

··· 1 1 + { 2 2 + lib, 3 3 + ... 4 4 + }: 5 5 + { 6 6 + options.flake.data = lib.mkOption { 7 7 + type = lib.types.anything; 8 8 + description = "Data for dishNet flakes"; 9 9 + }; 10 10 + }

+1

lib/default.nix

reviewed

··· 7 7 flake = { 8 8 lib = { 9 9 caddy = import ./caddy.nix { inherit data lib; }; 10 10 + secrets = import ./secrets.nix; 10 11 inherit data; 11 12 inherit strings; 12 13 inherit (strings) toPascalCase toUpperSnakeCase;

+17

lib/secrets.nix

reviewed

··· 1 1 + { 2 2 + mkServiceSecrets = 3 3 + service: isDir: secretsPath: secrets: 4 4 + let 5 5 + sep = if isDir then "/" else "-"; 6 6 + in 7 7 + builtins.listToAttrs ( 8 8 + map (sec: { 9 9 + name = service + "-" + sec; 10 10 + value = { 11 11 + owner = service; 12 12 + group = service; 13 13 + file = secretsPath + /${service}${sep}${sec}.age; 14 14 + }; 15 15 + }) secrets 16 16 + ); 17 17 + }