Merge branch 'master' into nvim-lua

config-root.yaml

@@ -159,3 +159,6 @@ profiles:
   Edoras:
     include:
     - Pacman
+  mko-laptop:
+    dotfiles:
+      - f_cpupower

docker/freshrss/docker-compose.yml

@@ -13,7 +13,6 @@ services:
       - PGID=985
       - TZ=Europe/Helsinki
     depends_on:
-      - spotifeed
       - bibliogram
     volumes:
       - /docker/freshrss/freshrss:/config
@@ -34,33 +33,6 @@ services:
       - "traefik.docker.network=proxy"
       - "traefik.http.services.freshrss.loadbalancer.server.port=80"
 
-  spotifeed:
-    build: ./spotifeed
-    image: spotifeed
-    container_name: spotifeed
-    environment:
-      - SPOTIFY_CLIENT_ID=${SPOTIFY_CLIENT_ID}
-      - SPOTIFY_CLIENT_SECRET=${SPOTIFY_CLIENT_SECRET}
-    restart: unless-stopped
-    networks:
-      - freshrss
-      - proxy
-    labels:
-      - "traefik.enable=true"
-
-      - "traefik.http.routers.spotifeed-redirect.entrypoints=http"
-      - "traefik.http.routers.spotifeed-redirect.rule=Host(`spotifeed.korhonen.cc`)"
-      - "traefik.http.middlewares.http2https.redirectscheme.scheme=https"
-      - "traefik.http.routers.spotifeed-redirect.middlewares=http2https"
-
-      - "traefik.http.routers.spotifeed.entrypoints=https"
-      - "traefik.http.routers.spotifeed.rule=Host(`spotifeed.korhonen.cc`)"
-      - "traefik.http.routers.spotifeed.tls=true"
-      - "traefik.http.routers.spotifeed.tls.certresolver=http"
-      - "traefik.http.routers.spotifeed.service=spotifeed"
-      - "traefik.docker.network=proxy"
-      - "traefik.http.services.spotifeed.loadbalancer.server.port=8083"
-
   bibliogram:
     image: cloudrac3r/bibliogram
     container_name: bibliogram

docker/freshrss/spotifeed/Dockerfile

@@ -1,9 +0,0 @@
-FROM ruby:2.7.2
-RUN git clone https://github.com/timdorr/spotifeed
-WORKDIR /spotifeed
-RUN bundle install
-EXPOSE 8083
-RUN apt-get update
-RUN apt-get upgrade
-RUN apt-get install redis-server -y
-CMD puma -p 8083 & redis-server

docker/homeautomation/docker-compose.yml

@@ -17,6 +17,7 @@ services:
       - proxy
     ports:
       - "8123:8123"
+      - "8300:8300"
     depends_on:
       - mosquitto
     labels:

home/.config/zsh/02-plugins.zsh

@@ -34,10 +34,6 @@ zinit snippet https://gist.githubusercontent.com/RPigott/a3efdc08fa4d5fd7df38d09
 zinit ice wait'1' lucid as'completion'
 zinit snippet '$DOTREPO/dotdrop/completion/_dotdrop-completion.zsh'
 
-# docker-compose completion
-zinit ice wait'1' lucid as'completion'
-zinit snippet https://raw.githubusercontent.com/docker/compose/master/contrib/completion/zsh/_docker-compose
-
 # syntax highlighting
 zinit ice lucid atinit'zpcompinit'
 zinit light zdharma/fast-syntax-highlighting

root/etc/default/cpupower

@@ -1,2 +1,6 @@
 # vim:set ts=2 sw=2 ft=sh et:
+{%@@ if profile == "Mirkwood" @@%}
 governor='powersave'
+{%@@ else @@%}
+governor='performance'
+{%@@ endif @@%}