From 5d7f37168cefdd62aa71ffb8401cbf6c6a0d0b99 Mon Sep 17 00:00:00 2001 From: mjallen18 Date: Thu, 4 Jul 2024 09:50:41 -0500 Subject: [PATCH] fix collabora partially --- hosts/desktop/configuration.nix | 47 ++++++++++++++++++------------ hosts/nas/configuration.nix | 4 +-- modules/apps/collabora/default.nix | 6 ++++ modules/apps/collabora/options.nix | 30 +++++++++++++++++++ 4 files changed, 67 insertions(+), 20 deletions(-) diff --git a/hosts/desktop/configuration.nix b/hosts/desktop/configuration.nix index ce59059..49151ae 100644 --- a/hosts/desktop/configuration.nix +++ b/hosts/desktop/configuration.nix @@ -125,13 +125,22 @@ in ]; }; - systemd.services.fix-wifi = { - path = [ pkgs.bash pkgs.networkmanager pkgs.kmod ]; - wantedBy = [ "multi-user.target" ]; - after = [ "network.target" ]; - serviceConfig = { - Type="oneshot"; - ExecStart = [ "${resetNetworkScript}/bin/reset-network" ]; + systemd.services = { + fix-wifi = { + path = [ pkgs.bash pkgs.networkmanager pkgs.kmod ]; + wantedBy = [ "multi-user.target" ]; + after = [ "network.target" ]; + serviceConfig = { + Type="oneshot"; + ExecStart = [ "${resetNetworkScript}/bin/reset-network" ]; + }; + }; + + rsync-home = { + path = [ pkgs.bash pkgs.rsync ]; + script = '' + rsync -rtpogv --progress --ignore-existing --exclude={'/home/matt/Games/*', '/home/matt/1TB/*'} -lHzs /home/matt /media/nas/backup/desktop-nix/home + ''; }; }; @@ -166,12 +175,14 @@ in clinfo efibootmgr gparted + grsync kmod lact nano os-prober papirus-icon-theme pciutils + rsync sbctl vim vulkan-tools @@ -204,17 +215,17 @@ in }; services = { - borgbackup.jobs.home-matt = { - paths = "/home/matt"; - encryption.mode = "none"; - # environment.BORG_RSH = "ssh -i /home/matt/.ssh/id_ed25519"; - repo = "/media/nas/backup/desktop-nix/home"; - compression = "auto,zstd"; - exclude = [ - "/home/matt/Games" - "/home/matt/1TB" - ]; - }; + # borgbackup.jobs.home-matt = { + # paths = "/home/matt"; + # encryption.mode = "none"; + # # environment.BORG_RSH = "ssh -i /home/matt/.ssh/id_ed25519"; + # repo = "/media/nas/backup/desktop-nix/home"; + # compression = "auto,zstd"; + # exclude = [ + # "/home/matt/Games" + # "/home/matt/1TB" + # ]; + # }; ratbagd.enable = true; }; diff --git a/hosts/nas/configuration.nix b/hosts/nas/configuration.nix index 7148db9..6ed9f71 100644 --- a/hosts/nas/configuration.nix +++ b/hosts/nas/configuration.nix @@ -69,12 +69,12 @@ in baseUrl = "https://mealie.mjallen.dev"; maxConcurrency = "4"; maxWorkers = "4"; - allowSignup = "true"; + allowSignup = "false"; }; nextcloud = { enable = true; - httpPort = "9980"; + httpPort = "9981"; httpsPort = "9443"; }; diff --git a/modules/apps/collabora/default.nix b/modules/apps/collabora/default.nix index 33b15c7..7fdfe66 100644 --- a/modules/apps/collabora/default.nix +++ b/modules/apps/collabora/default.nix @@ -23,6 +23,12 @@ in PUID = cfg.puid; PGID = cfg.pgid; TZ = cfg.timeZone; + username = cfg.username; + password = cfg.password; + DONT_GEN_SSL_CERT = cfg.dontGenSslCert; + server_name = cfg.serverName; + dictionaries = cfg.dictionaries; + extra_params = cfg.extraParams; }; }; }; diff --git a/modules/apps/collabora/options.nix b/modules/apps/collabora/options.nix index f14fcc0..8dc2653 100644 --- a/modules/apps/collabora/options.nix +++ b/modules/apps/collabora/options.nix @@ -38,5 +38,35 @@ with lib; type = types.str; default = "America/Chicago"; }; + + username = mkOption { + type = types.str; + default = "mjallen"; + }; + + password = mkOption { + type = types.str; + default = "BogieDudie1"; + }; + + dontGenSslCert = mkOption { + type = types.str; + default = "1"; + }; + + serverName = mkOption { + type = types.str; + default = "office.mjallen.dev"; + }; + + dictionaries = mkOption { + type = types.str; + default = "de_DE en_GB en_US es_ES fr_FR it nl pt_BR pt_PT ru"; + }; + + extraParams = mkOption { + type = types.str; + default = "--o:ssl.enable=false --o:net.post_allow.host=10.0.1.18"; + }; }; }