Merge branch 'master' of gitea:/FunctionalHacker/dotfiles

docker/freshrss/docker-compose.yml

@@ -21,12 +21,12 @@ services:
       - "traefik.enable=true"
 
       - "traefik.http.routers.freshrss-redirect.entrypoints=http"
-      - "traefik.http.routers.freshrss-redirect.rule=Host(`rss.reekynet.com`)"
+      - "traefik.http.routers.freshrss-redirect.rule=Host(`rss.korhonen.cc`)"
       - "traefik.http.middlewares.http2https.redirectscheme.scheme=https"
       - "traefik.http.routers.freshrss-redirect.middlewares=http2https"
 
       - "traefik.http.routers.freshrss.entrypoints=https"
-      - "traefik.http.routers.freshrss.rule=Host(`rss.reekynet.com`)"
+      - "traefik.http.routers.freshrss.rule=Host(`rss.korhonen.cc`)"
       - "traefik.http.routers.freshrss.tls=true"
       - "traefik.http.routers.freshrss.tls.certresolver=http"
       - "traefik.http.routers.freshrss.service=freshrss"

docker/gitea/docker-compose.yaml

@@ -27,12 +27,12 @@ services:
       - "traefik.enable=true"
 
       - "traefik.http.routers.gitea-redirect.entrypoints=http"
-      - "traefik.http.routers.gitea-redirect.rule=Host(`git.reekynet.com`)"
+      - "traefik.http.routers.gitea-redirect.rule=Host(`git.korhonen.cc`)"
       - "traefik.http.middlewares.http2https.redirectscheme.scheme=https"
       - "traefik.http.routers.gitea-redirect.middlewares=http2https"
 
       - "traefik.http.routers.gitea.entrypoints=https"
-      - "traefik.http.routers.gitea.rule=Host(`git.reekynet.com`)"
+      - "traefik.http.routers.gitea.rule=Host(`git.korhonen.cc`)"
       - "traefik.http.routers.gitea.tls=true"
       - "traefik.http.routers.gitea.tls.certresolver=http"
       - "traefik.http.routers.gitea.service=gitea"

docker/homeautomation/docker-compose.yml

@@ -10,7 +10,7 @@ services:
       - /etc/localtime:/etc/localtime:ro
     restart: unless-stopped
     networks:
-      - home-assistant
+      - homeautomation
       - mariadb
       - proxy
     ports:
@@ -22,12 +22,12 @@ services:
       - "traefik.enable=true"
 
       - "traefik.http.routers.home-assistant-redirect.entrypoints=http"
-      - "traefik.http.routers.home-assistant-redirect.rule=Host(`home.reekynet.com`)"
+      - "traefik.http.routers.home-assistant-redirect.rule=Host(`home.korhonen.cc`)"
       - "traefik.http.middlewares.http2https.redirectscheme.scheme=https"
       - "traefik.http.routers.home-assistant-redirect.middlewares=http2https"
 
       - "traefik.http.routers.home-assistant.entrypoints=https"
-      - "traefik.http.routers.home-assistant.rule=Host(`home.reekynet.com`)"
+      - "traefik.http.routers.home-assistant.rule=Host(`home.korhonen.cc`)"
       - "traefik.http.routers.home-assistant.tls=true"
       - "traefik.http.routers.home-assistant.tls.certresolver=http"
       - "traefik.http.routers.home-assistant.service=home-assistant"
@@ -63,7 +63,7 @@ services:
     ports:
       - "1883:1883"
     networks:
-      - home-assistant
+      - homeautomation
     volumes:
       - /docker/homeautomation/mosquitto:/mosquitto
       - /etc/localtime:/etc/localtime:ro
@@ -77,26 +77,52 @@ services:
       - /docker/homeautomation/rhasspy:/profiles
     environment:
       - TZ=Europe/Helsinki
-    networks:
-      - home-assistant
     ports:
       - "12101:12101"
+    networks:
+      - homeautomation
     restart: unless-stopped
     depends_on:
       - home-assistant
+      - opentts
     devices:
       - "/dev/snd:/dev/snd"
 
+  opentts:
+    image: synesthesiam/opentts
+    container_name: opentts
+    ports:
+      - 5500:5500
+    command: --marytts-url http://marytts:59125 --mozillatts-url http://mozillatts:5002
+    tty: true
+    networks:
+      - homeautomation
+    depends_on:
+      - marytts
+      - mozillatts
+  marytts:
+    image: synesthesiam/marytts:5.2
+    container_name: marytts
+    tty: true
+    networks:
+      - homeautomation
+  mozillatts:
+    image: synesthesiam/mozilla-tts
+    container_name: mozillatts
+    tty: true
+    networks:
+      - homeautomation
+
   node-red:
     container_name: node-red
     image: nodered/node-red
     environment:
       - TZ=Europe/Helsinki
-    networks:
-      - home-assistant
       - proxy
     ports:
       - "1880:1880"
+    networks:
+      - homeautomation
     volumes:
       - /docker/homeautomation/node-red:/data
       - /etc/localtime:/etc/localtime:ro
@@ -107,20 +133,48 @@ services:
       - "traefik.enable=true"
 
       - "traefik.http.routers.node-red-redirect.entrypoints=http"
-      - "traefik.http.routers.node-red-redirect.rule=Host(`node.reekynet.com`)"
+      - "traefik.http.routers.node-red-redirect.rule=Host(`node.korhonen.cc`)"
       - "traefik.http.middlewares.http2https.redirectscheme.scheme=https"
       - "traefik.http.routers.node-red-redirect.middlewares=http2https"
 
       - "traefik.http.routers.node-red.entrypoints=https"
-      - "traefik.http.routers.node-red.rule=Host(`node.reekynet.com`)"
+      - "traefik.http.routers.node-red.rule=Host(`node.korhonen.cc`)"
       - "traefik.http.routers.node-red.tls=true"
       - "traefik.http.routers.node-red.tls.certresolver=http"
       - "traefik.http.routers.node-red.service=node-red"
       - "traefik.docker.network=proxy"
       - "traefik.http.services.node-red.loadbalancer.server.port=1880"
 
+  gotify:
+    image: gotify/server
+    container_name: gotify
+    volumes:
+      - /docker/homeautomation/gotify:/app/data
+    environment:
+      - GOTIFY_DATABASE_DIALECT=mysql
+      - GOTIFY_DATABASE_CONNECTION=gotify:gotify@tcp(mariadb:3306)/gotify?charset=utf8&parseTime=True&loc=Local
+    networks:
+      - proxy
+      - mariadb
+    restart: unless-stopped
+    labels:
+      - "traefik.enable=true"
+
+      - "traefik.http.routers.gotify-redirect.entrypoints=http"
+      - "traefik.http.routers.gotify-redirect.rule=Host(`gotify.korhonen.cc`)"
+      - "traefik.http.middlewares.http2https.redirectscheme.scheme=https"
+      - "traefik.http.routers.gotify-redirect.middlewares=http2https"
+
+      - "traefik.http.routers.gotify.entrypoints=https"
+      - "traefik.http.routers.gotify.rule=Host(`gotify.korhonen.cc`)"
+      - "traefik.http.routers.gotify.tls=true"
+      - "traefik.http.routers.gotify.tls.certresolver=http"
+      - "traefik.http.routers.gotify.service=gotify"
+      - "traefik.docker.network=proxy"
+      - "traefik.http.services.gotify.loadbalancer.server.port=80"
+
 networks:
-  home-assistant:
+  homeautomation:
     external: false
   mariadb:
     external: true

docker/jellyfin/docker-compose.yaml

@@ -20,12 +20,12 @@ services:
       - "traefik.enable=true"
 
       - "traefik.http.routers.jellyfin-redirect.entrypoints=http"
-      - "traefik.http.routers.jellyfin-redirect.rule=Host(`jellyfin.reekynet.com`)"
+      - "traefik.http.routers.jellyfin-redirect.rule=Host(`jellyfin.korhonen.cc`)"
       - "traefik.http.middlewares.http2https.redirectscheme.scheme=https"
       - "traefik.http.routers.jellyfin-redirect.middlewares=http2https"
 
       - "traefik.http.routers.jellyfin.entrypoints=https"
-      - "traefik.http.routers.jellyfin.rule=Host(`jellyfin.reekynet.com`)"
+      - "traefik.http.routers.jellyfin.rule=Host(`jellyfin.korhonen.cc`)"
       - "traefik.http.routers.jellyfin.tls=true"
       - "traefik.http.routers.jellyfin.tls.certresolver=http"
       - "traefik.http.routers.jellyfin.service=jellyfin"

docker/marko.korhonen.cc/docker-compose.yaml

@@ -0,0 +1,30 @@
+version: "3"
+
+services:
+  site:
+    image: nginx:alpine
+    container_name: marko.korhonen.cc
+    volumes:
+      - /docker/marko.korhonen.cc:/usr/share/nginx/html:ro
+    networks:
+      - proxy
+    restart: unless-stopped
+    labels:
+      - "traefik.enable=true"
+
+      - "traefik.http.routers.marko-redirect.entrypoints=http"
+      - "traefik.http.routers.marko-redirect.rule=Host(`marko.korhonen.cc`)"
+      - "traefik.http.middlewares.http2https.redirectscheme.scheme=https"
+      - "traefik.http.routers.marko-redirect.middlewares=http2https"
+
+      - "traefik.http.routers.marko.entrypoints=https"
+      - "traefik.http.routers.marko.rule=Host(`marko.korhonen.cc`)"
+      - "traefik.http.routers.marko.tls=true"
+      - "traefik.http.routers.marko.tls.certresolver=http"
+      - "traefik.http.routers.marko.service=marko"
+      - "traefik.docker.network=proxy"
+      - "traefik.http.services.marko.loadbalancer.server.port=80"
+
+networks:
+  proxy:
+    external: true

docker/nextcloud/docker-compose.yml

@@ -28,12 +28,12 @@ services:
       - "traefik.enable=true"
 
       - "traefik.http.routers.nextcloud-redirect.entrypoints=http"
-      - "traefik.http.routers.nextcloud-redirect.rule=Host(`cloud.reekynet.com`)"
+      - "traefik.http.routers.nextcloud-redirect.rule=Host(`cloud.korhonen.cc`)"
       - "traefik.http.middlewares.http2https.redirectscheme.scheme=https"
       - "traefik.http.routers.nextcloud-redirect.middlewares=http2https"
 
       - "traefik.http.routers.nextcloud.entrypoints=https"
-      - "traefik.http.routers.nextcloud.rule=Host(`cloud.reekynet.com`)"
+      - "traefik.http.routers.nextcloud.rule=Host(`cloud.korhonen.cc`)"
       - "traefik.http.routers.nextcloud.tls=true"
       - "traefik.http.routers.nextcloud.tls.certresolver=http"
       - "traefik.http.routers.nextcloud.service=nextcloud"

docker/pihole/docker-compose.yml

@@ -29,12 +29,12 @@ services:
       - "traefik.enable=true"
 
       - "traefik.http.routers.pihole-redirect.entrypoints=http"
-      - "traefik.http.routers.pihole-redirect.rule=Host(`pihole.reekynet.com`)"
+      - "traefik.http.routers.pihole-redirect.rule=Host(`pihole.korhonen.cc`)"
       - "traefik.http.middlewares.http2https.redirectscheme.scheme=https"
       - "traefik.http.routers.pihole-redirect.middlewares=http2https"
 
       - "traefik.http.routers.pihole.entrypoints=https"
-      - "traefik.http.routers.pihole.rule=Host(`pihole.reekynet.com`)"
+      - "traefik.http.routers.pihole.rule=Host(`pihole.korhonen.cc`)"
       - "traefik.http.routers.pihole.tls=true"
       - "traefik.http.routers.pihole.tls.certresolver=http"
       - "traefik.http.routers.pihole.service=pihole"

docker/portainer/docker-compose.yaml

@@ -1,7 +1,7 @@
 version: '3'
 services:
   portainer:
-    image: portainer/portainer
+    image: portainer/portainer-ce
     container_name: portainer
     environment:
       - TZ=Europe/Helsinki
@@ -16,12 +16,12 @@ services:
       - 'traefik.enable=true'
 
       - 'traefik.http.routers.portainer-redirect.entrypoints=http'
-      - 'traefik.http.routers.portainer-redirect.rule=Host(`portainer.reekynet.com`)'
+      - 'traefik.http.routers.portainer-redirect.rule=Host(`portainer.korhonen.cc`)'
       - 'traefik.http.middlewares.http2https.redirectscheme.scheme=https'
       - 'traefik.http.routers.portainer-redirect.middlewares=http2https'
 
       - 'traefik.http.routers.portainer.entrypoints=https'
-      - 'traefik.http.routers.portainer.rule=Host(`portainer.reekynet.com`)'
+      - 'traefik.http.routers.portainer.rule=Host(`portainer.korhonen.cc`)'
       - 'traefik.http.routers.portainer.tls=true'
       - 'traefik.http.routers.portainer.tls.certresolver=http'
       - 'traefik.http.routers.portainer.service=portainer'

docker/traefik/docker-compose.yaml

@@ -2,7 +2,7 @@ version: '3'
 
 services:
   traefik:
-    image: traefik:v2.0
+    image: traefik:latest
     container_name: traefik
     restart: unless-stopped
     ports:
@@ -24,12 +24,12 @@ services:
       - 'traefik.enable=true'
 
       - 'traefik.http.routers.redirect.entrypoints=http'
-      - 'traefik.http.routers.redirect.rule=Host(`traefik.reekynet.com`)'
+      - 'traefik.http.routers.redirect.rule=Host(`traefik.korhonen.cc`)'
       - 'traefik.http.middlewares.http2https.redirectscheme.scheme=https'
       - 'traefik.http.routers.redirect.middlewares=http2https'
 
       - 'traefik.http.routers.dashboard.entrypoints=https'
-      - 'traefik.http.routers.dashboard.rule=Host(`traefik.reekynet.com`)'
+      - 'traefik.http.routers.dashboard.rule=Host(`traefik.korhonen.cc`)'
       - 'traefik.http.middlewares.dashboard-auth.basicauth.usersfile=/dashboard-users'
       - 'traefik.http.routers.dashboard.middlewares=dashboard-auth'
       - 'traefik.http.routers.dashboard.tls=true'

docker/wireguard/docker-compose.yml

@@ -9,7 +9,7 @@ services:
     environment:
       - TZ=Europe/Helsinki
       - PEERS=4
-      - SERVERURL=reekynet.com
+      - SERVERURL=korhonen.cc
       - SERVERPORT=48574
       - INTERNAL_SUBNET=10.200.200.0/24
     volumes:

home/.config/nvim/conf.d/07-fzf.vim

@@ -32,14 +32,12 @@ endfunction
 " Looks
 "let $FZF_DEFAULT_OPTS=' --color=dark --color=fg:15,bg:-1,hl:1,fg+:#ffffff,bg+:0,hl+:1 --color=info:0,prompt:0,pointer:12,marker:4,spinner:11,header:-1 --layout=reverse  --margin=1,4'
 
+" ripgrep custom settings
+command! -bang -nargs=* Rg
+    \ call fzf#vim#grep('rg --column --line-number --no-heading --color=always --smart-case '
+    \ . (len(<q-args>) > 0 ? <q-args> : '""'), 0,
+    \ fzf#vim#with_preview({'options': ['--delimiter=:', '--nth=2..', '--layout=reverse', '--info=inline']}), <bang>0)
+
 " Keybinds
 nmap <C-f> :Files<CR>
 nmap <C-g> :Rg<CR>
-
-" Ripgrep command customization
-command! -bang -nargs=* Rg
-			\ call fzf#vim#grep(
-			\   'rg --column --hidden --line-number --no-heading --color=always --smart-case '.shellescape(<q-args>), 1,
-			\   <bang>0 ? fzf#vim#with_preview('up:60%')
-			\           : fzf#vim#with_preview('right:50%:hidden', '?'),
-			\   <bang>0)