chore: reformat codebase

This commit is contained in:
Gabriel Arazas 2023-08-27 13:41:29 +08:00
parent 9044c1af9e
commit 7dacbe6963
No known key found for this signature in database
GPG Key ID: ADE0C41DAB221FCC
8 changed files with 33 additions and 29 deletions

View File

@ -1,8 +1,8 @@
return {
tls_servers = {
pem_private_key = os.getenv("CREDENTIALS_DIRECTORY") .. "/key.pem",
pem_cert = os.getenv("CREDENTIALS_DIRECTORY") .. "/cert.pem",
pem_ca = os.getenv("CREDENTIALS_DIRECTORY") .. "/fullchain.pem",
bind_address = "@host_address@:@port@",
}
tls_servers = {
pem_private_key = os.getenv("CREDENTIALS_DIRECTORY") .. "/key.pem",
pem_cert = os.getenv("CREDENTIALS_DIRECTORY") .. "/cert.pem",
pem_ca = os.getenv("CREDENTIALS_DIRECTORY") .. "/fullchain.pem",
bind_address = "@host_address@:@port@",
},
}

View File

@ -22,15 +22,16 @@ in
requires = [ "acme-finished-${weztermDomain}.target" ];
environment.WEZTERM_LOG = "info";
serviceConfig = {
LoadCredential = let
certDir = config.security.acme.certs."${weztermDomain}".directory;
credentialCertPath = path: "${path}:${certDir}/${path}";
in
[
(credentialCertPath "key.pem")
(credentialCertPath "cert.pem")
(credentialCertPath "fullchain.pem")
];
LoadCredential =
let
certDir = config.security.acme.certs."${weztermDomain}".directory;
credentialCertPath = path: "${path}:${certDir}/${path}";
in
[
(credentialCertPath "key.pem")
(credentialCertPath "cert.pem")
(credentialCertPath "fullchain.pem")
];
};
};

View File

@ -46,9 +46,9 @@
listImagesWithSystems = data:
lib.foldlAttrs
(acc: name: metadata:
let
name' = metadata.hostname or name;
in
let
name' = metadata.hostname or name;
in
if lib.length metadata.systems > 1 then
acc // (lib.foldl
(images: system: images // {
@ -57,7 +57,7 @@
_name = name';
};
})
{}
{ }
metadata.systems)
else
acc // {
@ -66,6 +66,6 @@
_name = name';
};
})
{}
{ }
data;
}

View File

@ -158,7 +158,7 @@ in
Additional arguments to be passed on to the ActivityWatch server.
'';
type = with lib.types; listOf str;
default = [];
default = [ ];
defaultText = "[ ]";
example = lib.literalExpression ''
[

View File

@ -14,14 +14,14 @@ in
enable = lib.mkEnableOption "Distant-related services";
package = lib.mkOption {
description = "The package containing the {command}`distant` executable.";
description = "The package containing the {command}`distant` executable.";
type = lib.types.package;
default = pkgs.distant;
defaultText = "pkgs.distant";
};
settings = lib.mkOption {
description = ''
description = ''
The configuration settings to be passed to the service.
'';
types = settingsFormat.type;

View File

@ -53,9 +53,10 @@ in {
};
in
lib.mapAttrs'
(name: remote: lib.nameValuePair "flatpak/remotes.d/${name}.flatpakrepo" {
source = pkgs.fetchurl remote;
})
(name: remote:
lib.nameValuePair
"flatpak/remotes.d/${name}.flatpakrepo"
{ source = pkgs.fetchurl remote; })
urls;
programs.extra-container.enable = true;

View File

@ -6,7 +6,7 @@
, makeWrapper
, gnome
# This is the prefix used for the installed files in the output.
# This is the prefix used for the installed files in the output.
, prefix ? "one.foodogsquared.MoseyBranch."
, serviceScript ? "Hyprland"

View File

@ -4,7 +4,7 @@ let
cfg = config.workflows.workflows.mosey-branch;
workflowName = "mosey-branch";
createServiceScript = { runtimeInputs ? [], text, name }:
createServiceScript = { runtimeInputs ? [ ], text, name }:
let
runtimeInputs' = runtimeInputs ++ [ pkgs.dbus ];
text' = ''
@ -24,7 +24,8 @@ let
runtimeInputs = runtimeInputs';
text = text';
};
in "${script}/bin/${name}";
in
"${script}/bin/${name}";
customDesktopSession = pkgs.callPackage ./config/desktop-session {
serviceScript = createServiceScript {
@ -69,6 +70,7 @@ let
socat
qt5.qtwayland
qt6.qtwayland
pciutils
# The authentication agent.
polkit_gnome