From cdc3dc0a71ae27956506c83c30ba15500b49ed8a Mon Sep 17 00:00:00 2001 From: death916 Date: Thu, 22 Jan 2026 01:30:40 -0800 Subject: [PATCH 1/7] miniflux --- modules/nixos/orac/services.nix | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/modules/nixos/orac/services.nix b/modules/nixos/orac/services.nix index e184269..92688b4 100644 --- a/modules/nixos/orac/services.nix +++ b/modules/nixos/orac/services.nix @@ -49,12 +49,14 @@ # SMTP_FROM_NAME = "example.com Bitwarden server"; }; }; - # # services.beszel = { - # hub.enable = true; - # hub.host = "0.0.0.0"; - # agent.enable = true; - # agent.environmentFile = /etc/nixos/secrets/beszel.env - # }; + + services.miniflux = { + enable = true; + adminCredentialsFile = "/etc/nixos/secrets/minifluxadmin"; + config = { + LISTEN_ADDR = "0.0.0.0:8086"; + }; + }; environment.systemPackages = with pkgs; [ git From 593434481b63343fb3f5203eeec0847ff05ad5a8 Mon Sep 17 00:00:00 2001 From: death916 Date: Thu, 22 Jan 2026 01:36:51 -0800 Subject: [PATCH 2/7] change juicefs docker port mapping --- modules/containers/juicefs/docker-compose.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/modules/containers/juicefs/docker-compose.nix b/modules/containers/juicefs/docker-compose.nix index c1cab87..8d94132 100644 --- a/modules/containers/juicefs/docker-compose.nix +++ b/modules/containers/juicefs/docker-compose.nix @@ -17,7 +17,11 @@ "juice_juicefs_cache:/var/jfsCache:rw" ]; env_file = "/etc/nixos/secrets/juicefs.env"; - cmd = [ "sh" "-c" "juicefs mount postgres://$POSTGRES_USER:$POSTGRES_PASSWORD@postgres:5432/juicefs?sslmode=disable /mnt/jfs" ]; + cmd = [ + "sh" + "-c" + "juicefs mount postgres://$POSTGRES_USER:$POSTGRES_PASSWORD@postgres:5432/juicefs?sslmode=disable /mnt/jfs" + ]; dependsOn = [ "postgres-for-juicefs" ]; @@ -59,7 +63,7 @@ "/home/death916/docker/volumes/postgres:/var/lib/postgresql/data:rw" ]; ports = [ - "5432:5432/tcp" + "5430:5432/tcp" ]; log-driver = "journald"; extraOptions = [ From e907a8e3bd3dc301bfeb88f030152900f19e3db3 Mon Sep 17 00:00:00 2001 From: death916 Date: Thu, 22 Jan 2026 01:43:05 -0800 Subject: [PATCH 3/7] change juicefs docker port mapping --- modules/nixos/orac/services.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/modules/nixos/orac/services.nix b/modules/nixos/orac/services.nix index 92688b4..09aa3ed 100644 --- a/modules/nixos/orac/services.nix +++ b/modules/nixos/orac/services.nix @@ -50,13 +50,13 @@ }; }; - services.miniflux = { - enable = true; - adminCredentialsFile = "/etc/nixos/secrets/minifluxadmin"; - config = { - LISTEN_ADDR = "0.0.0.0:8086"; - }; - }; + # services.miniflux = { + # enable = true; + # adminCredentialsFile = "/etc/nixos/secrets/minifluxadmin"; + # config = { + # LISTEN_ADDR = "0.0.0.0:8086"; + # }; + # }; environment.systemPackages = with pkgs; [ git From 949abe80545e88af313fd439e9c13c4cb6a3cb7c Mon Sep 17 00:00:00 2001 From: death916 Date: Thu, 22 Jan 2026 01:45:23 -0800 Subject: [PATCH 4/7] change juicefs docker port mapping --- modules/containers/juicefs/docker-compose.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/containers/juicefs/docker-compose.nix b/modules/containers/juicefs/docker-compose.nix index 8d94132..4b6af88 100644 --- a/modules/containers/juicefs/docker-compose.nix +++ b/modules/containers/juicefs/docker-compose.nix @@ -63,7 +63,7 @@ "/home/death916/docker/volumes/postgres:/var/lib/postgresql/data:rw" ]; ports = [ - "5430:5432/tcp" + "5423:5432/tcp" ]; log-driver = "journald"; extraOptions = [ From f44f6666ab666824cfb78986f645f9fbfef1e1a5 Mon Sep 17 00:00:00 2001 From: death916 Date: Thu, 22 Jan 2026 01:50:59 -0800 Subject: [PATCH 5/7] change juicefs docker port mapping --- modules/containers/docker/juicefs.nix | 2 +- modules/containers/juicefs/docker-compose.nix | 137 ------------------ 2 files changed, 1 insertion(+), 138 deletions(-) delete mode 100644 modules/containers/juicefs/docker-compose.nix diff --git a/modules/containers/docker/juicefs.nix b/modules/containers/docker/juicefs.nix index 09077bc..846b963 100644 --- a/modules/containers/docker/juicefs.nix +++ b/modules/containers/docker/juicefs.nix @@ -66,7 +66,7 @@ "/home/death916/docker/volumes/postgres:/var/lib/postgresql/data:rw" ]; ports = [ - "5432:5432/tcp" + "5430:5432/tcp" ]; log-driver = "journald"; extraOptions = [ diff --git a/modules/containers/juicefs/docker-compose.nix b/modules/containers/juicefs/docker-compose.nix deleted file mode 100644 index 4b6af88..0000000 --- a/modules/containers/juicefs/docker-compose.nix +++ /dev/null @@ -1,137 +0,0 @@ -# Auto-generated using compose2nix v0.3.1. -{ pkgs, lib, ... }: - -{ - # Runtime - virtualisation.docker = { - enable = true; - autoPrune.enable = true; - }; - virtualisation.oci-containers.backend = "docker"; - - # Containers - virtualisation.oci-containers.containers."myjfs-mount-service" = { - image = "juicedata/mount:ce-v1.2.1"; - volumes = [ - "/mnt/myjfs:/mnt/jfs:rw,rshared" - "juice_juicefs_cache:/var/jfsCache:rw" - ]; - env_file = "/etc/nixos/secrets/juicefs.env"; - cmd = [ - "sh" - "-c" - "juicefs mount postgres://$POSTGRES_USER:$POSTGRES_PASSWORD@postgres:5432/juicefs?sslmode=disable /mnt/jfs" - ]; - dependsOn = [ - "postgres-for-juicefs" - ]; - log-driver = "journald"; - extraOptions = [ - "--cap-add=SYS_ADMIN" - "--device=/dev/fuse:/dev/fuse:rwm" - "--network-alias=juicefs-mount" - "--network=juice_default" - "--security-opt=apparmor:unconfined" - ]; - }; - systemd.services."docker-myjfs-mount-service" = { - serviceConfig = { - Restart = lib.mkOverride 90 "always"; - RestartMaxDelaySec = lib.mkOverride 90 "1m"; - RestartSec = lib.mkOverride 90 "100ms"; - RestartSteps = lib.mkOverride 90 9; - }; - after = [ - "docker-network-juice_default.service" - "docker-volume-juice_juicefs_cache.service" - ]; - requires = [ - "docker-network-juice_default.service" - "docker-volume-juice_juicefs_cache.service" - ]; - partOf = [ - "docker-compose-juice-root.target" - ]; - wantedBy = [ - "docker-compose-juice-root.target" - ]; - }; - virtualisation.oci-containers.containers."postgres-for-juicefs" = { - image = "postgres:alpine"; - env_file = "/etc/nixos/secrets/juicefs.env"; - volumes = [ - "/home/death916/docker/volumes/postgres:/var/lib/postgresql/data:rw" - ]; - ports = [ - "5423:5432/tcp" - ]; - log-driver = "journald"; - extraOptions = [ - "--health-cmd=pg_isready -U $POSTGRES_USER -d $POSTGRES_DB" - "--health-interval=10s" - "--health-retries=5" - "--health-timeout=5s" - "--network-alias=postgres" - "--network=juice_default" - ]; - }; - systemd.services."docker-postgres-for-juicefs" = { - serviceConfig = { - Restart = lib.mkOverride 90 "always"; - RestartMaxDelaySec = lib.mkOverride 90 "1m"; - RestartSec = lib.mkOverride 90 "100ms"; - RestartSteps = lib.mkOverride 90 9; - }; - after = [ - "docker-network-juice_default.service" - ]; - requires = [ - "docker-network-juice_default.service" - ]; - partOf = [ - "docker-compose-juice-root.target" - ]; - wantedBy = [ - "docker-compose-juice-root.target" - ]; - }; - - # Networks - systemd.services."docker-network-juice_default" = { - path = [ pkgs.docker ]; - serviceConfig = { - Type = "oneshot"; - RemainAfterExit = true; - ExecStop = "docker network rm -f juice_default"; - }; - script = '' - docker network inspect juice_default || docker network create juice_default - ''; - partOf = [ "docker-compose-juice-root.target" ]; - wantedBy = [ "docker-compose-juice-root.target" ]; - }; - - # Volumes - systemd.services."docker-volume-juice_juicefs_cache" = { - path = [ pkgs.docker ]; - serviceConfig = { - Type = "oneshot"; - RemainAfterExit = true; - }; - script = '' - docker volume inspect juice_juicefs_cache || docker volume create juice_juicefs_cache - ''; - partOf = [ "docker-compose-juice-root.target" ]; - wantedBy = [ "docker-compose-juice-root.target" ]; - }; - - # Root service - # When started, this will automatically create all resources and start - # the containers. When stopped, this will teardown all resources. - systemd.targets."docker-compose-juice-root" = { - unitConfig = { - Description = "Root target generated by compose2nix."; - }; - wantedBy = [ "multi-user.target" ]; - }; -} From 65251dae72a6c60fd981b5ac97add867cb441529 Mon Sep 17 00:00:00 2001 From: death916 Date: Thu, 22 Jan 2026 01:54:38 -0800 Subject: [PATCH 6/7] miniflux --- modules/nixos/orac/services.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/modules/nixos/orac/services.nix b/modules/nixos/orac/services.nix index 09aa3ed..92688b4 100644 --- a/modules/nixos/orac/services.nix +++ b/modules/nixos/orac/services.nix @@ -50,13 +50,13 @@ }; }; - # services.miniflux = { - # enable = true; - # adminCredentialsFile = "/etc/nixos/secrets/minifluxadmin"; - # config = { - # LISTEN_ADDR = "0.0.0.0:8086"; - # }; - # }; + services.miniflux = { + enable = true; + adminCredentialsFile = "/etc/nixos/secrets/minifluxadmin"; + config = { + LISTEN_ADDR = "0.0.0.0:8086"; + }; + }; environment.systemPackages = with pkgs; [ git From 7d8ff959472b31b26b1e8531cf944bd0f25a5a52 Mon Sep 17 00:00:00 2001 From: death916 Date: Thu, 22 Jan 2026 02:08:39 -0800 Subject: [PATCH 7/7] bewsboat from miniflux --- home-manager/home.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/home-manager/home.nix b/home-manager/home.nix index 3194408..473f10f 100644 --- a/home-manager/home.nix +++ b/home-manager/home.nix @@ -307,6 +307,10 @@ in programs.element-desktop.enable = true; programs.newsboat = { enable = true; + extraConfig = '' + urls-source "miniflux" + miniflux-url "http://orac:8086" + ''; autoFetchArticles = { enable = true; onCalendar = "daily";