diff --git a/config/firefox/bookmarks.nix b/config/firefox/bookmarks.nix index e24ee6d..6a4c183 100644 --- a/config/firefox/bookmarks.nix +++ b/config/firefox/bookmarks.nix @@ -13,14 +13,6 @@ name = "Paperless"; url = "https://paperless.yanlincs.com"; } - { - name = "Nextcloud"; - url = "https://cloud.yanlincs.com"; - } - { - name = "RSS"; - url = "https://rss.yanlincs.com"; - } { name = "Immich"; url = "https://photo.yanlincs.com/photos"; diff --git a/hosts/nixos/hs/containers.nix b/hosts/nixos/hs/containers.nix index 6b1bcc6..3deb98b 100644 --- a/hosts/nixos/hs/containers.nix +++ b/hosts/nixos/hs/containers.nix @@ -299,138 +299,5 @@ in autoStart = true; }; - # Nextcloud cloud storage and file sharing - cloud = { - image = "docker.io/linuxserver/nextcloud:latest"; - - volumes = [ - "/var/lib/containers/config/cloud:/config" - "/mnt/storage/appbulk/cloud:/data" - "/mnt/storage/Media/nsfw:/ext/nsfw" - ]; - - environment = { - PUID = commonUID; - PGID = commonGID; - TZ = systemTZ; - }; - - ports = [ - "5001:80" - ]; - - extraOptions = [ - "--network=podman" - ]; - - dependsOn = [ "cloud-db" ]; - autoStart = true; - }; - - # MariaDB database for Nextcloud - cloud-db = { - image = "docker.io/linuxserver/mariadb:latest"; - - volumes = [ - "/var/lib/containers/config/cloud-db:/config" - ]; - - environment = { - PUID = commonUID; - PGID = commonGID; - TZ = systemTZ; - MYSQL_ROOT_PASSWORD = "nextcloud"; - MYSQL_DATABASE = "nextcloud"; - MYSQL_USER = "nextcloud"; - MYSQL_PASSWORD = "nextcloud"; - }; - - extraOptions = [ - "--network=podman" - ]; - - autoStart = true; - }; - - # RSS reader (Miniflux) - rss = { - image = "docker.io/miniflux/miniflux:latest"; - - environment = { - RUN_MIGRATIONS = "1"; - DATABASE_URL = "postgres://miniflux:miniflux@rss-db/miniflux?sslmode=disable"; - BASE_URL = "https://rss.yanlincs.com"; - HTTP_CLIENT_TIMEOUT = "50000"; - POLLING_FREQUENCY = "60"; - CLEANUP_FREQUENCY_HOURS = "24"; - CLEANUP_ARCHIVE_READ_DAYS = "60"; - CLEANUP_REMOVE_SESSIONS_DAYS = "30"; - }; - - ports = [ - "5006:8080" - ]; - - extraOptions = [ - "--network=podman" - ]; - - dependsOn = [ "rss-db" ]; - autoStart = true; - }; - - # PostgreSQL database for RSS (Miniflux) - rss-db = { - image = "docker.io/postgres:17-alpine"; - - volumes = [ - "/var/lib/containers/config/rss-db:/var/lib/postgresql/data" - ]; - - environment = { - POSTGRES_USER = "miniflux"; - POSTGRES_PASSWORD = "miniflux"; - POSTGRES_DB = "miniflux"; - }; - - extraOptions = [ - "--network=podman" - ]; - - autoStart = true; - }; - - # Windows 10 LTSC in container using dockur/windows - windows = { - image = "dockurr/windows"; - - volumes = [ - "/var/lib/containers/windows:/storage" - "/home/yanlin/share:/shared" - ]; - - environment = { - VERSION = "10l"; # Windows 10 LTSC - RAM_SIZE = "8G"; - CPU_CORES = "4"; - DISK_SIZE = "256G"; - }; - - ports = [ - "5009:8006" # Web-based VNC viewer - "3389:3389/tcp" # RDP access (TCP) - "3389:3389/udp" # RDP access (UDP) - ]; - - extraOptions = [ - "--device=/dev/kvm" # KVM hardware acceleration - "--device=/dev/net/tun" # Network bridging - "--cap-add=NET_ADMIN" # Network administration capability - "--stop-timeout=120" # 2 minute graceful shutdown - ]; - - autoStart = false; - }; - }; } diff --git a/hosts/nixos/vps/proxy.nix b/hosts/nixos/vps/proxy.nix index f32c469..c48bf11 100644 --- a/hosts/nixos/vps/proxy.nix +++ b/hosts/nixos/vps/proxy.nix @@ -33,19 +33,6 @@ }; }; - # Cloud service (Nextcloud) - cloud = { - rule = "Host(`cloud.yanlincs.com`)"; - entrypoints = "websecure"; - service = "cloud"; - tls = { - certResolver = "cloudflare"; - domains = [{ - main = "*.yanlincs.com"; - }]; - }; - }; - # Sonarr TV show management sonarr = { rule = "Host(`sonarr.yanlincs.com`)"; @@ -85,19 +72,6 @@ }; }; - # RSS reader (Miniflux) - rss = { - rule = "Host(`rss.yanlincs.com`)"; - entrypoints = "websecure"; - service = "rss"; - tls = { - certResolver = "cloudflare"; - domains = [{ - main = "*.yanlincs.com"; - }]; - }; - }; - # Jellyfin Media Server jellyfin = { rule = "Host(`jellyfin.yanlincs.com`)"; @@ -157,15 +131,6 @@ }; }; - # Cloud service backend (via WireGuard) - cloud = { - loadBalancer = { - servers = [{ - url = "http://10.2.2.20:5001"; - }]; - }; - }; - # Sonarr backend (via WireGuard) sonarr = { loadBalancer = { @@ -193,15 +158,6 @@ }; }; - # RSS reader backend (via WireGuard) - rss = { - loadBalancer = { - servers = [{ - url = "http://10.2.2.20:5006"; - }]; - }; - }; - # Jellyfin backend (via WireGuard) jellyfin = { loadBalancer = {