diff --git a/nixos/README.md b/nixos/README.md index 81e0f04..526362f 100644 --- a/nixos/README.md +++ b/nixos/README.md @@ -1,5 +1,22 @@ After nixos installation and config files in place, run the `../install-new-desktop.sh` script to put in place all the config files (vim,nvim,tmux,i3,etc) +Go back to a previous generation: +``` +# list stored generations +sudo nixos-rebuild list-generations + +# go to generation number 42 +sudo nix-env --switch-generation 42 -p /nix/var/nix/profiles/system + +# use it +sudo /nix/var/nix/profiles/system/bin/switch-to-configuration switch + +# go back to the latest generation (suppose is 84) +sudo nix-env --switch-generation 82 -p /nix/var/nix/profiles/system + +# to quickly go back just one step: +sudo nixos-rebuild rollback +``` From time to time run the following commands to remove stuff from old generations ``` diff --git a/server-dockers/configurations/homepage/services.yaml b/server-dockers/configurations/homepage/services.yaml index 57c6780..8ed3a6d 100644 --- a/server-dockers/configurations/homepage/services.yaml +++ b/server-dockers/configurations/homepage/services.yaml @@ -39,12 +39,11 @@ icon: wallabag.png href: http://192.168.1.155:8098 description: Wallabag Read It Later - - pi-hole: - icon: pi-hole.png - href: https://192.168.1.155/admin/ - description: pi-hole admin panel - widget: - type: pihole - url: http://192.168.1.155 - version: 6 # required if running v6 or higher, defaults to 5 - key: YOUR_PASSWORD_HERE # password + - 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 diff --git a/server-dockers/configurations/homepage/settings.yaml b/server-dockers/configurations/homepage/settings.yaml index cbc5596..570c6eb 100644 --- a/server-dockers/configurations/homepage/settings.yaml +++ b/server-dockers/configurations/homepage/settings.yaml @@ -11,3 +11,7 @@ background: brightness: 50 # 0, 50, 75... see https://tailwindcss.com/docs/backdrop-brightness opacity: 100 # 0-100 +providers: + openweathermap: openweathermapapikey + weatherapi: weatherapiapikey + diff --git a/server-dockers/configurations/homepage/widgets.yaml b/server-dockers/configurations/homepage/widgets.yaml index 90edf04..224158b 100644 --- a/server-dockers/configurations/homepage/widgets.yaml +++ b/server-dockers/configurations/homepage/widgets.yaml @@ -12,8 +12,13 @@ - resources: cpu: true memory: true + cputemp: true disk: / uptime: true +- resources: + label: "hard drive" + expanded: true + disk: /app/config - search: provider: duckduckgo diff --git a/server-dockers/docker-compose.yml b/server-dockers/docker-compose.yml index 667ee54..8af8c9b 100644 --- a/server-dockers/docker-compose.yml +++ b/server-dockers/docker-compose.yml @@ -31,7 +31,8 @@ # - slskd: 8099 # - metube: 8100 # - qbittorrent: 8080 -# - homepage: 3000 +# - homepage: 8000 +# - grafana: 3000 services: jellyfin: @@ -45,7 +46,7 @@ services: restart: unless-stopped emby: - image: emby/embyserver_arm64v8 + image: emby/embyserver # in rpi: emby/embyserver_arm64v8 container_name: emby ports: - "8097:8096" @@ -117,48 +118,50 @@ services: restart: unless-stopped # metrics related: - # prometheus: - # image: prom/prometheus:latest - # container_name: prometheus - # ports: - # - "9090:9090" - # volumes: - # - ./prometheus.yml:/etc/prometheus/prometheus.yml - # - prometheus_data:/prometheus - # networks: - # - monitoring - # restart: unless-stopped - # - # node-exporter: - # image: prom/node-exporter:latest - # container_name: node-exporter - # ports: - # - "9100:9100" - # networks: - # - monitoring - # restart: unless-stopped - # - # grafana: - # image: grafana/grafana:latest - # container_name: grafana - # ports: - # - "3000:3000" - # environment: - # - GF_SECURITY_ADMIN_PASSWORD=admin - # volumes: - # - grafana_data:/var/lib/grafana - # networks: - # - monitoring - # depends_on: - # - prometheus - # restart: unless-stopped + prometheus: + image: prom/prometheus:latest + container_name: prometheus + ports: + - "9090:9090" + volumes: + - ./prometheus.yml:/etc/prometheus/prometheus.yml + - prometheus_data:/prometheus + networks: + - monitoring + restart: unless-stopped + + node-exporter: + image: prom/node-exporter:latest + container_name: node-exporter + ports: + - "9100:9100" + volumes: + - /:/host:ro + networks: + - monitoring + restart: unless-stopped + + grafana: + image: grafana/grafana:latest + container_name: grafana + ports: + - "3000:3000" + environment: + - GF_SECURITY_ADMIN_PASSWORD=YOUR_PASSWORD_HERE + volumes: + - grafana_data:/var/lib/grafana + networks: + - monitoring + depends_on: + - prometheus + restart: unless-stopped networks: monitoring: driver: bridge -#volumes: -# prometheus_data: -# driver: local -# grafana_data: -# driver: local +volumes: + prometheus_data: + driver: local + grafana_data: + driver: local