foodogsquared/nixos-config
1
0
Fork 0
mirror of https://github.com/foo-dogsquared/nixos-config.git synced 2025-01-31 04:58:01 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

chore: reformat codebase

Browse Source
This commit is contained in:
Gabriel Arazas 2023-12-13 11:28:45 +08:00
parent a526f5d505
commit 3714f843d0
No known key found for this signature in database
GPG Key ID: ADE0C41DAB221FCC
5 changed files with 41 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
flake.nix
View File

@ -376,7 +376,7 @@
lib'.mapAttrs lib'.mapAttrs
(host: metadata: (host: metadata:
mkHost { mkHost {
extraModules = [(hostSpecificModule host metadata)]; extraModules = [ (hostSpecificModule host metadata) ];
system = metadata._system; system = metadata._system;
nixpkgs-channel = metadata.nixpkgs-channel or "nixpkgs"; nixpkgs-channel = metadata.nixpkgs-channel or "nixpkgs";
}) })
@ -454,7 +454,7 @@
in in
lib'.nameValuePair name (mkImage { lib'.nameValuePair name (mkImage {
inherit format system pkgs; inherit format system pkgs;
extraModules = [(hostSpecificModule host metadata)]; extraModules = [ (hostSpecificModule host metadata) ];
})) }))
images'); images');

3
hosts/plover/modules/services/vaultwarden.nix
View File

@ -177,7 +177,8 @@ in
zone services; zone services;
keepalive 2; keepalive 2;
''; '';
servers = let servers =
let
address = config.services.vaultwarden.config.ROCKET_ADDRESS; address = config.services.vaultwarden.config.ROCKET_ADDRESS;
port = config.services.vaultwarden.config.ROCKET_PORT; port = config.services.vaultwarden.config.ROCKET_PORT;
in in

6
hosts/plover/modules/services/vouch-proxy.nix
View File

@ -13,13 +13,15 @@ in
config = lib.mkIf cfg.enable (lib.mkMerge [ config = lib.mkIf cfg.enable (lib.mkMerge [
{ {
sops.secrets = let sops.secrets =
let
vouchPermissions = rec { vouchPermissions = rec {
owner = "vouch-proxy"; owner = "vouch-proxy";
group = owner; group = owner;
mode = "0400"; mode = "0400";
}; };
in lib.getSecrets ../../secrets/secrets.yaml { in
lib.getSecrets ../../secrets/secrets.yaml {
"vouch-proxy/jwt/secret" = vouchPermissions; "vouch-proxy/jwt/secret" = vouchPermissions;
"vouch-proxy/client/secret" = vouchPermissions; "vouch-proxy/client/secret" = vouchPermissions;
}; };

5
modules/nixos/programs/distrobox.nix
View File

@ -8,7 +8,8 @@ let
# values with shell expansions. # values with shell expansions.
toDistroboxConf = lib.generators.toKeyValue { toDistroboxConf = lib.generators.toKeyValue {
listsAsDuplicateKeys = false; listsAsDuplicateKeys = false;
mkKeyValue = lib.generators.mkKeyValueDefault { mkKeyValue = lib.generators.mkKeyValueDefault
{
mkValueString = v: mkValueString = v:
if v == true then "1" if v == true then "1"
else if v == false then "0" else if v == false then "0"
@ -19,7 +20,7 @@ let
} "="; } "=";
}; };
distroboxConf = { }: { distroboxConf = {}: {
type = with lib.types; type = with lib.types;
let let
valueType = (oneOf [ valueType = (oneOf [