From c9038f19e68916ab78d8aeb9aa3167a8c201d609 Mon Sep 17 00:00:00 2001 From: Harald Hoyer Date: Fri, 6 Dec 2024 13:20:31 +0100 Subject: [PATCH 1/2] refactor: improve formatting in configuration files Adjusted the parameter formatting in `acme.nix` and `nginx.nix` for better readability and consistency. The changes include standardizing the indentation and spacing for multiline declarations. --- systems/x86_64-linux/sgx/acme.nix | 2 +- systems/x86_64-linux/sgx/nginx.nix | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/systems/x86_64-linux/sgx/acme.nix b/systems/x86_64-linux/sgx/acme.nix index 8bda91f..273d153 100644 --- a/systems/x86_64-linux/sgx/acme.nix +++ b/systems/x86_64-linux/sgx/acme.nix @@ -17,7 +17,7 @@ credentialsFile = config.sops.secrets.internetbs.path; }; certs = { - "internal.hoyer.world" = { }; + "internal.hoyer.world" = { }; }; }; } diff --git a/systems/x86_64-linux/sgx/nginx.nix b/systems/x86_64-linux/sgx/nginx.nix index c8854f5..c79ace2 100644 --- a/systems/x86_64-linux/sgx/nginx.nix +++ b/systems/x86_64-linux/sgx/nginx.nix @@ -1,4 +1,9 @@ -{ pkgs, lib, config, ... }: +{ + pkgs, + lib, + config, + ... +}: { users.users.nginx.extraGroups = [ "acme" ]; services.nginx = { From aef4e331ae084296325ac91d52571b445fffeb4e Mon Sep 17 00:00:00 2001 From: Harald Hoyer Date: Fri, 6 Dec 2024 13:20:39 +0100 Subject: [PATCH 2/2] feat(nextcloud): add extra apps configuration Enhance Nextcloud setup by enabling additional applications such as calendar, contacts, and notes. This change improves the service's functionality and usability by integrating essential productivity tools directly into the Nextcloud environment. --- systems/x86_64-linux/mx/nextcloud.nix | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/systems/x86_64-linux/mx/nextcloud.nix b/systems/x86_64-linux/mx/nextcloud.nix index 3051c2b..6cdf5c4 100644 --- a/systems/x86_64-linux/mx/nextcloud.nix +++ b/systems/x86_64-linux/mx/nextcloud.nix @@ -9,6 +9,20 @@ services.nextcloud = { enable = true; package = pkgs.nextcloud30; + extraApps = { + inherit (config.services.nextcloud.package.packages.apps) + calendar + contacts + files_texteditor + files_markdown + mail + notes + spreed + tasks + twofactor_backupcodes + twofactor_totp + ; + }; hostName = "nc.hoyer.xyz"; https = true; configureRedis = true;