diff --git a/config/ansible/tasks/servers/server.yml b/config/ansible/tasks/servers/server.yml index 117b6f4..0e1996a 100644 --- a/config/ansible/tasks/servers/server.yml +++ b/config/ansible/tasks/servers/server.yml @@ -115,10 +115,6 @@ enabled: true hosts: - mennos-desktop - - name: stash - enabled: true - hosts: - - mennos-desktop - name: downloaders enabled: true hosts: @@ -131,6 +127,10 @@ enabled: true hosts: - mennos-desktop + - name: cloudreve + enabled: true + hosts: + - mennos-desktop - name: echoip enabled: true hosts: @@ -152,6 +152,6 @@ hosts: - mennos-desktop - name: avorion - enabled: true + enabled: false hosts: - mennos-desktop diff --git a/config/ansible/tasks/servers/services/arr-stack/docker-compose.yml.j2 b/config/ansible/tasks/servers/services/arr-stack/docker-compose.yml.j2 index 95e1f83..0e25cbc 100644 --- a/config/ansible/tasks/servers/services/arr-stack/docker-compose.yml.j2 +++ b/config/ansible/tasks/servers/services/arr-stack/docker-compose.yml.j2 @@ -44,18 +44,19 @@ services: limits: memory: 2G - whisparr: - image: ghcr.io/hotio/whisparr:latest + bazarr: + image: ghcr.io/hotio/bazarr:latest + container_name: bazarr environment: - PUID=1000 - PGID=100 - TZ=Europe/Amsterdam ports: - - 6969:6969 + - 6767:6767 extra_hosts: - host.docker.internal:host-gateway volumes: - - {{ arr_stack_data_dir }}/whisparr-config:/config + - {{ arr_stack_data_dir }}/bazarr-config:/config - /mnt/data:/mnt/data restart: unless-stopped networks: @@ -63,7 +64,7 @@ services: deploy: resources: limits: - memory: 2G + memory: 512M prowlarr: container_name: prowlarr diff --git a/config/ansible/tasks/servers/services/caddy/Caddyfile.j2 b/config/ansible/tasks/servers/services/caddy/Caddyfile.j2 index 4086a33..43f4b9f 100644 --- a/config/ansible/tasks/servers/services/caddy/Caddyfile.j2 +++ b/config/ansible/tasks/servers/services/caddy/Caddyfile.j2 @@ -189,6 +189,30 @@ tautulli.vleeuwen.me { tls {{ caddy_email }} } +cloud.mvl.sh { + import country_block + reverse_proxy cloudreve:5212 { + header_up Host {host} + header_up X-Real-IP {http.request.remote.host} + } + tls {{ caddy_email }} +} + +cloud.vleeuwen.me { + import country_block + redir https://cloud.mvl.sh{uri} + tls {{ caddy_email }} +} + +collabora.mvl.sh { + import country_block + reverse_proxy collabora:9980 { + header_up Host {host} + header_up X-Real-IP {http.request.remote.host} + } + tls {{ caddy_email }} +} + drive.mvl.sh drive.vleeuwen.me { import country_block diff --git a/config/ansible/tasks/servers/services/cloudreve/cloudreve.yml b/config/ansible/tasks/servers/services/cloudreve/cloudreve.yml new file mode 100644 index 0000000..aefdd64 --- /dev/null +++ b/config/ansible/tasks/servers/services/cloudreve/cloudreve.yml @@ -0,0 +1,31 @@ +--- +- name: Deploy Cloudreve service + block: + - name: Set Cloudreve directories + ansible.builtin.set_fact: + cloudreve_service_dir: "{{ ansible_env.HOME }}/.services/cloudreve" + cloudreve_data_dir: "/mnt/services/cloudreve" + + - name: Create Cloudreve directory + ansible.builtin.file: + path: "{{ cloudreve_service_dir }}" + state: directory + mode: "0755" + + - name: Deploy Cloudreve docker-compose.yml + ansible.builtin.template: + src: docker-compose.yml.j2 + dest: "{{ cloudreve_service_dir }}/docker-compose.yml" + mode: "0644" + register: cloudreve_compose + + - name: Stop Cloudreve service + ansible.builtin.command: docker compose -f "{{ cloudreve_service_dir }}/docker-compose.yml" down --remove-orphans + when: cloudreve_compose.changed + + - name: Start Cloudreve service + ansible.builtin.command: docker compose -f "{{ cloudreve_service_dir }}/docker-compose.yml" up -d + when: cloudreve_compose.changed + tags: + - services + - cloudreve diff --git a/config/ansible/tasks/servers/services/cloudreve/docker-compose.yml.j2 b/config/ansible/tasks/servers/services/cloudreve/docker-compose.yml.j2 new file mode 100644 index 0000000..2ff321f --- /dev/null +++ b/config/ansible/tasks/servers/services/cloudreve/docker-compose.yml.j2 @@ -0,0 +1,63 @@ +services: + cloudreve: + image: cloudreve/cloudreve:latest + depends_on: + - postgresql + - redis + restart: always + ports: + - 5212:5212 + networks: + - caddy_network + - cloudreve + environment: + - CR_CONF_Database.Type=postgres + - CR_CONF_Database.Host=postgresql + - CR_CONF_Database.User=cloudreve + - CR_CONF_Database.Name=cloudreve + - CR_CONF_Database.Port=5432 + - CR_CONF_Redis.Server=redis:6379 + volumes: + - {{ cloudreve_data_dir }}/data:/cloudreve/data + + postgresql: + image: postgres:17 + environment: + - POSTGRES_USER=cloudreve + - POSTGRES_DB=cloudreve + - POSTGRES_HOST_AUTH_METHOD=trust + networks: + - cloudreve + volumes: + - {{ cloudreve_data_dir }}/postgres:/var/lib/postgresql/data + + collabora: + image: collabora/code + restart: unless-stopped + ports: + - 9980:9980 + environment: + - domain=collabora\\.mvl\\.sh + - username=admin + - password=Dt3hgIJOPr3rgh + - dictionaries=en_US + - TZ=Europe/Amsterdam + - extra_params=--o:ssl.enable=false --o:ssl.termination=true + networks: + - cloudreve + - caddy_network + + redis: + image: redis:latest + networks: + - cloudreve + volumes: + - {{ cloudreve_data_dir }}/redis:/data + +networks: + cloudreve: + name: cloudreve + driver: bridge + caddy_network: + name: caddy_default + external: true diff --git a/config/ansible/tasks/servers/services/dashy/conf.yml.j2 b/config/ansible/tasks/servers/services/dashy/conf.yml.j2 index 1004688..ca29b68 100644 --- a/config/ansible/tasks/servers/services/dashy/conf.yml.j2 +++ b/config/ansible/tasks/servers/services/dashy/conf.yml.j2 @@ -259,16 +259,6 @@ sections: - do - discount - work - - name: Other - items: - - title: Whisparr - icon: http://mennos-desktop:4000/assets/whisparr.svg - url: http://go/whisparr - id: 0_514_whisparr - - title: Stash - icon: http://mennos-desktop:4000/assets/stash.svg - url: http://go/stash - id: 1_514_stash displayData: sortBy: default rows: 1 diff --git a/config/ansible/tasks/servers/services/qdrant/docker-compose.yml.j2 b/config/ansible/tasks/servers/services/qdrant/docker-compose.yml.j2 new file mode 100644 index 0000000..ab37680 --- /dev/null +++ b/config/ansible/tasks/servers/services/qdrant/docker-compose.yml.j2 @@ -0,0 +1,17 @@ +services: + qdrant: + image: qdrant/qdrant:latest + restart: always + ports: + - 6333:6333 + - 6334:6334 + expose: + - 6333 + - 6334 + - 6335 + volumes: + - /mnt/services/qdrant:/qdrant/storage + deploy: + resources: + limits: + memory: 2G diff --git a/config/ansible/tasks/servers/services/qdrant/qdrant.yml b/config/ansible/tasks/servers/services/qdrant/qdrant.yml new file mode 100644 index 0000000..e2c5895 --- /dev/null +++ b/config/ansible/tasks/servers/services/qdrant/qdrant.yml @@ -0,0 +1,31 @@ +--- +- name: Deploy Qdrant service + block: + - name: Set Qdrant directories + ansible.builtin.set_fact: + qdrant_service_dir: "{{ ansible_env.HOME }}/.services/qdrant" + qdrant_data_dir: "/mnt/services/qdrant" + + - name: Create Qdrant directory + ansible.builtin.file: + path: "{{ qdrant_service_dir }}" + state: directory + mode: "0755" + + - name: Deploy Qdrant docker-compose.yml + ansible.builtin.template: + src: docker-compose.yml.j2 + dest: "{{ qdrant_service_dir }}/docker-compose.yml" + mode: "0644" + register: qdrant_compose + + - name: Stop Qdrant service + ansible.builtin.command: docker compose -f "{{ qdrant_service_dir }}/docker-compose.yml" down --remove-orphans + when: qdrant_compose.changed + + - name: Start Qdrant service + ansible.builtin.command: docker compose -f "{{ qdrant_service_dir }}/docker-compose.yml" up -d + when: qdrant_compose.changed + tags: + - services + - qdrant diff --git a/config/ansible/tasks/servers/services/stash/docker-compose.yml.j2 b/config/ansible/tasks/servers/services/stash/docker-compose.yml.j2 deleted file mode 100644 index 649b1a0..0000000 --- a/config/ansible/tasks/servers/services/stash/docker-compose.yml.j2 +++ /dev/null @@ -1,41 +0,0 @@ -services: - stash: - image: stashapp/stash:latest - container_name: stash - restart: unless-stopped - ports: - - "9999:9999" - environment: - - PUID=1000 - - PGID=1000 - - STASH_STASH=/data/ - - STASH_GENERATED=/generated/ - - STASH_METADATA=/metadata/ - - STASH_CACHE=/cache/ - - STASH_PORT=9999 - volumes: - - /etc/localtime:/etc/localtime:ro - ## Point this at your collection. - - {{ stash_data_dir }}:/data - - ## Keep configs, scrapers, and plugins here. - - {{ stash_config_dir }}/config:/root/.stash - ## This is where your stash's metadata lives - - {{ stash_config_dir }}/metadata:/metadata - ## Any other cache content. - - {{ stash_config_dir }}/cache:/cache - ## Where to store binary blob data (scene covers, images) - - {{ stash_config_dir }}/blobs:/blobs - ## Where to store generated content (screenshots,previews,transcodes,sprites) - - {{ stash_config_dir }}/generated:/generated - networks: - - caddy_network - deploy: - resources: - limits: - memory: 2G - -networks: - caddy_network: - external: true - name: caddy_default diff --git a/config/ansible/tasks/servers/services/stash/stash.yml b/config/ansible/tasks/servers/services/stash/stash.yml deleted file mode 100644 index f264304..0000000 --- a/config/ansible/tasks/servers/services/stash/stash.yml +++ /dev/null @@ -1,37 +0,0 @@ ---- -- name: Deploy Stash service - block: - - name: Set Stash directories - ansible.builtin.set_fact: - stash_data_dir: "/mnt/data/stash" - stash_config_dir: "/mnt/services/stash" - stash_service_dir: "{{ ansible_env.HOME }}/.services/stash" - - - name: Create Stash directories - ansible.builtin.file: - path: "{{ stash_dir }}" - state: directory - mode: "0755" - loop: - - "{{ stash_data_dir }}" - - "{{ stash_service_dir }}" - loop_control: - loop_var: stash_dir - - - name: Deploy Stash docker-compose.yml - ansible.builtin.template: - src: docker-compose.yml.j2 - dest: "{{ stash_service_dir }}/docker-compose.yml" - mode: "0644" - register: stash_compose - - - name: Stop Stash service - ansible.builtin.command: docker compose -f "{{ stash_service_dir }}/docker-compose.yml" down --remove-orphans - when: stash_compose.changed - - - name: Start Stash service - ansible.builtin.command: docker compose -f "{{ stash_service_dir }}/docker-compose.yml" up -d - when: stash_compose.changed - tags: - - services - - stash diff --git a/config/autostart/io.github.mrvladus.List.desktop b/config/autostart/io.github.mrvladus.List.desktop old mode 100755 new mode 100644 diff --git a/zed/settings.json b/zed/settings.json index 8203757..54edde6 100644 --- a/zed/settings.json +++ b/zed/settings.json @@ -10,6 +10,9 @@ // ############################################# // ## Theming ## // ############################################# + "features": { + "edit_prediction_provider": "copilot" + }, "telemetry": { "diagnostics": false, "metrics": false @@ -19,14 +22,30 @@ "host": "desktop", "projects": [ { - "paths": ["/home/menno/.dotfiles"] + "paths": [ + "/home/menno/.dotfiles" + ] + } + ] + }, + { + "host": "salt.dev-via-laptop", + "username": "salt", + "projects": [ + { + "paths": [ + "/home/salt/releases" + ] } ] } ], - "icon_theme": "Catppuccin Macchiato", + "icon_theme": "Catppuccin Latte", "ui_font_size": 16, - "buffer_font_size": 16, + "buffer_font_size": 14, + "terminal": { + "font_size": 14 + }, "minimap": { "show": "always", "thumb": "hover", @@ -36,7 +55,7 @@ "theme": { "mode": "system", "light": "Catppuccin Latte", - "dark": "Catppuccin Macchiato" + "dark": "Catppuccin Latte" }, "tabs": { "close_position": "right", @@ -71,11 +90,12 @@ // ## AI Stuff ## // ############################################# "agent": { + "always_allow_tool_actions": true, "default_profile": "write", "model_parameters": [], "default_model": { "provider": "copilot_chat", - "model": "gpt-5" + "model": "grok-code-fast-1" } }, "edit_predictions": {