diff --git a/hosts/plover/config/wezterm/config.lua b/hosts/plover/config/wezterm/config.lua index ea9d53bd..3a4ee2f4 100644 --- a/hosts/plover/config/wezterm/config.lua +++ b/hosts/plover/config/wezterm/config.lua @@ -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@", + }, } diff --git a/hosts/plover/modules/services/wezterm-mux-server.nix b/hosts/plover/modules/services/wezterm-mux-server.nix index b10e6ba5..0a2c460c 100644 --- a/hosts/plover/modules/services/wezterm-mux-server.nix +++ b/hosts/plover/modules/services/wezterm-mux-server.nix @@ -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") + ]; }; }; diff --git a/lib/images.nix b/lib/images.nix index 80784bd8..916b11bd 100644 --- a/lib/images.nix +++ b/lib/images.nix @@ -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; } diff --git a/modules/home-manager/services/activitywatch.nix b/modules/home-manager/services/activitywatch.nix index 17e7ec50..38bb8bdf 100644 --- a/modules/home-manager/services/activitywatch.nix +++ b/modules/home-manager/services/activitywatch.nix @@ -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 '' [ diff --git a/modules/home-manager/services/distant.nix b/modules/home-manager/services/distant.nix index 05b8b35f..5bd1dc8b 100644 --- a/modules/home-manager/services/distant.nix +++ b/modules/home-manager/services/distant.nix @@ -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; diff --git a/modules/nixos/profiles/desktop.nix b/modules/nixos/profiles/desktop.nix index bf9cbc42..b56caa59 100644 --- a/modules/nixos/profiles/desktop.nix +++ b/modules/nixos/profiles/desktop.nix @@ -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; diff --git a/modules/nixos/workflows/mosey-branch/config/desktop-session/default.nix b/modules/nixos/workflows/mosey-branch/config/desktop-session/default.nix index b0fdf147..13b25220 100644 --- a/modules/nixos/workflows/mosey-branch/config/desktop-session/default.nix +++ b/modules/nixos/workflows/mosey-branch/config/desktop-session/default.nix @@ -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" diff --git a/modules/nixos/workflows/mosey-branch/default.nix b/modules/nixos/workflows/mosey-branch/default.nix index 5dec1d54..096734ce 100644 --- a/modules/nixos/workflows/mosey-branch/default.nix +++ b/modules/nixos/workflows/mosey-branch/default.nix @@ -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