Added missing stuff to homer

nikarh · Sep 1, 2024 · 911d17c · 911d17c
1 parent 56e8d02
commit 911d17c
Show file tree

Hide file tree

Showing 5 changed files with 55 additions and 28 deletions.
diff --git a/system/modules/server/files/docker/projects/files.docker-compose.yaml b/system/modules/server/files/docker/projects/files.docker-compose.yaml
@@ -17,7 +17,6 @@ volumes:
   filebrowser-data:
   syncthing-data:
   esphome-data:
-  switcheroo-db:
 services:
   # Basic monitoring
   netdata:
@@ -121,26 +120,6 @@ services:
       - "-d=/mnt/data/filebrowser.db"
       - "-c=/mnt/data/filebrowser.json"
       - "-p=8080"
-  miniserve:
-    image: httpd
-    container_name: miniserve
-    <<: *service-defaults
-    volumes:
-      - /var/smalldata/Games:/usr/local/apache2/htdocs:ro
-    labels:
-      - "traefik.enable=true"
-      - "traefik.http.services.miniserve.loadbalancer.server.port=80"
-      - "traefik.http.routers.miniserve.rule=Host(`miniserve.${DOMAIN}`)"
-      - "traefik.http.routers.miniserve.entrypoints=https"
-      - "traefik.http.routers.miniserve.middlewares=miniserve-auth"
-      - "traefik.http.middlewares.miniserve-auth.basicauth.users=${MINISERVE_AUTH}"
-  switcheroo:
-    image: nikarh/xcabczxabcz
-    container_name: switcheroo
-    <<: *service-defaults
-    volumes:
-      - switcheroo-db:/db
-      - /var/lib/docker-services/volumes/switcheroo/secrets/.env:/app/.env:ro
   syncthing:
     image: lscr.io/linuxserver/syncthing
     container_name: syncthing

diff --git a/system/modules/server/files/docker/projects/special.docker-compose.yaml b/system/modules/server/files/docker/projects/special.docker-compose.yaml
@@ -0,0 +1,37 @@
+x-arr-env: &arr_env
+  PGID: 1000
+  PUID: 1000
+  TZ: Europe/Riga
+x-service-defaults: &service-defaults
+  restart: unless-stopped
+  logging:
+    driver: "json-file"
+    options:
+      max-size: ${LOG_MAX_SIZE:-200k}
+      max-file: ${LOG_MAX_FILE:-5}
+  healthcheck:
+    disable: true
+volumes:
+  switcheroo-db:
+services:
+  miniserve:
+    image: httpd
+    container_name: miniserve
+    <<: *service-defaults
+    volumes:
+      - /var/smalldata/Games:/usr/local/apache2/htdocs:ro
+    labels:
+      - "traefik.enable=true"
+      - "traefik.http.services.miniserve.loadbalancer.server.port=80"
+      - "traefik.http.routers.miniserve.rule=Host(`miniserve.${DOMAIN}`)"
+      - "traefik.http.routers.miniserve.entrypoints=https"
+      - "traefik.http.routers.miniserve.middlewares=miniserve-auth"
+      - "traefik.http.middlewares.miniserve-auth.basicauth.users=${MINISERVE_AUTH}"
+  switcheroo:
+    image: nikarh/xcabczxabcz
+    container_name: switcheroo
+    <<: *service-defaults
+    volumes:
+      - switcheroo-db:/db
+      - /var/lib/docker-services/volumes/switcheroo/secrets/.env:/app/.env:ro
+      - "traefik.http.routers.esphome.middlewares=authelia@docker"
diff --git a/system/modules/server/files/root/var/lib/docker-services/volumes/homer/config.yml b/system/modules/server/files/root/var/lib/docker-services/volumes/homer/config.yml
@@ -39,7 +39,7 @@ colors:
 
 message:
   style: "is-dark"
-  content: "SFTP is accessible at <a href=\"sftp://files.home.arhipov.net:2222\">files.home.arhipov.net:2222</a>"
+  content: 'SFTP is accessible at <a href="sftp://files.home.arhipov.net:2222">files.home.arhipov.net:2222</a>'
 
 services:
   - name: Devices
@@ -83,6 +83,11 @@ services:
         subtitle: "Traefik dashboard"
         url: "https://traefik.files.home.arhipov.net"
         target: "_blank"
+      - name: "Grafana"
+        icon: "fas fa-chart-line"
+        subtitle: "Grafana"
+        url: "https://grafana.files.home.arhipov.net"
+        target: "_blank"
       - name: "Netdata"
         icon: "fas fa-chart-bar"
         subtitle: "Monitoring"
@@ -103,16 +108,16 @@ services:
         subtitle: "Phone photo backups"
         url: "https://immich.files.home.arhipov.net"
         target: "_blank"
-      - name: "Photoprism"
-        icon: "fas fa-camera-retro"
-        subtitle: "DSLR photos"
-        url: "https://photos.files.home.arhipov.net"
-        target: "_blank"
       - name: "Mail"
         icon: "fas fa-envelope"
         subtitle: "Mail backup"
         url: "https://mail.files.home.arhipov.net"
         target: "_blank"
+      - name: "Gitea"
+        icon: "fas fa-git"
+        subtitle: "Gitea"
+        url: "https://git.files.home.arhipov.net"
+        target: "_blank"
       - name: "ESPHome"
         icon: "fas fa-microchip"
         subtitle: "ESPHome device console"
@@ -125,6 +130,11 @@ services:
         subtitle: "Media streaming"
         url: "https://media.files.home.arhipov.net"
         target: "_blank"
+      - name: "Music"
+        icon: "fas fa-music"
+        subtitle: "Music streaming"
+        url: "https://feishin.files.home.arhipov.net"
+        target: "_blank"
       - name: "Kavita"
         icon: "fas fa-book"
         subtitle: "Book streaming"

diff --git a/user/workstation/user/home/.config/i3/i3status-rs.toml b/user/workstation/user/home/.config/i3/i3status-rs.toml
@@ -114,6 +114,7 @@ command = """
                 | (.properties."alsa.card_name")
                     + " " + (.properties."media.name")' \
             | awk '{$1=$1};1' \
+            | sed 's/USB Audio Class 2.0 //g' \
             | jq -R -c '{
                 text: .,
                 icon: "headphones",

diff --git a/user/workstation/user/home/.local/share/cargo/config.toml b/user/workstation/user/home/.local/share/cargo/config.toml
@@ -1,3 +1,3 @@
 [target.x86_64-unknown-linux-gnu]
 linker = "/usr/bin/clang"
-#rustflags = ["-C", "link-arg=--ld-path=/usr/bin/mold"]
+rustflags = ["-C", "link-arg=--ld-path=/usr/bin/mold"]