diff --git a/backup-configs.sh b/backup-configs.sh index 6638cda..03945d9 100755 --- a/backup-configs.sh +++ b/backup-configs.sh @@ -5,6 +5,7 @@ cp ~/.config/nvim/init.vim ./init.vim cp ~/.vimrc ./.vimrc cp ~/vimconfigbase.vim ./vimconfigbase.vim cp ~/.tmux.conf ./.tmux.conf +cp ~/.config/zathura/zathurarc ./zathurarc mkdir -p sway cp ~/.config/sway/config ./sway/config @@ -12,3 +13,4 @@ cp ~/.config/sway/status.sh ./sway/status.sh mkdir -p alacritty cp ~/.config/alacritty/alacritty.toml ./alacritty/alacritty.toml + diff --git a/nixos/common-configuration.nix b/nixos/common-configuration.nix index 3430d98..b032919 100644 --- a/nixos/common-configuration.nix +++ b/nixos/common-configuration.nix @@ -84,6 +84,7 @@ gnutar xorg.xmodmap # keyboard remapping xfce.xfce4-screenshooter + flameshot pulseaudio usbutils time diff --git a/restore-backup-configs.sh b/restore-backup-configs.sh new file mode 100755 index 0000000..2317bb9 --- /dev/null +++ b/restore-backup-configs.sh @@ -0,0 +1,15 @@ +#!/usr/bin/env bash + + +cp ./init.vim ~/.config/nvim/init.vim +cp ./.vimrc ~/.vimrc +cp ./vimconfigbase.vim ~/vimconfigbase.vim +cp ./.tmux.conf ~/.tmux.conf +cp ./zathurarc ~/.config/zathura/zathurarc + +mkdir -p ~/.config/sway +cp ./sway/config ~/.config/sway/config +cp ./sway/status.sh ~/.config/sway/status.sh + +mkdir -p alacritty +cp ./alacritty/alacritty.toml ~/.config/alacritty/alacritty.toml diff --git a/server-dockers/backup-configs.sh b/server-dockers/backup-configs.sh index 3a44dc5..9ae2dbd 100755 --- a/server-dockers/backup-configs.sh +++ b/server-dockers/backup-configs.sh @@ -1,11 +1,16 @@ #!/usr/bin/env bash SERVER=$1 +PASSW=$2 +NEW_PASSW="YOURPASSWORDHERE" -if [ -z $SERVER ] ; then - echo "missing 1st argument (SERVER)" - exit 1 +if [ "$#" -ne 2 ]; then + echo "Usage: $0 SERVER_NAME PASSW" + exit 1 fi +rsync -avz --progress --exclude={'*.log','emby','jellyfin','qbittorrent','slskd','wallabag','prowlarr','sonarr','radarr','bazarr'} $SERVER:~/server-dockers/docker-compose.yml $SERVER:/mnt/usb/configurations ./ -rsync -avz --progress --exclude={'*.log','emby','jellyfin','qbittorrent','slskd','wallabag'} $SERVER:~/server-dockers/docker-compose.yml $SERVER:/mnt/usb/configurations ./ +# replace PASSW by NEW_PASSW (also in subdirs) +find . -type f -exec \ + sed -i "s/${PASSW//\//\\/}/${NEW_PASSW//\//\\/}/g" {} + diff --git a/server-dockers/configurations/homepage/services.yaml b/server-dockers/configurations/homepage/services.yaml index 8ed3a6d..715d176 100644 --- a/server-dockers/configurations/homepage/services.yaml +++ b/server-dockers/configurations/homepage/services.yaml @@ -2,48 +2,80 @@ # For configuration options and examples, please see: # https://gethomepage.dev/configs/services/ -- Media: - - Jellyfin: - icon: jellyfin.png - href: http://192.168.1.155:8096 - description: Jellyfin Media Server - - Emby: - icon: emby.png - href: http://192.168.1.155:8097 - description: Emby Media Server - - qBittorrent: - icon: qbittorrent.png - href: http://192.168.1.155:8080 - description: qBittorrent Web UI - widget: - type: qbittorrent - url: http://192.168.1.155:8080 - username: admin - password: YOUR_PASSWORD_HERE - enableLeechProgress: true # optional, defaults to false - - metube: - icon: metube.png - href: http://192.168.1.155:8100 - description: download youtube music & videos +- LeftCol: + - Media: + - Jellyfin: + icon: jellyfin.png + href: http://192.168.1.155:8096 + description: Jellyfin Media Server + - Emby: + icon: emby.png + href: http://192.168.1.155:8097 + description: Emby Media Server + - Descarregues a ma: + - qBittorrent: + icon: qbittorrent.png + href: http://192.168.1.155:8080 + description: qBittorrent Web UI + widget: + type: qbittorrent + url: http://192.168.1.155:8080 + username: admin + password: YOURPASSWORDHERE + enableLeechProgress: true # optional, defaults to false + - slskd: + icon: slskd.png + href: http://192.168.1.155:8099 + description: SoulSeek client to download music + - metube: + icon: metube.png + href: http://192.168.1.155:8100 + description: download youtube music & videos -- Altres: - - raspberry grafana: - icon: grafana.png - href: http://192.168.1.155:3000/d/rYdddlPWk/node-exporter-full - description: raspberry grafana dashboard - - Galdric grafana: - icon: grafana.png - href: http://192.168.1.156:3000/d/rYdddlPWk/node-exporter-full - description: Galdric grafana dashboard - - Wallabag: - icon: wallabag.png - href: http://192.168.1.155:8098 - description: Wallabag Read It Later - - HomeAssistant: - icon: home-assistant.png - href: http://192.168.1.148:8123 - description: Open Home Assistant page. -# - Vosk: -# icon: vosk.png -# href: http://192.168.1.155:8101 -# description: voice to text +- CentralCol: + - DescARRegues: + - sonarr: + icon: sonarr.png + href: http://192.168.1.155:8101 + description: Automating download of shows + widget: + type: sonarr + url: http://192.168.1.155:8101 + key: API_KEY_HERE + enableQueue: true + - radarr: + icon: radarr.png + href: http://192.168.1.155:8104 + description: Automating download of movies + widget: + type: radarr + url: http://192.168.1.155:8104 + key: API_KEY_HERE + enableQueue: true + - bazarr: + icon: bazarr.png + href: http://192.168.1.155:8103 + description: Manage & download subtitles + - prowlarr: + icon: prowlarr.png + href: http://192.168.1.155:8102 + description: API Support for torrent trackers + +- RightCol: + - Altres: + - beelink grafana: + icon: grafana.png + href: http://192.168.1.155:3000/d/rYdddlPWk/node-exporter-full + description: beelink grafana dashboard + - Galdric grafana: + icon: grafana.png + href: http://192.168.1.156:3000/d/rYdddlPWk/node-exporter-full + description: Galdric grafana dashboard + - Wallabag: + icon: wallabag.png + href: http://192.168.1.155:8098 + description: Wallabag Read It Later + - HomeAssistant: + icon: home-assistant.png + href: http://192.168.1.148:8123 + description: Open Home Assistant page. diff --git a/server-dockers/configurations/homepage/settings.yaml b/server-dockers/configurations/homepage/settings.yaml index 570c6eb..e595d24 100644 --- a/server-dockers/configurations/homepage/settings.yaml +++ b/server-dockers/configurations/homepage/settings.yaml @@ -12,6 +12,13 @@ background: opacity: 100 # 0-100 providers: - openweathermap: openweathermapapikey - weatherapi: weatherapiapikey + openweathermap: OPENWEATHERMAPAPIKEY + weatherapi: WEATHERAPIAPIKEY +layout: + LeftCol: + header: false + CentralCol: + header: false + RightCol: + header: false diff --git a/server-dockers/docker-compose.yml b/server-dockers/docker-compose.yml index 8af8c9b..23ae012 100644 --- a/server-dockers/docker-compose.yml +++ b/server-dockers/docker-compose.yml @@ -30,6 +30,10 @@ # - wallabag: 8098 # - slskd: 8099 # - metube: 8100 +# - sonarr: 8101 +# - prowlarr: 8102 +# - bazarr: 8103 +# - radarr: 8104 # - qbittorrent: 8080 # - homepage: 8000 # - grafana: 3000 @@ -89,6 +93,64 @@ services: - /mnt/usb/audio/from-youtube:/downloads restart: unless-stopped + sonarr: + image: lscr.io/linuxserver/sonarr:latest + container_name: sonarr + environment: + - PUID=1000 + - PGID=1000 + - TZ=Europe/Amsterdam + volumes: + - /mnt/usb/configurations/sonarr:/config + - /mnt/usb/torrent-downloads:/downloads + - /mnt/usb/shows:/data/shows + ports: + - 8101:8989 + restart: unless-stopped + + radarr: + image: lscr.io/linuxserver/radarr:latest + container_name: radarr + environment: + - PUID=1000 + - PGID=1000 + - TZ=Europe/Amsterdam + volumes: + - /mnt/usb/configurations/radarr:/config + - /mnt/usb/torrent-downloads:/downloads + - /mnt/usb/movies:/movies + ports: + - 8104:7878 + restart: unless-stopped + + bazarr: + image: lscr.io/linuxserver/bazarr:latest + container_name: bazarr + environment: + - PUID=1000 + - PGID=1000 + - TZ=Europe/Amsterdam + volumes: + - /mnt/usb/configurations/bazarr:/config + - /mnt/usb/shows:/data/shows + - /mnt/usb/movies:/movies + ports: + - 8103:6767 + restart: unless-stopped + + prowlarr: + container_name: prowlarr + image: ghcr.io/hotio/prowlarr + ports: + - "8102:9696" + environment: + - PUID=1000 + - PGID=1000 + - UMASK=002 + - TZ=Europe/Amsterdam + volumes: + - /mnt/usb/configurations/prowlarr:/config + qbittorrent-nox: image: qbittorrentofficial/qbittorrent-nox:latest container_name: qbittorrent-nox @@ -98,7 +160,7 @@ services: - "6881:6881/udp" volumes: - /mnt/usb/configurations/qbittorrent:/config - - /mnt/usb:/downloads + - /mnt/usb/torrent-downloads:/downloads environment: - QBT_LEGAL_NOTICE=confirm - WEBUI_PORT=8080 @@ -147,7 +209,7 @@ services: ports: - "3000:3000" environment: - - GF_SECURITY_ADMIN_PASSWORD=YOUR_PASSWORD_HERE + - GF_SECURITY_ADMIN_PASSWORD=YOURPASSWORDHERE volumes: - grafana_data:/var/lib/grafana networks: @@ -156,6 +218,11 @@ services: - prometheus restart: unless-stopped + # NOTE: better run homeassistant alone in the rpi as OS (not container), + # which has support for 'add-ons'. + # More info: https://www.home-assistant.io/installation/#about-installation-types + + networks: monitoring: driver: bridge diff --git a/sway/config b/sway/config index 0deb4ef..d1a4e50 100644 --- a/sway/config +++ b/sway/config @@ -30,7 +30,8 @@ output * bg ~/Sync-tablet/wallpapers/geometry02_croped1920x1080.png fill # home setup: output HDMI-A-1 resolution 3840x2160 position 1920 0 -output eDP-1 resolution 1920x1200 position 0 0 +# output eDP-1 resolution 1920x1200 position 0 0 transform 90 +output DSI-1 resolution 1920x1200 position 0 0 transform 90 # portable external monitor setup: # output DP-1 resolution 3840x2160 position 1920 0 diff --git a/zathurarc b/zathurarc index 4e034a9..c8c9757 100644 --- a/zathurarc +++ b/zathurarc @@ -1,3 +1,5 @@ " this file goes at ~/.config/zathura/zathurarc map exec "zathura $FILE" + +set selection-clipboard clipboard