From 7d731bd1c499545a5ec7ef36ee939abbd218cd82 Mon Sep 17 00:00:00 2001 From: oqyude Date: Sun, 29 Mar 2026 13:02:41 +0300 Subject: [PATCH] ref --- .gitattributes | 1 + modules/containers/3x-ui.nix | 11 +++--- modules/containers/remnanode.nix | 15 ++++++++ modules/containers/remnawave.nix | 23 +++--------- modules/server/default.nix | 1 + modules/server/mealie.nix | 2 +- modules/server/memos.nix | 2 +- modules/server/nextcloud.nix | 64 ++++++++++++++++---------------- modules/server/uptime-kuma.nix | 2 +- 9 files changed, 63 insertions(+), 58 deletions(-) create mode 100644 .gitattributes create mode 100644 modules/containers/remnanode.nix diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..94f480d --- /dev/null +++ b/.gitattributes @@ -0,0 +1 @@ +* text=auto eol=lf \ No newline at end of file diff --git a/modules/containers/3x-ui.nix b/modules/containers/3x-ui.nix index 451fbbd..5a4067f 100644 --- a/modules/containers/3x-ui.nix +++ b/modules/containers/3x-ui.nix @@ -61,8 +61,8 @@ "TZ" = "Europe/Moscow"; }; volumes = [ - "/mnt/containers/3x-ui/cert/:/root/cert:rw" - "/mnt/containers/3x-ui/db/:/etc/x-ui:rw" + "/mnt/services/containers/3x-ui/cert/:/root/cert:rw" + "/mnt/services/containers/3x-ui/db/:/etc/x-ui:rw" ]; log-driver = "journald"; extraOptions = [ @@ -111,8 +111,9 @@ systemd.tmpfiles.rules = [ "d /mnt 0755 root root -" "d /mnt/containers 0755 root root -" - "d /mnt/containers/3x-ui 0755 root root -" - "d /mnt/containers/3x-ui/cert 0755 root root -" - "d /mnt/containers/3x-ui/db 0755 root root -" + "d /mnt/services/containers 0755 root root -" + "d /mnt/services/containers/3x-ui 0755 root root -" + "d /mnt/services/containers/3x-ui/cert 0755 root root -" + "d /mnt/services/containers/3x-ui/db 0755 root root -" ]; } diff --git a/modules/containers/remnanode.nix b/modules/containers/remnanode.nix new file mode 100644 index 0000000..7981d25 --- /dev/null +++ b/modules/containers/remnanode.nix @@ -0,0 +1,15 @@ +{ + config, + lib, + pkgs, + inputs, + xlib, + ... +}: +{ + systemd.tmpfiles.rules = [ + "d ${xlib.dirs.services-mnt-folder} 0755 root root -" + "d ${xlib.dirs.services-mnt-folder}/containers 0755 root root -" + "d ${xlib.dirs.services-mnt-folder}/containers/remnanode 0755 root root -" + ]; +} diff --git a/modules/containers/remnawave.nix b/modules/containers/remnawave.nix index 242c5b0..9496e74 100644 --- a/modules/containers/remnawave.nix +++ b/modules/containers/remnawave.nix @@ -7,22 +7,9 @@ ... }: { - - # fileSystems."${config.services.immich.mediaLocation}" = { - # device = "${xlib.dirs.services-folder}/immich"; - # options = [ - # "bind" - # "nofail" - # ]; - # }; - - # systemd.tmpfiles.rules = [ - # "z ${config.services.immich.mediaLocation} 0755 immich immich -" - # ]; - - # environment = { - # systemPackages = with pkgs; [ - # immich-cli - # ]; - # }; + systemd.tmpfiles.rules = [ + "d ${xlib.dirs.services-mnt-folder} 0755 root root -" + "d ${xlib.dirs.services-mnt-folder}/containers 0755 root root -" + "d ${xlib.dirs.services-mnt-folder}/containers/remnawave 0755 root root -" + ]; } diff --git a/modules/server/default.nix b/modules/server/default.nix index a4ec44e..60a23f2 100644 --- a/modules/server/default.nix +++ b/modules/server/default.nix @@ -4,6 +4,7 @@ }: { imports = [ + ../containers/remnawave.nix ../software/beets ./calibre-web.nix ./immich.nix diff --git a/modules/server/mealie.nix b/modules/server/mealie.nix index d3aea5e..ac739f2 100644 --- a/modules/server/mealie.nix +++ b/modules/server/mealie.nix @@ -4,7 +4,7 @@ }: { services.mealie = { - enable = true; + enable = false; listenAddress = "0.0.0.0"; port = 9000; database.createLocally = true; diff --git a/modules/server/memos.nix b/modules/server/memos.nix index 0436151..4a27f45 100644 --- a/modules/server/memos.nix +++ b/modules/server/memos.nix @@ -5,7 +5,7 @@ }: { services.memos = { - enable = true; + enable = false; openFirewall = true; settings = { MEMOS_MODE = "prod"; diff --git a/modules/server/nextcloud.nix b/modules/server/nextcloud.nix index 733102e..2f9256c 100644 --- a/modules/server/nextcloud.nix +++ b/modules/server/nextcloud.nix @@ -89,11 +89,11 @@ in music tasks # news - notes + # notes # notify_push polls previewgenerator - richdocuments + # richdocuments spreed tables user_oidc @@ -108,7 +108,7 @@ in }; }; collabora-online = { - enable = true; + enable = false; port = 9980; # package = master.collabora-online; settings = { @@ -141,36 +141,36 @@ in # fonts.packages = [ work.corefonts ]; - networking.hosts = { - "localhost" = [ "nextcloud-private.local" ]; - }; + # networking.hosts = { + # "localhost" = [ "nextcloud-private.local" ]; + # }; - systemd.services.nextcloud-config-collabora = - let - inherit (config.services.nextcloud) occ; - wopi_url = "http://localhost:${toString config.services.collabora-online.port}"; - public_wopi_url = "https://office.zeroq.ru"; - wopi_allowlist = lib.concatStringsSep "," [ - "0.0.0.0/0" - ]; - in - { - wantedBy = [ "multi-user.target" ]; - after = [ - "nextcloud-setup.service" - "coolwsd.service" - ]; - requires = [ "coolwsd.service" ]; - script = '' - ${occ}/bin/nextcloud-occ config:app:set richdocuments wopi_url --value ${lib.escapeShellArg wopi_url} - ${occ}/bin/nextcloud-occ config:app:set richdocuments public_wopi_url --value ${lib.escapeShellArg public_wopi_url} - ${occ}/bin/nextcloud-occ config:app:set richdocuments wopi_allowlist --value ${lib.escapeShellArg wopi_allowlist} - ${occ}/bin/nextcloud-occ richdocuments:setup - ''; - serviceConfig = { - Type = "oneshot"; - }; - }; + # systemd.services.nextcloud-config-collabora = + # let + # inherit (config.services.nextcloud) occ; + # wopi_url = "http://localhost:${toString config.services.collabora-online.port}"; + # public_wopi_url = "https://office.zeroq.ru"; + # wopi_allowlist = lib.concatStringsSep "," [ + # "0.0.0.0/0" + # ]; + # in + # { + # wantedBy = [ "multi-user.target" ]; + # after = [ + # "nextcloud-setup.service" + # "coolwsd.service" + # ]; + # requires = [ "coolwsd.service" ]; + # script = '' + # ${occ}/bin/nextcloud-occ config:app:set richdocuments wopi_url --value ${lib.escapeShellArg wopi_url} + # ${occ}/bin/nextcloud-occ config:app:set richdocuments public_wopi_url --value ${lib.escapeShellArg public_wopi_url} + # ${occ}/bin/nextcloud-occ config:app:set richdocuments wopi_allowlist --value ${lib.escapeShellArg wopi_allowlist} + # ${occ}/bin/nextcloud-occ richdocuments:setup + # ''; + # serviceConfig = { + # Type = "oneshot"; + # }; + # }; # fileSystems."${config.services.nextcloud.home}" = { # device = "${xlib.dirs.services-folder}/nextcloud"; diff --git a/modules/server/uptime-kuma.nix b/modules/server/uptime-kuma.nix index 882af08..f198dc6 100644 --- a/modules/server/uptime-kuma.nix +++ b/modules/server/uptime-kuma.nix @@ -8,7 +8,7 @@ }: { services.uptime-kuma = { - enable = true; + enable = false; settings = { PORT = "4001"; HOST = "0.0.0.0";