Compare commits

..

No commits in common. "44c3e123ea1fb5d428f91422c07358af8c9d7ee8" and "8edde757b6187e0cf425a53b435454ed640766e5" have entirely different histories.

18 changed files with 73 additions and 216 deletions

View file

@ -162,12 +162,8 @@ profiles:
Gondor: Gondor:
include: include:
- Locale - Locale
- Pacman
dotfiles: dotfiles:
- f_sshd_config - f_sshd_config
localhost: localhost:
include: include:
- Locale - Locale
Edoras:
include:
- Pacman

View file

@ -235,22 +235,9 @@ profiles:
- terminal - terminal
- Pacman - Pacman
mko-laptop: mko-laptop:
dotfiles: include:
- f_nvimpager - terminal
- f_hushlogin AnittaPC:
- f_ripgrep_ignore
- f_ranger_commands.py
- f_rtv.cfg
- f_mailcap
- d_zsh
- f_zshrc
- f_tmux.conf
- f_ranger.conf
- d_nvim_config
- f_init.vim
- f_coc-settings.json
- f_alacritty.yml
Edoras:
include: include:
- terminal - terminal
- Pacman - Pacman

View file

@ -1 +0,0 @@
.env

View file

@ -6,7 +6,7 @@ services:
restart: unless-stopped restart: unless-stopped
networks: networks:
- freshrss - freshrss
- postgres - mariadb
- proxy - proxy
ports: ports:
- 8088:80 - 8088:80
@ -14,10 +14,8 @@ services:
- PUID=1000 - PUID=1000
- PGID=985 - PGID=985
- TZ=Europe/Helsinki - TZ=Europe/Helsinki
depends_on:
- spotifeed
volumes: volumes:
- /docker/freshrss/freshrss:/config - /docker/freshrss:/config
- /etc/localtime:/etc/localtime:ro - /etc/localtime:/etc/localtime:ro
labels: labels:
- "traefik.enable=true" - "traefik.enable=true"
@ -35,46 +33,10 @@ services:
- "traefik.docker.network=proxy" - "traefik.docker.network=proxy"
- "traefik.http.services.freshrss.loadbalancer.server.port=80" - "traefik.http.services.freshrss.loadbalancer.server.port=80"
spotifeed:
build: ./spotifeed
image: spotifeed
container_name: spotifeed
ports:
- 8083:8083
restart: unless-stopped
networks:
- freshrss
bibliogram:
image: cloudrac3r/bibliogram
container_name: bibliogram
restart: unless-stopped
volumes:
- /docker/freshrss/bibliogram/db:/app/db
- /docker/freshrss/bibliogram/config.js:/app/config.js
networks:
- freshrss
- proxy
labels:
- "traefik.enable=true"
- "traefik.http.routers.bibliogram-redirect.entrypoints=http"
- "traefik.http.routers.bibliogram-redirect.rule=Host(`bibliogram.korhonen.cc`)"
- "traefik.http.middlewares.http2https.redirectscheme.scheme=https"
- "traefik.http.routers.bibliogram-redirect.middlewares=http2https"
- "traefik.http.routers.bibliogram.entrypoints=https"
- "traefik.http.routers.bibliogram.rule=Host(`bibliogram.korhonen.cc`)"
- "traefik.http.routers.bibliogram.tls=true"
- "traefik.http.routers.bibliogram.tls.certresolver=http"
- "traefik.http.routers.bibliogram.service=bibliogram"
- "traefik.docker.network=proxy"
- "traefik.http.services.bibliogram.loadbalancer.server.port=10407"
networks: networks:
freshrss: freshrss:
external: false external: false
postgres: mariadb:
external: true external: true
proxy: proxy:
external: true external: true

View file

@ -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

View file

@ -8,9 +8,14 @@ services:
- TZ=Europe/Helsinki - TZ=Europe/Helsinki
- USER_UID=1000 - USER_UID=1000
- USER_GID=1000 - USER_GID=1000
- DB_TYPE=mysql
- DB_HOST=mariadb:3306
- DB_NAME=gitea
- DB_USER=gitea
- DB_PASSWD=${MYSQL_PASS}
restart: unless-stopped restart: unless-stopped
networks: networks:
- postgres - mariadb
- proxy - proxy
ports: ports:
- "3000:3000" - "3000:3000"
@ -35,7 +40,7 @@ services:
- "traefik.http.services.gitea.loadbalancer.server.port=3000" - "traefik.http.services.gitea.loadbalancer.server.port=3000"
networks: networks:
postgres: mariadb:
external: true external: true
proxy: proxy:
external: true external: true

View file

@ -13,7 +13,7 @@ services:
restart: unless-stopped restart: unless-stopped
networks: networks:
- homeautomation - homeautomation
- postgres - mariadb
- proxy - proxy
ports: ports:
- "8123:8123" - "8123:8123"
@ -133,11 +133,11 @@ services:
volumes: volumes:
- /docker/homeautomation/gotify:/app/data - /docker/homeautomation/gotify:/app/data
environment: environment:
- GOTIFY_DATABASE_DIALECT=postgres - GOTIFY_DATABASE_DIALECT=mysql
- GOTIFY_DATABASE_CONNECTION="host=postgres port=5432 user=gotify dbname=gotify password=${GOTIFY_PGPASS} sslmode=disable" - GOTIFY_DATABASE_CONNECTION=gotify:gotify@tcp(mariadb:3306)/gotify?charset=utf8&parseTime=True&loc=Local
networks: networks:
- proxy - proxy
- postgres - mariadb
restart: unless-stopped restart: unless-stopped
labels: labels:
- "traefik.enable=true" - "traefik.enable=true"
@ -158,7 +158,7 @@ services:
networks: networks:
homeautomation: homeautomation:
external: false external: false
postgres: mariadb:
external: true external: true
proxy: proxy:
external: true external: true

View file

@ -1,33 +0,0 @@
version: "3"
services:
nginx:
image: fraoustin/fancyindex
container_name: index.korhonen.cc
environment:
- DISABLE_AUTH=true
- CONTAINER_TIMEZONE="Europe/Helsinki"
volumes:
- /docker/index.korhonen.cc:/share
networks:
- proxy
restart: unless-stopped
labels:
- "traefik.enable=true"
- "traefik.http.routers.index-redirect.entrypoints=http"
- "traefik.http.routers.index-redirect.rule=Host(`index.korhonen.cc`)"
- "traefik.http.middlewares.http2https.redirectscheme.scheme=https"
- "traefik.http.routers.index-redirect.middlewares=http2https"
- "traefik.http.routers.index.entrypoints=https"
- "traefik.http.routers.index.rule=Host(`index.korhonen.cc`)"
- "traefik.http.routers.index.tls=true"
- "traefik.http.routers.index.tls.certresolver=http"
- "traefik.http.routers.index.service=index"
- "traefik.docker.network=proxy"
- "traefik.http.services.index.loadbalancer.server.port=80"
networks:
proxy:
external: true

View file

@ -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

View file

@ -9,7 +9,7 @@ services:
- "1869:80" - "1869:80"
networks: networks:
- nextcloud - nextcloud
- postgres - mariadb
- proxy - proxy
volumes: volumes:
- /docker/nextcloud:/var/www/html - /docker/nextcloud:/var/www/html
@ -19,6 +19,7 @@ services:
- /etc/localtime:/etc/localtime:ro - /etc/localtime:/etc/localtime:ro
environment: environment:
- TZ=Europe/Helsinki - TZ=Europe/Helsinki
- MYSQL_HOST=mariadb-nextcloud
- REDIS_HOST=redis - REDIS_HOST=redis
- REDIS_HOST_PASSWORD=123 - REDIS_HOST_PASSWORD=123
depends_on: depends_on:
@ -60,7 +61,7 @@ services:
networks: networks:
nextcloud: nextcloud:
external: false external: false
postgres: mariadb:
external: true external: true
proxy: proxy:
external: true external: true

View file

@ -1,20 +0,0 @@
version: "3"
services:
postgres:
container_name: postgres
image: postgres:13
environment:
- TZ=Europe/Helsinki
- POSTGRES_PASSWORD=12345
ports:
- 5432:5432
networks:
- postgres
volumes:
- /docker/postgres:/var/lib/postgresql/data
- /etc/localtime:/etc/localtime:ro
restart: unless-stopped
networks:
postgres:
external: true

View file

@ -1,40 +0,0 @@
version: "2"
services:
tvheadend:
image: linuxserver/tvheadend
container_name: tvheadend
environment:
- TZ=Europe/Helsinki
- PUID=1000
- PGID=985
volumes:
- /docker/tvheadend:/config
- /mnt/Storage/Media/PVR:/recordings
- /etc/localtime:/etc/localtime:ro
ports:
- 9982:9982
devices:
- /dev/dri:/dev/dri #hardware acceleration
- /dev/dvb:/dev/dvb #tuner card
restart: unless-stopped
networks:
- proxy
labels:
- "traefik.enable=true"
- "traefik.http.routers.tvheadend-redirect.entrypoints=http"
- "traefik.http.routers.tvheadend-redirect.rule=Host(`tvheadend.korhonen.cc`)"
- "traefik.http.middlewares.http2https.redirectscheme.scheme=https"
- "traefik.http.routers.tvheadend-redirect.middlewares=http2https"
- "traefik.http.routers.tvheadend.entrypoints=https"
- "traefik.http.routers.tvheadend.rule=Host(`tvheadend.korhonen.cc`)"
- "traefik.http.routers.tvheadend.tls=true"
- "traefik.http.routers.tvheadend.tls.certresolver=http"
- "traefik.http.routers.tvheadend.service=tvheadend"
- "traefik.docker.network=proxy"
- "traefik.http.services.tvheadend.loadbalancer.server.port=9981"
networks:
proxy:
external: true

@ -1 +1 @@
Subproject commit 900f705b30ee07063ecc7f2df24fc7b28a9451a5 Subproject commit 636c1ade26a5205ca84aef624ed971c0e529ffa7

View file

@ -9,9 +9,10 @@ mpd_music_dir = ~/Music
mpd_crossfade_time = 2 mpd_crossfade_time = 2
##### visualizer ##### ##### visualizer #####
visualizer_data_source = /tmp/mpd.fifo visualizer_fifo_path = /tmp/mpd.fifo
visualizer_output_name = Visualizer visualizer_output_name = Visualizer
visualizer_in_stereo = yes visualizer_in_stereo = yes
visualizer_sync_interval = 30
# spectrum,wave,wave_filled,ellipse. # spectrum,wave,wave_filled,ellipse.
visualizer_type = wave_filled visualizer_type = wave_filled
visualizer_look = ●▮ visualizer_look = ●▮

View file

@ -33,16 +33,11 @@ export DOTREPO="$HOME/git/dotfiles"
# nvim ftw! # nvim ftw!
export EDITOR=nvim export EDITOR=nvim
export PAGER="nvimpager -p" export PAGER="nvimpager -p"
export AUR_PAGER=$PAGER
# Use GPG for SSH authentication # use gpg for ssh
export GPG_TTY="$(tty)" export GPG_TTY="$(tty)"
export SSH_AUTH_SOCK="/run/user/$UID/gnupg/S.gpg-agent.ssh"
# set SSH_AUTH_SOCK if not logging in over SSH gpg-connect-agent updatestartuptty /bye > /dev/null
if [ "$SSH_CONNECTION" != "" ]; then
export SSH_AUTH_SOCK=$(gpgconf --list-dirs agent-ssh-socket)
gpgconf --launch gpg-agent
fi
# tehfuk # tehfuk
eval $(thefuck --alias) eval $(thefuck --alias)

View file

@ -128,24 +128,23 @@ passync() { pass git pull && pass git push && updatesecrets }
update() { update() {
all() { all() {
paru
plugins plugins
{%@@ if profile == "Moria" @@%} {%@@ if profile == "Moria" @@%}
repo base --devel
docker-update docker-update
docker system prune --volumes docker system prune --volumes
{%@@ elif profile == "Mirkwood" @@%}
base --devel firefox-nightly
{%@@ else @@%}
base --devel
{%@@ endif @@%} {%@@ endif @@%}
sudo flatpak update flatpak update
sudo awman-update sudo awman-update
} }
repo() { base() {
aur sync -Su --margs --noconfirm paru -Pw
firefox paru -Syu $@
}
firefox() {
aur sync -S --rebuild firefox-nightly --margs --noconfirm
} }
plugins() { plugins() {
@ -172,20 +171,17 @@ update() {
all) all)
all all
;; ;;
base)
base
;;
plugins) plugins)
plugins plugins
;; ;;
docker) docker)
docker-update docker-update
;; ;;
repo)
repo
;;
firefox)
firefox
;;
*) *)
paru base $@
;; ;;
esac esac
} }
@ -208,8 +204,6 @@ alias notify-send='notify-send --icon=alarm'
# download archiso # download archiso
alias archiso='curl "http://mirror.rackspace.com/archlinux/iso/$(date +%Y.%m).01/archlinux-$(date +%Y.%m).01-x86_64.iso"' alias archiso='curl "http://mirror.rackspace.com/archlinux/iso/$(date +%Y.%m).01/archlinux-$(date +%Y.%m).01-x86_64.iso"'
# Update repository
# encrypted tar's with zstd compression # encrypted tar's with zstd compression
cgpgtar() { tar cf - --zstd $1 | gpg -e -z 0 > $1.tar.zst.gpg } cgpgtar() { tar cf - --zstd $1 | gpg -e -z 0 > $1.tar.zst.gpg }
@ -286,3 +280,4 @@ btw, () {
▟███▀▘ ▝▀███▙ ▟███▀▘ ▝▀███▙
▟▛▀ ▀▜▙" ▟▛▀ ▀▜▙"
} }

View file

@ -23,18 +23,18 @@ host moria
port 221 port 221
User balrog User balrog
ForwardAgent yes ForwardAgent yes
RemoteForward /run/user/1000/gnupg/S.gpg-agent /run/user/1000/gnupg/S.gpg-agent.extra
host gondor host gondor
hostname gondor.korhonen.cc hostname gondor.korhonen.cc
port 22 port 22
User reekymarko User reekymarko
RemoteForward /run/user/1000/gnupg/S.gpg-agent /run/user/1000/gnupg/S.gpg-agent.extra ForwardAgent yes
host anitta host anitta
HostName 10.200.200.4 HostName 10.200.200.4
port 22 port 22
user reekymarko user reekymarko
ForwardAgent yes
host takamaki host takamaki
HostName 10.200.200.5 HostName 10.200.200.5

View file

@ -8,18 +8,6 @@ SigLevel = Required DatabaseOptional
Architecture = auto Architecture = auto
LocalFileSigLevel = Optional LocalFileSigLevel = Optional
CacheDir = /var/cache/pacman/pkg CacheDir = /var/cache/pacman/pkg
{%@@ if profile == "Moria" @@%}
CleanMethod=KeepCurrent
CacheDir=/docker/index.korhonen.cc/repo/arch_linux/korhonen_aur/x86_64
{%@@ endif @@%}
[korhonen_aur]
{%@@ if profile == "Moria" @@%}
Server = file:///docker/index.korhonen.cc/repo/arch_linux/$repo/$arch
{%@@ else @@%}
Include = /etc/pacman.d/pacserve
Server = https://index.korhonen.cc/repo/arch_linux/$repo/$arch
{%@@ endif @@%}
[core] [core]
Include = /etc/pacman.d/pacserve Include = /etc/pacman.d/pacserve