Switch to swapfile on Mirkwood

This reverts commit e4e6e32b71.

.husky/pre-commit

@@ -1,50 +0,0 @@
-#!/bin/sh
-
-# Source husky
-# shellcheck disable=SC1091
-. "$(dirname -- "$0")/_/husky.sh"
-
-echo "FunctionalHacker's dotfile pre-commit hook start"
-printf "Using shell: %s \n" "$(readlink /proc/$$/exe)"
-
-# All staged files
-staged_files=$(git diff --name-only --cached --diff-filter=d)
-
-# Run taplo on staged TOML files
-staged_toml=$(echo "$staged_files" | grep '.toml$' || true)
-num_staged_toml=$(echo "$staged_toml" | grep -vce '^$' || true)
-if [ "$num_staged_toml" -gt 0 ]; then
-  printf '\nFormatting %s staged TOML files with taplo\n' "$num_staged_toml"
-  taplo format "$staged_toml"
-  printf "Re-staging\n"
-  git add $staged_toml
-fi
-
-# Run lua-format on staged Lua files
-staged_lua=$(echo "$staged_files" | grep '.lua$' || true)
-num_staged_lua=$(echo "$staged_lua" | grep -vce '^$' || true)
-if [ "$num_staged_lua" -gt 0 ]; then
-  printf '\nFormatting %s staged Lua files with stylua\n' "$num_staged_lua"
-
-  for file in $staged_lua; do
-    stylua "$file"
-  done
-
-  printf "Re-staging\n\n"
-  git add $staged_lua
-fi
-
-# Run shfmt on staged shell scripts
-staged_sh=$(echo "$staged_files" | grep -E '(.sh$|pre-commit)' || true)
-num_staged_sh=$(echo "$staged_sh" | grep -vce '^$' || true)
-if [ "$num_staged_sh" -gt 0 ]; then
-  printf '\nFormatting %s staged shell scripts with shfmt\n' "$num_staged_sh"
-  shfmt -w $staged_sh
-  printf "Re-staging\n\n"
-  git add $staged_sh
-fi
-
-# Run prettier on all other staged files
-# that are supported
-printf "\nRunning prettier on all supported files\n"
-npx pretty-quick --staged

.ignore

@@ -1 +0,0 @@
-dotdrop/

.prettierignore

@@ -1,3 +0,0 @@
-package-lock.json
-lazy-lock.json
-dotdrop/

.prettierrc.toml

@@ -1,4 +0,0 @@
-"$schema" = "https://json.schemastore.org/prettierrc.json"
-trailingComma = "es5"
-singleQuote = true
-tabWidth = 2

README.adoc

@@ -1,13 +1,6 @@
 = FunctionalHacker's dotfiles
 
-image:https://i.imgur.com/lz1Q4Zz.png?raw=true%22[screenshot of my
-setup]
-
-My personal dotfiles for my workstations, mostly for easy access for
-myself but feel free to steal them for yourself!
-
-I’m using https://github.com/deadc0de6/dotdrop[dotdrop] to manage and
-ease deployment of my dotfiles.
+My personal dotfiles for my workstations using Nix and NixOS.
 
 == Mirrors
 

config-root.toml

@@ -1,282 +0,0 @@
-[actions]
-mkinitcpio = "mkinitcpio -P"
-
-[config]
-backup = true
-banner = true
-create = true
-dotpath = "root"
-ignoreempty = false
-keepdot = true
-link_dotfile_default = "nolink"
-link_on_import = "nolink"
-longkey = false
-showdiff = false
-workdir = "~/.config/sdotdrop"
-
-[dotfiles."f_60-uinput-permissions.rules"]
-dst = "/etc/udev/rules.d/60-uinput-permissions.rules"
-src = "etc/udev/rules.d/60-uinput-permissions.rules"
-
-[dotfiles."f_yubikey_udev.rules"]
-dst = "/etc/udev/rules.d/20-yubikey.rules"
-src = "etc/udev/rules.d/20-yubikey.rules"
-
-[dotfiles.d_bin]
-dst = "/usr/local/bin"
-src = "usr/local/bin"
-
-[dotfiles.d_network]
-src = "etc/systemd/network"
-dst = "/etc/systemd/network"
-
-[dotfiles."f_networkd.conf"]
-src = "etc/systemd/networkd.conf"
-dst = "/etc/systemd/networkd.conf"
-
-[dotfiles."f_99-sysctl.conf"]
-dst = "/etc/sysctl.d/99-sysctl.conf"
-src = "etc/sysctl.d/99-sysctl.conf"
-
-[dotfiles."f_adb.service"]
-dst = "/etc/systemd/system/adb.service"
-src = "etc/systemd/system/adb.service"
-
-[dotfiles."f_clamd.conf"]
-dst = "/etc/clamav/clamd.conf"
-src = "etc/clamav/clamd.conf"
-
-[dotfiles.f_cryptissue]
-dst = "/etc/cryptissue"
-src = "etc/cryptissue"
-
-[dotfiles."f_detected.sh"]
-dst = "/etc/clamav/detected.sh"
-src = "etc/clamav/detected.sh"
-
-[dotfiles."f_freetype2.sh"]
-dst = "/etc/profile.d/freetype2.sh"
-src = "etc/profile.d/freetype2.sh"
-
-[dotfiles."f_fonts.conf"]
-dst = "/etc/fonts/local.conf"
-src = "etc/fonts/local.conf"
-
-[dotfiles."f_locale.conf"]
-dst = "/etc/locale.conf"
-src = "etc/locale.conf"
-
-[dotfiles."f_locale.gen"]
-dst = "/etc/locale.gen"
-src = "etc/locale.gen"
-
-[dotfiles."f_logind.conf"]
-dst = "/etc/systemd/logind.conf"
-src = "etc/systemd/logind.conf"
-
-[dotfiles."f_bluetooth.conf"]
-dst = "/etc/bluetooth/main.conf"
-src = "etc/bluetooth/main.conf"
-
-[dotfiles."f_pacman.conf"]
-dst = "/etc/pacman.conf"
-src = "etc/pacman.conf"
-
-[dotfiles.f_pacman_zsh_hook]
-dst = "/etc/pacman.d/hooks/zsh.hook"
-src = "etc/pacman.d/hooks/zsh.hook"
-
-[dotfiles."f_plymouthd.conf"]
-src = "etc/plymouth/plymouthd.conf"
-dst = "/etc/plymouth/plymouthd.conf"
-
-[dotfiles.f_sshd_config]
-dst = "/etc/ssh/sshd_config"
-src = "etc/ssh/sshd_config"
-
-[dotfiles."f_welcomemessage.conf"]
-dst = "/etc/welcomemessage.conf"
-src = "etc/welcomemessage.conf"
-
-[dotfiles."f_99-conbee-usb-serial.rules"]
-src = "etc/udev/rules.d/99-conbee-usb-serial.rules"
-dst = "/etc/udev/rules.d/99-conbee-usb-serial.rules"
-
-[dotfiles."f_99-lowbat.rules"]
-src = "etc/udev/rules.d/99-lowbat.rules"
-dst = "/etc/udev/rules.d/99-lowbat.rules"
-
-[dotfiles."f_sleep.conf"]
-src = "etc/systemd/sleep.conf"
-dst = "/etc/systemd/sleep.conf"
-
-[dotfiles.f_fstab]
-src = "etc/fstab"
-dst = "/etc/fstab"
-
-[dotfiles.f_ignore]
-src = ".ignore"
-dst = "/.ignore"
-
-[dotfiles."f_mkinitcpio.conf"]
-src = "etc/mkinitcpio.conf"
-dst = "/etc/mkinitcpio.conf"
-actions = ["mkinitcpio"]
-
-[dotfiles."f_vconsole.conf"]
-src = "etc/vconsole.conf"
-dst = "/etc/vconsole.conf"
-
-[dotfiles."f_20-quiet-printk.conf"]
-src = "etc/sysctl.d/20-quiet-printk.conf"
-dst = "/etc/sysctl.d/20-quiet-printk.conf"
-
-[dotfiles."f_system.conf"]
-src = "etc/systemd/system.conf"
-dst = "/etc/systemd/system.conf"
-
-[dotfiles.f_cpupower]
-src = "etc/default/cpupower"
-dst = "/etc/default/cpupower"
-
-[dotfiles."f_pacserve.service.conf"]
-src = "etc/pacserve/pacserve.service.conf"
-dst = "/etc/pacserve/pacserve.service.conf"
-
-[dotfiles."f_mkinitcpio_linux.preset"]
-src = "etc/mkinitcpio.d/linux.preset"
-dst = "/etc/mkinitcpio.d/linux.preset"
-
-[dotfiles.f_cmdline]
-src = "etc/kernel/cmdline"
-dst = "/etc/kernel/cmdline"
-actions = ["mkinitcpio"]
-
-[dotfiles."f_timesyncd.conf"]
-src = "etc/systemd/timesyncd.conf"
-dst = "/etc/systemd/timesyncd.conf"
-
-[dotfiles.f_sudoers_pacman]
-src = "etc/sudoers.d/pacman"
-dst = "/etc/sudoers.d/pacman"
-
-[dotfiles."f_doas.conf"]
-src = "etc/doas.conf"
-dst = "/etc/doas.conf"
-
-[dotfiles."f_flexo.toml"]
-src = "etc/flexo/flexo.toml"
-dst = "/etc/flexo/flexo.toml"
-
-[profiles.locale]
-dotfiles = ["f_locale.conf", "f_locale.gen"]
-
-[profiles.pacman]
-dotfiles = [
-  "f_pacman.conf",
-  "f_pacman_zsh_hook",
-  "f_pacserve.service.conf",
-  "f_sudoers_pacman",
-]
-
-[profiles.Mirkwood]
-dotfiles = [
-  "d_bin",
-  "f_20-quiet-printk.conf",
-  "f_60-uinput-permissions.rules",
-  "f_99-lowbat.rules",
-  "f_adb.service",
-  "f_bluetooth.conf",
-  "f_cmdline",
-  "f_cpupower",
-  "f_cryptissue",
-  "f_doas.conf",
-  "f_fonts.conf",
-  "f_freetype2.sh",
-  "f_ignore",
-  "f_logind.conf",
-  "f_mkinitcpio.conf",
-  "f_mkinitcpio_linux.preset",
-  "f_plymouthd.conf",
-  "f_sshd_config",
-  "f_system.conf",
-  "f_timesyncd.conf",
-  "f_welcomemessage.conf",
-  "f_flexo.toml",
-]
-include = ["locale", "pacman"]
-
-[profiles.VentoyArch]
-dotfiles = [
-  "d_bin",
-  "f_cmdline",
-  "f_doas.conf",
-  "f_fonts.conf",
-  "f_freetype2.sh",
-  "f_ignore",
-  "f_logind.conf",
-  "f_mkinitcpio.conf",
-  "f_mkinitcpio_linux.preset",
-  "f_plymouthd.conf",
-  "f_system.conf",
-  "f_timesyncd.conf",
-]
-include = ["locale", "pacman"]
-
-[profiles.Shire]
-dotfiles = [
-  "d_bin",
-  "f_20-quiet-printk.conf",
-  "f_60-uinput-permissions.rules",
-  "f_99-lowbat.rules",
-  "f_adb.service",
-  "f_bluetooth.conf",
-  "f_cmdline",
-  "f_cpupower",
-  "f_doas.conf",
-  "f_fonts.conf",
-  "f_freetype2.sh",
-  "f_ignore",
-  "f_logind.conf",
-  "f_mkinitcpio.conf",
-  "f_mkinitcpio_linux.preset",
-  "f_plymouthd.conf",
-  "f_sshd_config",
-  "f_system.conf",
-]
-include = ["locale", "pacman"]
-
-[profiles.Moria]
-include = ["locale", "pacman"]
-dotfiles = [
-  "f_99-sysctl.conf",
-  "f_cmdline",
-  "f_cpupower",
-  "f_doas.conf",
-  "f_adb.service",
-  "f_mkinitcpio.conf",
-  "f_mkinitcpio_linux.preset",
-  "f_plymouthd.conf",
-  "f_sshd_config",
-  "f_flexo.toml",
-]
-
-[profiles.Tirion]
-dotfiles = ["f_doas.conf", "f_ignore", "f_sshd_config"]
-
-[profiles.Gondor]
-include = ["locale", "pacman"]
-dotfiles = ["f_doas.conf", "f_sshd_config"]
-
-[profiles.localhost]
-include = ["locale"]
-
-[profiles.Edoras]
-include = ["pacman"]
-
-[profiles.mko-laptop]
-dotfiles = ["f_cpupower", "f_doas.conf", "f_timesyncd.conf"]
-
-[profiles.Evendim]
-include = ["locale", "pacman"]
-dotfiles = ["f_doas.conf", "f_sshd_config"]

config.toml

@@ -1,285 +0,0 @@
-#:schema ../../dotdrop-config-schema.json
-
-[actions]
-dconf-load = "dconf load / < ~/.config/dconf.ini"
-kanagawa-compile = "vim +KanagawaCompile +qa"
-
-[config]
-backup = true
-banner = true
-create = true
-dotpath = "home"
-ignoreempty = false
-keepdot = true
-link_dotfile_default = "nolink"
-link_on_import = "nolink"
-longkey = false
-showdiff = false
-workdir = "~/.config/dotdrop"
-
-[dotfiles.d_systemd]
-dst = "~/.config/systemd/user"
-src = ".config/systemd/user"
-
-[dotfiles.d_mpv]
-dst = "~/.config/mpv"
-src = ".config/mpv"
-
-[dotfiles.d_nvim]
-dst = "~/.config/nvim"
-src = ".config/nvim"
-actions = ["kanagawa-compile"]
-instignore = ["*-lock.json"]
-
-[dotfiles."f_abcde.conf"]
-dst = "~/.abcde.conf"
-src = ".abcde.conf"
-
-[dotfiles.d_ssh]
-dst = "~/.ssh"
-src = ".ssh"
-
-[dotfiles.f_beets_config]
-dst = "~/.config/beets/config.yaml"
-src = ".config/beets/config.yaml"
-
-[dotfiles.f_beets_whitelist]
-dst = "~/.config/beets/whitelist"
-src = ".config/beets/whitelist"
-
-[dotfiles.f_gitconfig]
-dst = "~/.config/git/config"
-src = ".config/git/config"
-
-[dotfiles.f_librewolf_overrides]
-dst = "~/.librewolf/librewolf.overrides.cfg"
-src = ".librewolf/librewolf.overrides.cfg"
-
-[dotfiles."f_makepkg.conf"]
-dst = "~/.config/pacman/makepkg.conf"
-src = ".config/pacman/makepkg.conf"
-
-[dotfiles."f_mpd.conf"]
-dst = "~/.config/mpd/mpd.conf"
-src = ".config/mpd/mpd.conf"
-
-[dotfiles."f_mpdris2.conf"]
-dst = "~/.config/mpDris2/mpDris2.conf"
-src = ".config/mpDris2/mpDris2.conf"
-
-[dotfiles.f_ncmpcpp_bindings]
-dst = "~/.config/ncmpcpp/bindings"
-src = ".config/ncmpcpp/bindings"
-
-[dotfiles."f_ranger.conf"]
-dst = "~/.config/ranger/rc.conf"
-src = ".config/ranger/rc.conf"
-
-[dotfiles."f_ranger_commands.py"]
-dst = "~/.config/ranger/commands.py"
-src = ".config/ranger/commands.py"
-
-[dotfiles."f_ssh.conf"]
-dst = "~/.ssh/config"
-src = ".ssh/config"
-
-[dotfiles.f_zprofile]
-dst = "~/.zprofile"
-src = ".zprofile"
-
-[dotfiles.f_zshrc]
-dst = "~/.zshrc"
-src = ".zshrc"
-
-[dotfiles.d_zsh]
-src = ".config/zsh"
-dst = "~/.config/zsh"
-
-[dotfiles."f_fonts.conf"]
-src = ".config/fontconfig/fonts.conf"
-dst = "~/.config/fontconfig/fonts.conf"
-
-[dotfiles.f_ignore]
-src = ".ignore"
-dst = "~/.ignore"
-
-[dotfiles."f_ncmpcpp.conf"]
-src = ".config/ncmpcpp/config"
-dst = "~/.config/ncmpcpp/config"
-
-[dotfiles.f_hushlogin]
-src = ".hushlogin"
-dst = "~/.hushlogin"
-
-[dotfiles."f_paru.conf"]
-src = ".config/paru/paru.conf"
-dst = "~/.config/paru/paru.conf"
-
-[dotfiles."f_foot.ini"]
-src = ".config/foot/foot.ini"
-dst = "~/.config/foot/foot.ini"
-
-[dotfiles."f_gpg-agent.conf"]
-src = ".gnupg/gpg-agent.conf"
-dst = "~/.gnupg/gpg-agent.conf"
-chmod = "600"
-
-[dotfiles."f_gpg.conf"]
-src = ".gnupg/gpg.conf"
-dst = "~/.gnupg/gpg.conf"
-
-[dotfiles."f_gpg_scdaemon.conf"]
-src = ".gnupg/scdaemon.conf"
-dst = "~/.gnupg/scdaemon.conf"
-
-[dotfiles."f_electron-flags.conf"]
-src = ".config/electron-flags.conf"
-dst = "~/.config/electron-flags.conf"
-
-[dotfiles."f_electron12-flags.conf"]
-src = ".config/electron12-flags.conf"
-dst = "~/.config/electron12-flags.conf"
-
-[dotfiles.f_pam_environment]
-src = ".pam_environment"
-dst = "~/.pam_environment"
-
-[dotfiles."f_dconf.ini"]
-src = ".config/dconf.ini"
-dst = "~/.config/dconf.ini"
-actions = ["dconf-load"]
-
-[dotfiles."f_docker-config.json"]
-src = ".docker/config.json"
-dst = "~/.docker/config.json"
-chmod = "600"
-
-[dotfiles.f_npmrc]
-src = ".npmrc"
-dst = "~/.npmrc"
-chmod = "600"
-
-[dotfiles.f_zellij]
-src = ".config/zellij/config.kdl"
-dst = "~/.config/zellij/config.kdl"
-
-[profiles.pacman]
-dotfiles = ["f_makepkg.conf", "f_paru.conf"]
-
-[profiles.terminal]
-dotfiles = [
-  "d_nvim",
-  "d_ssh",
-  "d_zsh",
-  "f_gitconfig",
-  "f_hushlogin",
-  "f_ignore",
-  "f_ranger.conf",
-  "f_ranger_commands.py",
-  "f_zellij",
-  "f_zshrc",
-  "f_npmrc",
-]
-
-[profiles.media]
-dotfiles = [
-  "d_mpv",
-  "f_abcde.conf",
-  "f_beets_config",
-  "f_beets_whitelist",
-  "f_mpd.conf",
-  "f_mpdris2.conf",
-  "f_ncmpcpp.conf",
-  "f_ncmpcpp_bindings",
-]
-
-[profiles.gpg]
-dotfiles = [
-  "f_gpg-agent.conf",
-  "f_gpg.conf",
-  "f_gpg_scdaemon.conf",
-  "f_pam_environment",
-]
-
-[profiles.Mirkwood]
-include = ["pacman", "terminal", "media", "gpg"]
-dotfiles = [
-  "f_librewolf_overrides",
-  "f_dconf.ini",
-  "f_docker-config.json",
-  "f_fonts.conf",
-  "f_foot.ini",
-]
-
-[profiles.Mirkwood.variables]
-wayland = true
-
-[profiles.VentoyArch]
-include = ["pacman", "terminal", "media", "gpg"]
-dotfiles = [
-  "f_dconf.ini",
-  "f_fonts.conf",
-]
-
-[profiles.VentoyArch.variables]
-wayland = true
-
-[profiles.Shire]
-include = ["pacman", "terminal", "media", "gpg"]
-dotfiles = [
-  "f_dconf.ini",
-  "f_fonts.conf",
-]
-
-[profiles.Shire.variables]
-wayland = true
-
-[profiles.Moria]
-include = ["pacman", "terminal", "media", "gpg"]
-dotfiles = [
-  "f_librewolf_overrides",
-  "f_dconf.ini",
-  "f_zprofile",
-  "f_fonts.conf",
-  "d_systemd",
-]
-
-[profiles.Moria.variables]
-wayland = true
-
-[profiles.Tirion]
-include = ["terminal", "gpg"]
-
-[profiles.Gondor]
-include = ["pacman", "terminal"]
-
-[profiles.mko-laptop]
-include = ["terminal", "gpg"]
-dotfiles = ["f_librewolf_overrides", "f_dconf.ini", "d_systemd"]
-
-[profiles.mko-laptop.variables]
-wayland = true
-
-[profiles.Isengard]
-include = ["terminal"]
-
-[profiles.Isengard.variables]
-distro_id = "termux"
-
-[profiles.Edoras]
-include = ["terminal"]
-
-[profiles.TakamakiPC]
-include = ["terminal"]
-
-[profiles.TakamakiPC.variables]
-wayland = false
-
-[profiles.localhost]
-include = ["terminal"]
-
-[profiles.ViiruJaTeippi]
-include = ["terminal"]
-
-[profiles.Evendim]
-include = ["terminal", "pacman"]

docker/.gitignore

@@ -1 +1,2 @@
 */.env
+*/DISABLED

docker/authentik/docker-compose.toml

@@ -0,0 +1,78 @@
+[volumes]
+redis = {}
+media = {}
+custom_templates = {}
+geoip = {}
+backups = {}
+
+[services.redis]
+image = "redis:alpine"
+container_name = "authentik-redis"
+networks = ["authentik"]
+restart = "unless-stopped"
+volumes = ["redis:/data"]
+
+[services.redis.healthcheck]
+test = ["CMD-SHELL", "redis-cli ping | grep PONG"]
+start_period = "20s"
+interval = "30s"
+retries = 5
+timeout = "3s"
+
+[services.server]
+image = "ghcr.io/goauthentik/server"
+container_name = "authentik"
+restart = "unless-stopped"
+command = "server"
+volumes = [
+  "media:/media",
+  "custom_templates:/templates",
+  "geoip:/geoip",
+]
+env_file = [".env"]
+networks = ["authentik", "postgres", "proxy"]
+
+[services.worker]
+image = "ghcr.io/goauthentik/server"
+container_name = "authentik-worker"
+restart = "unless-stopped"
+command = "worker"
+user = "root"
+volumes = [
+  "backups:/backups",
+  "custom_templates:/templates",
+  "geoip:/geoip",
+  "media:/media",
+  "/var/run/docker.sock:/var/run/docker.sock",
+]
+env_file = [".env"]
+networks = ["authentik", "postgres"]
+
+[services.geoipupdate]
+image = "maxmindinc/geoipupdate"
+container_name = "authentik-geoipupdate"
+restart = "unless-stopped"
+networks = ["authentik"]
+volumes = ["geoip:/usr/share/GeoIP"]
+env_file = [".env"]
+
+[services.geoipupdate.environment]
+GEOIPUPDATE_EDITION_IDS = "GeoLite2-City"
+GEOIPUPDATE_FREQUENCY = "8"
+
+[services.whoami-test]
+image = "traefik/whoami"
+container_name = "whoami-test"
+restart = "unless-stopped"
+security_opt = ["no-new-privileges:true"]
+networks = ["proxy"]
+environment = ["TZ"]
+
+[networks.authentik]
+external = true
+
+[networks.postgres]
+external = true
+
+[networks.proxy]
+external = true

docker/authentik/docker-compose.yaml

@@ -1,75 +0,0 @@
-volumes:
-  redis: {}
-  media: {}
-  custom_templates: {}
-  geoip: {}
-  backups: {}
-services:
-  redis:
-    image: redis:alpine
-    container_name: authentik-redis
-    networks:
-      - authentik
-    restart: unless-stopped
-    volumes:
-      - redis:/data
-    healthcheck:
-      test:
-        - CMD-SHELL
-        - redis-cli ping | grep PONG
-      start_period: 20s
-      interval: 30s
-      retries: 5
-      timeout: 3s
-  server:
-    image: ghcr.io/goauthentik/server
-    container_name: authentik
-    restart: unless-stopped
-    command: server
-    volumes:
-      - media:/media
-      - custom_templates:/templates
-      - geoip:/geoip
-    env_file:
-      - .env
-    networks:
-      - authentik
-      - postgres
-      - proxy
-  worker:
-    image: ghcr.io/goauthentik/server
-    container_name: authentik-worker
-    restart: unless-stopped
-    command: worker
-    user: root
-    volumes:
-      - backups:/backups
-      - custom_templates:/templates
-      - geoip:/geoip
-      - media:/media
-      - /var/run/docker.sock:/var/run/docker.sock
-    env_file:
-      - .env
-    networks:
-      - authentik
-      - postgres
-  geoipupdate:
-    image: maxmindinc/geoipupdate
-    container_name: authentik-geoipupdate
-    restart: unless-stopped
-    networks:
-      - authentik
-    volumes:
-      - geoip:/usr/share/GeoIP
-    env_file:
-      - .env
-    environment:
-      GEOIPUPDATE_EDITION_IDS: GeoLite2-City
-      GEOIPUPDATE_FREQUENCY: '8'
-networks:
-  authentik:
-    external: true
-  postgres:
-    external: true
-  proxy:
-    external: true

docker/backup/docker-compose.toml

@@ -0,0 +1,37 @@
+[volumes.caddy_data]
+external = true
+
+[volumes.caddy_config]
+external = true
+
+[volumes.caddy_wkd]
+external = true
+
+[volumes.homeautomation_hass]
+external = true
+
+[services.backup]
+image = "offen/docker-volume-backup:v2"
+container_name = "volume-backup"
+restart = "unless-stopped"
+environment = [
+  "AWS_ENDPOINT",
+  "AWS_S3_BUCKET_NAME",
+  "AWS_ACCESS_KEY_ID",
+  "AWS_SECRET_ACCESS_KEY",
+  "GPG_PASSPHRASE",
+  "EMAIL_SMTP_HOST",
+  "EMAIL_SMTP_PASSWORD",
+  "EMAIL_SMTP_USERNAME",
+  "EMAIL_SMTP_PORT",
+  "BACKUP_COMPRESSION=zst",
+  "BACKUP_RETENTION_DAYS=7",
+]
+volumes = [
+  "/var/run/docker.sock:/var/run/docker.sock:ro",
+  "/etc/localtime:/etc/localtime:ro",
+  "caddy_data:/backup/caddy_data:ro",
+  "caddy_config:/backup/caddy_config:ro",
+  "caddy_wkd:/backup/caddy_wkd:ro",
+  "homeautomation_hass:/backup/homeautomation_hass:ro",
+]

docker/backup/docker-compose.yaml

@@ -1,33 +0,0 @@
-volumes:
-  caddy_data:
-    external: true
-  caddy_config:
-    external: true
-  caddy_wkd:
-    external: true
-  homeautomation_hass:
-    external: true
-services:
-  backup:
-    image: offen/docker-volume-backup:v2
-    container_name: volume-backup
-    restart: unless-stopped
-    environment:
-      - AWS_ENDPOINT
-      - AWS_S3_BUCKET_NAME
-      - AWS_ACCESS_KEY_ID
-      - AWS_SECRET_ACCESS_KEY
-      - GPG_PASSPHRASE
-      - EMAIL_SMTP_HOST
-      - EMAIL_SMTP_PASSWORD
-      - EMAIL_SMTP_USERNAME
-      - EMAIL_SMTP_PORT
-      - BACKUP_COMPRESSION=zst
-      - BACKUP_RETENTION_DAYS=7
-    volumes:
-      - /var/run/docker.sock:/var/run/docker.sock:ro
-      - /etc/localtime:/etc/localtime:ro
-      - caddy_data:/backup/caddy_data:ro
-      - caddy_config:/backup/caddy_config:ro
-      - caddy_wkd:/backup/caddy_wkd:ro
-      - homeautomation_hass:/backup/homeautomation_hass:ro

docker/caddy/Caddyfile

@@ -2,17 +2,21 @@
 	order umami first
 }
 
-korhonen.cc, *.korhonen.cc {
+(common_site_settings) {
 	encode zstd gzip
 
 	tls {
-		dns cloudflare {$CF_API_TOKEN}
+		dns cloudflare {$CLOUDFLARE_API_TOKEN}
 		resolvers 1.1.1.1
 	}
 
 	header {
 		Strict-Transport-Security "max-age=63072000; includeSubDomains; preload"
 	}
+}
+
+korhonen.cc, *.korhonen.cc {
+	import common_site_settings
 
 	@static {
 		file
@@ -73,7 +77,7 @@ korhonen.cc, *.korhonen.cc {
 
 	@forgejo host git.korhonen.cc
 	handle @forgejo {
-		rewrite /user/login /user/oauth2/Korhonen%20SSO
+		rewrite /user/login /user/oauth2/authentik
 		reverse_proxy forgejo:3000
 	}
 
@@ -82,7 +86,7 @@ korhonen.cc, *.korhonen.cc {
 		reverse_proxy woodpecker:8000
 	}
 
-	@searx host dsearch.korhonen.cc
+	@searx host search.korhonen.cc
 	handle @searx {
 		reverse_proxy searx:8080
 	}
@@ -142,11 +146,21 @@ korhonen.cc, *.korhonen.cc {
 		file_server
 	}
 
+	@tvheadend host tvheadend.korhonen.cc
+	handle @tvheadend {
+		reverse_proxy tvheadend:9981
+	}
+
 	@collabora host collabora.korhonen.cc
 	handle @collabora {
 		reverse_proxy collabora:9980
 	}
 
+	@grafana host grafana.korhonen.cc
+	handle @grafana {
+		reverse_proxy grafana:3000
+	}
+
 	@drop host drop.korhonen.cc
 	handle @drop {
 		reverse_proxy drop:3000
@@ -157,6 +171,11 @@ korhonen.cc, *.korhonen.cc {
 		respond {remote_host}
 	}
 
+	@ott host ott.korhonen.cc
+	handle @ott {
+		reverse_proxy opentogethertube:8080
+	}
+
 	handle {
 		respond "404 Not Found" 404
 	}
@@ -175,3 +194,25 @@ korhonen.cc, *.korhonen.cc {
 		respond "{err.status_code} {err.status_text}"
 	}
 }
+
+korhonen.social, *.korhonen.social {
+	import common_site_settings
+
+	@firefish-www-redir host www.korhonen.social
+	handle @firefish-www-redir {
+		redir https://korhonen.social
+	}
+
+	@firefish host korhonen.social
+	handle @firefish {
+		reverse_proxy firefish:3000
+	}
+
+	handle {
+		respond "404 Not Found" 404
+	}
+
+	handle_errors {
+		respond "{err.status_code} {err.status_text}"
+	}
+}

docker/caddy/docker-compose.toml

@@ -0,0 +1,29 @@
+[volumes]
+data = {}
+config = {}
+wkd = {}
+korhonen_cc = {}
+
+[volumes.nextcloud_config]
+external = true
+
+[services.caddy]
+image = "git.korhonen.cc/functionalhacker/caddy"
+container_name = "caddy"
+restart = "unless-stopped"
+ports = ["80:80", "443:443/tcp", "443:443/udp"]
+networks = ["proxy"]
+volumes = [
+  "./Caddyfile:/etc/caddy/Caddyfile",
+  "data:/data",
+  "config:/config",
+  "wkd:/var/www/wkd",
+  "korhonen_cc:/var/www/korhonen.cc",
+  "nextcloud_config:/var/www/nextcloud",
+  "/var/www/index.korhonen.cc:/var/www/index.korhonen.cc",
+]
+environment = ["CLOUDFLARE_EMAIL", "CLOUDFLARE_API_TOKEN", "ACME_AGREE=true"]
+cap_add = ["NET_ADMIN"]
+
+[networks.proxy]
+external = true

docker/caddy/docker-compose.yaml

@@ -1,35 +0,0 @@
-volumes:
-  data: {}
-  config: {}
-  wkd: {}
-  korhonen_cc: {}
-  nextcloud_config:
-    external: true
-services:
-  caddy:
-    image: git.korhonen.cc/functionalhacker/caddy
-    container_name: caddy
-    restart: unless-stopped
-    ports:
-      - 80:80
-      - 443:443/tcp
-      - 443:443/udp
-      - 127.0.0.1:2019:2019
-    networks:
-      - proxy
-    volumes:
-      - /etc/localtime:/etc/localtime:ro
-      - ./Caddyfile:/etc/caddy/Caddyfile
-      - data:/data
-      - config:/config
-      - wkd:/var/www/wkd
-      - korhonen_cc:/var/www/korhonen.cc
-      - nextcloud_config:/var/www/nextcloud
-      - /var/www/index.korhonen.cc:/var/www/index.korhonen.cc
-    env_file:
-      - .env
-    cap_add:
-      - NET_ADMIN
-networks:
-  proxy:
-    external: true

docker/cloudflared/docker-compose.yaml

@@ -1,19 +0,0 @@
-services:
-  cloudflared:
-    image: cloudflare/cloudflared
-    container_name: cloudflared
-    restart: unless-stopped
-    networks:
-      - proxy
-    volumes:
-      - /etc/localtime:/etc/localtime:ro
-    entrypoint:
-    command: tunnel --no-autoupdate run
-    env_file:
-      - .env
-    extra_hosts:
-      - 'host.docker.internal:host-gateway'
-
-networks:
-  proxy:
-    external: true

docker/ddns/docker-compose.toml

@@ -0,0 +1,8 @@
+[services.cloudflare-ddns]
+image = "timothyjmiller/cloudflare-ddns"
+container_name = "cloudflare-ddns"
+security_opt = ["no-new-privileges:true"]
+network_mode = "host"
+environment = ["PUID=1000", "PGID=1000"]
+volumes = ["/mnt/Storage/docker/ddns/config.json:/config.json"]
+restart = "unless-stopped"

docker/ddns/docker-compose.yaml

@@ -1,13 +0,0 @@
-services:
-  cloudflare-ddns:
-    image: timothyjmiller/cloudflare-ddns
-    container_name: cloudflare-ddns
-    security_opt:
-      - no-new-privileges:true
-    network_mode: host
-    environment:
-      - PUID=1000
-      - PGID=1000
-    volumes:
-      - /mnt/Storage/docker/ddns/config.json:/config.json
-    restart: unless-stopped

docker/drop/docker-compose.toml

@@ -0,0 +1,9 @@
+[services.drop]
+image = "lscr.io/linuxserver/pairdrop"
+container_name = "drop"
+restart = "unless-stopped"
+networks = ["proxy"]
+environment = ["TZ=Europe/Helsinki", "IPV6_LOCALIZE=4"]
+
+[networks.proxy]
+external = true

docker/drop/docker-compose.yaml

@@ -1,13 +0,0 @@
-services:
-  drop:
-    image: lscr.io/linuxserver/pairdrop
-    container_name: drop
-    restart: unless-stopped
-    networks:
-      - proxy
-      - IPV6_LOCALIZE=4
-    volumes:
-      - /etc/localtime:/etc/localtime:ro
-networks:
-  proxy:
-    external: true

docker/firefish/docker-compose.toml

@@ -0,0 +1,41 @@
+[volumes]
+files = {}
+config = {}
+redis = {}
+db = {}
+
+[services.firefish]
+image = "registry.firefish.dev/firefish/firefish"
+container_name = "firefish"
+restart = "unless-stopped"
+depends_on = ["redis"]
+ports = ["3084:3000"]
+networks = ["firefish", "proxy"]
+environment = { NODE_ENV = "production" }
+volumes = ["files:/firefish/files", "config:/firefish/.config:ro"]
+
+[services.redis]
+image = "redis"
+container_name = "redis-firefish"
+restart = "unless-stopped"
+networks = ["firefish"]
+volumes = ["redis:/data"]
+
+[services.db]
+image = "groonga/pgroonga:3.1.8-alpine-16-slim"
+container_name = "firefish-db"
+restart = "unless-stopped"
+networks = ["firefish"]
+volumes = ["db:/var/lib/postgresql/data"]
+
+[services.db.healthcheck]
+test = "pg_isready --user=\"firefish\" --dbname=\"firefish\""
+interval = "5s"
+timeout = "5s"
+retries = 5
+
+[networks.firefish]
+internal = true
+
+[networks.proxy]
+external = true

docker/firefish/docker-compose.yaml

@@ -1,48 +0,0 @@
-volumes:
-  files: {}
-  config: {}
-  redis: {}
-  db: {}
-services:
-  firefish:
-    image: registry.firefish.dev/firefish/firefish
-    container_name: firefish
-    restart: unless-stopped
-    depends_on:
-      - redis
-    ports:
-      - 3084:3000
-    networks:
-      - firefish
-      - proxy
-    environment:
-      NODE_ENV: production
-    volumes:
-      - files:/firefish/files
-      - config:/firefish/.config:ro
-  redis:
-    image: redis
-    container_name: redis-firefish
-    restart: unless-stopped
-    networks:
-      - firefish
-    volumes:
-      - redis:/data
-  db:
-    image: groonga/pgroonga:3.1.8-alpine-16-slim
-    container_name: firefish-db
-    restart: unless-stopped
-    networks:
-      - firefish
-    volumes:
-      - db:/var/lib/postgresql/data
-    healthcheck:
-      test: pg_isready --user="firefish" --dbname="firefish"
-      interval: 5s
-      timeout: 5s
-      retries: 5
-networks:
-  firefish:
-    internal: true
-  proxy:
-    external: true

docker/forgejo/docker-compose.toml

@@ -0,0 +1,32 @@
+[volumes]
+data = {}
+runner = {}
+
+[services.forgejo]
+image = "git.korhonen.cc/functionalhacker/forgejo-asciidoc"
+container_name = "forgejo"
+environment = ["TZ=Europe/Helsinki", "USER_UID=1000", "USER_GID=1000"]
+restart = "unless-stopped"
+networks = ["postgres", "proxy"]
+ports = ["2882:22"]
+volumes = ["data:/data", "/etc/localtime:/etc/localtime:ro"]
+
+[services.runner]
+image = "code.forgejo.org/forgejo/runner:3.5.0"
+container_name = "forgejo-runner"
+user = "root:root"
+volumes = [
+  "runner:/data",
+  "./runner.yaml:/data/config.yaml",
+  "/var/run/docker.sock:/var/run/docker.sock",
+  "/etc/localtime:/etc/localtime:ro",
+]
+environment = ["SOCKFILE=/var/run/docker.sock"]
+restart = "unless-stopped"
+command = "forgejo-runner daemon -c /data/config.yaml"
+
+[networks.postgres]
+external = true
+
+[networks.proxy]
+external = true

docker/forgejo/docker-compose.yaml

@@ -1,37 +0,0 @@
-volumes:
-  data: {}
-  runner: {}
-services:
-  forgejo:
-    image: git.korhonen.cc/functionalhacker/forgejo-asciidoc
-    container_name: forgejo
-    environment:
-      - USER_UID=1000
-      - USER_GID=1000
-    restart: unless-stopped
-    networks:
-      - postgres
-      - proxy
-    ports:
-      - '2882:22'
-    volumes:
-      - data:/data
-      - /etc/localtime:/etc/localtime:ro
-  runner:
-    image: code.forgejo.org/forgejo/runner:6
-    container_name: forgejo-runner
-    user: root:root
-    volumes:
-      - runner:/data
-      - ./runner.yaml:/data/config.yaml
-      - /var/run/docker.sock:/var/run/docker.sock
-      - /etc/localtime:/etc/localtime:ro
-    environment:
-      - SOCKFILE=/var/run/docker.sock
-    restart: unless-stopped
-    command: forgejo-runner daemon -c /data/config.yaml
-networks:
-  postgres:
-    external: true
-  proxy:
-    external: true

docker/forgejo/runner.yaml

@@ -27,7 +27,7 @@ container:
   workdir_parent:
   valid_volumes:
     - 'caddy_korhonen_cc'
-  docker_host: 'automount'
+  docker_host: ''
   force_pull: false
 
 host:

docker/freshrss/docker-compose.toml

@@ -0,0 +1,19 @@
+[volumes]
+config = {}
+
+[services.freshrss]
+image = "linuxserver/freshrss"
+container_name = "freshrss"
+restart = "unless-stopped"
+networks = ["freshrss", "postgres", "proxy"]
+environment = ["PUID=1000", "PGID=985", "TZ=Europe/Helsinki"]
+volumes = ["config:/config", "/etc/localtime:/etc/localtime:ro"]
+
+[networks.freshrss]
+external = false
+
+[networks.postgres]
+external = true
+
+[networks.proxy]
+external = true

docker/freshrss/docker-compose.yaml

@@ -1,24 +0,0 @@
-volumes:
-  config: {}
-services:
-  freshrss:
-    image: linuxserver/freshrss
-    container_name: freshrss
-    restart: unless-stopped
-    networks:
-      - freshrss
-      - postgres
-      - proxy
-    environment:
-      - PUID=1000
-      - PGID=985
-    volumes:
-      - /etc/localtime:/etc/localtime:ro
-      - config:/config
-networks:
-  freshrss:
-    external: false
-  postgres:
-    external: true
-  proxy:
-    external: true

docker/headscale/docker-compose.toml

@@ -0,0 +1,20 @@
+[volumes]
+config = {}
+data = {}
+
+[services.headscale]
+image = "headscale/headscale:0"
+container_name = "headscale"
+volumes = ["config:/etc/headscale", "data:/var/lib/headscale"]
+ports = ["3478:3478/udp"]
+command = "headscale serve"
+restart = "unless-stopped"
+networks = ["postgres"]
+
+[services.headscale-ui]
+image = "ghcr.io/gurucomputing/headscale-ui"
+container_name = "headscale-ui"
+restart = "unless-stopped"
+
+[networks.postgres]
+external = true

docker/headscale/docker-compose.yaml

@@ -1,23 +0,0 @@
-volumes:
-  config: {}
-  data: {}
-services:
-  headscale:
-    image: headscale/headscale:0
-    container_name: headscale
-    volumes:
-      - config:/etc/headscale
-      - data:/var/lib/headscale
-    ports:
-      - 3478:3478/udp
-    command: headscale serve
-    restart: unless-stopped
-    networks:
-      - postgres
-  headscale-ui:
-    image: ghcr.io/gurucomputing/headscale-ui
-    container_name: headscale-ui
-    restart: unless-stopped
-networks:
-  postgres:
-    external: true

docker/homeautomation/docker-compose.toml

@@ -0,0 +1,111 @@
+[volumes]
+hass = {}
+mosquitto = {}
+piper_english = {}
+whisper_english = {}
+openwakeword_english = {}
+
+[services.home-assistant]
+container_name = "home-assistant"
+image = "homeassistant/home-assistant"
+restart = "unless-stopped"
+environment = ["TZ=Europe/Helsinki"]
+devices = ["/dev/ttyACM0"]
+volumes = ["hass:/config", "/etc/localtime:/etc/localtime:ro"]
+networks = ["homeautomation", "postgres", "proxy"]
+ports = ["8123:8123", "8300:8300"]
+extra_hosts = ["host.docker.internal:host-gateway"]
+
+[services.mosquitto]
+container_name = "mosquitto"
+image = "eclipse-mosquitto"
+restart = "unless-stopped"
+environment = ["TZ=Europe/Helsinki"]
+networks = ["homeautomation"]
+ports = ["1883:1883", "8866:8866"]
+volumes = ["mosquitto:/mosquitto", "/etc/localtime:/etc/localtime:ro"]
+
+[services.piper_english]
+container_name = "piper_english"
+image = "rhasspy/wyoming-piper"
+restart = "unless-stopped"
+environment = ["TZ=Europe/Helsinki"]
+ports = ["10200:10200"]
+networks = ["homeautomation"]
+command = ["--voice", "en_US-hfc_male-medium"]
+volumes = ["piper_english:/data", "/etc/localtime:/etc/localtime:ro"]
+
+[services.whisper_english]
+container_name = "whisper_english"
+image = "rhasspy/wyoming-whisper"
+restart = "unless-stopped"
+environment = ["TZ=Europe/Helsinki"]
+ports = ["10300:10300"]
+networks = ["homeautomation"]
+depends_on = ["home-assistant"]
+command = ["--model", "tiny-int8", "--language", "en"]
+volumes = ["whisper_english:/data", "/etc/localtime:/etc/localtime:ro"]
+
+[services.openwakeword_english]
+container_name = "openwakeword_english"
+image = "rhasspy/wyoming-openwakeword"
+restart = "unless-stopped"
+environment = ["TZ=Europe/Helsinki"]
+networks = ["homeautomation"]
+command = ["--preload-model", "ok_nabu"]
+depends_on = ["home-assistant"]
+volumes = ["openwakeword_english:/data", "/etc/localtime:/etc/localtime:ro"]
+
+[services.microphone]
+build = "https://github.com/rhasspy/wyoming-mic-external.git"
+image = "rhasspy/wyoming-mic-external"
+container_name = "microphone"
+restart = "unless-stopped"
+devices = ["/dev/snd:/dev/snd"]
+ports = ["10600:10600"]
+group_add = ["audio"]
+networks = ["homeautomation"]
+command = ["--device", "plughw:CARD=USB,DEV=0", "--debug"]
+volumes = ["/etc/localtime:/etc/localtime:ro"]
+
+[services.speaker]
+build = "https://github.com/rhasspy/wyoming-snd-external.git"
+image = "rhasspy/wyoming-snd-external"
+container_name = "speaker"
+restart = "unless-stopped"
+devices = ["/dev/snd:/dev/snd"]
+ports = ["10601:10601"]
+group_add = ["audio"]
+networks = ["homeautomation"]
+command = ["--device", "iec958:CARD=USB,DEV=0", "--debug"]
+volumes = ["/etc/localtime:/etc/localtime:ro"]
+
+[services.satellite]
+build = "https://github.com/rhasspy/wyoming-satellite.git"
+image = "rhasspy/wyoming-satellite"
+container_name = "satellite"
+restart = "unless-stopped"
+ports = ["10700:10700"]
+networks = ["homeautomation"]
+depends_on = ["speaker", "microphone", "whisper_english"]
+command = [
+  "--name",
+  "ha-server-satellite",
+  "--mic-uri",
+  "tcp://microphone:10600",
+  "--snd-uri",
+  "tcp://speaker:10601",
+  "--wake-uri",
+  "tcp://openwakeword_english:10400",
+  "--debug",
+]
+volumes = ["/etc/localtime:/etc/localtime:ro"]
+
+[networks.homeautomation]
+external = false
+
+[networks.postgres]
+external = true
+
+[networks.proxy]
+external = true

docker/homeautomation/docker-compose.yaml

@@ -1,80 +0,0 @@
-volumes:
-  hass: {}
-  mosquitto: {}
-  piper_english: {}
-  whisper_english: {}
-  openwakeword_english: {}
-services:
-  home-assistant:
-    container_name: home-assistant
-    image: homeassistant/home-assistant
-    restart: unless-stopped
-    volumes:
-      - /etc/localtime:/etc/localtime:ro
-      - hass:/config
-    networks:
-      - homeautomation
-      - postgres
-      - proxy
-    ports:
-      - 8123:8123
-      - 8300:8300
-    extra_hosts:
-      - host.docker.internal:host-gateway
-  # mosquitto:
-  #   container_name: mosquitto
-  #   image: eclipse-mosquitto
-  #   restart: unless-stopped
-  #   environment:
-  #     - TZ=Europe/Helsinki
-  #   networks:
-  #     - homeautomation
-  #   ports:
-  #     - 1883:1883
-  #     - 8866:8866
-  #   volumes:
-  #     - mosquitto:/mosquitto
-  #     - /etc/localtime:/etc/localtime:ro
-  piper_english:
-    container_name: piper_english
-    image: rhasspy/wyoming-piper
-    restart: unless-stopped
-    environment:
-      - TZ=Europe/Helsinki
-    ports:
-      - 10200:10200
-    networks:
-      - homeautomation
-    command:
-      - --voice
-      - en_US-hfc_male-medium
-    volumes:
-      - piper_english:/data
-      - /etc/localtime:/etc/localtime:ro
-  whisper_english:
-    container_name: whisper_english
-    image: rhasspy/wyoming-whisper
-    restart: unless-stopped
-    environment:
-      - TZ=Europe/Helsinki
-    ports:
-      - 10300:10300
-    networks:
-      - homeautomation
-    depends_on:
-      - home-assistant
-    command:
-      - --model
-      - tiny-int8
-      - --language
-      - en
-    volumes:
-      - whisper_english:/data
-      - /etc/localtime:/etc/localtime:ro
-networks:
-  homeautomation:
-    external: false
-  postgres:
-    external: true
-  proxy:
-    external: true

docker/jellyfin/docker-compose.toml

@@ -0,0 +1,34 @@
+[volumes]
+config = {}
+cache = {}
+
+[volumes.media]
+external = true
+
+[volumes.nextcloud_data]
+external = true
+
+[services.jellyfin]
+image = "jellyfin/jellyfin"
+container_name = "jellyfin"
+environment = ["TZ=Europe/Helsinki"]
+ports = ["8096:8096"]
+networks = ["proxy", "authentik"]
+restart = "unless-stopped"
+volumes = [
+  "config:/config",
+  "cache:/cache",
+  "media:/media",
+  "nextcloud_data:/nextcloud_data",
+  "/etc/localtime:/etc/localtime:ro",
+]
+devices = [
+  "/dev/dri/renderD128:/dev/dri/renderD128",
+  "/dev/dri/card1:/dev/dri/card0",
+]
+
+[networks.proxy]
+external = true
+
+[networks.authentik]
+external = true

docker/jellyfin/docker-compose.yaml

@@ -1,31 +0,0 @@
-volumes:
-  config: {}
-  cache: {}
-  media:
-    external: true
-  nextcloud_data:
-    external: true
-services:
-  jellyfin:
-    image: jellyfin/jellyfin
-    container_name: jellyfin
-    ports:
-      - 8096:8096
-    networks:
-      - proxy
-      - authentik
-    restart: unless-stopped
-    volumes:
-      - /etc/localtime:/etc/localtime:ro
-      - config:/config
-      - cache:/cache
-      - media:/media
-      - nextcloud_data:/nextcloud_data
-    devices:
-      - /dev/dri/renderD128:/dev/dri/renderD128
-      - /dev/dri/card1:/dev/dri/card0
-networks:
-  proxy:
-    external: true
-  authentik:
-    external: true

docker/mumble/docker-compose.toml

@@ -0,0 +1,10 @@
+[volumes]
+config = {}
+
+[services.mumble]
+container_name = "mumble"
+image = "phlak/mumble"
+environment = ["TZ=Europe/Helsinki"]
+network_mode = "host"
+volumes = ["config:/etc/mumble", "/etc/localtime:/etc/localtime:ro"]
+restart = "unless-stopped"

docker/mumble/docker-compose.yaml

@@ -1,11 +0,0 @@
-volumes:
-  config: {}
-services:
-  mumble:
-    container_name: mumble
-    image: phlak/mumble
-    network_mode: host
-    volumes:
-      - /etc/localtime:/etc/localtime:ro
-      - config:/etc/mumble
-    restart: unless-stopped

docker/netbootxyz/docker-compose.toml

@@ -0,0 +1,20 @@
+[volumes]
+config = {}
+assets = {}
+
+[services.netbootxyz]
+image = "lscr.io/linuxserver/netbootxyz"
+container_name = "netbootxyz"
+restart = "unless-stopped"
+environment = [
+  "PUID=1000",
+  "PGID=1000",
+  "TZ=Etc/UTC",
+  "MENU_VERSION=1.9.9",
+  "PORT_RANGE=30000:30010",
+  "SUBFOLDER=/",
+  "NGINX_PORT=80",
+  "WEB_APP_PORT=3000",
+]
+ports = ["3000:3000", "69:69/udp", "8081:80"]
+volumes = ["config:/config", "assets:/assets"]

docker/netbootxyz/docker-compose.yaml

@@ -1,24 +0,0 @@
-volumes:
-  config: {}
-  assets: {}
-services:
-  netbootxyz:
-    image: lscr.io/linuxserver/netbootxyz
-    container_name: netbootxyz
-    restart: unless-stopped
-    environment:
-      - PUID=1000
-      - PGID=1000
-      - TZ=Etc/UTC
-      - MENU_VERSION=1.9.9
-      - PORT_RANGE=30000:30010
-      - SUBFOLDER=/
-      - NGINX_PORT=80
-      - WEB_APP_PORT=3000
-    ports:
-      - 3000:3000
-      - 69:69/udp
-      - 8081:80
-    volumes:
-      - config:/config
-      - assets:/assets

docker/nextcloud/docker-compose.toml

@@ -0,0 +1,84 @@
+[volumes.nextcloud_config]
+external = true
+
+[volumes.nextcloud_data]
+external = true
+
+[services.nextcloud]
+image = "nextcloud:fpm-alpine"
+container_name = "nextcloud"
+restart = "unless-stopped"
+networks = ["nextcloud", "postgres", "proxy"]
+volumes = [
+  "nextcloud_config:/var/www/html",
+  "nextcloud_data:/var/www/html/data",
+  "/etc/localtime:/etc/localtime:ro",
+]
+environment = [
+  "REDIS_HOST=redis",
+  "REDIS_HOST_PASSWORD=123",
+  "TRUSTED_PROXIES=caddy",
+  "NEXTCLOUD_TRUSTED_DOMAINS=cloud.korhonen.cc",
+  "OVERWRITEHOST=cloud.korhonen.cc",
+  "OVERWRITEPROTOCOL=https",
+]
+depends_on = ["redis"]
+
+[services.nextcloud.labels]
+"ofelia.enabled" = true
+"ofelia.job-exec.nextcloud.schedule" = "0 */5 * * * *"
+"ofelia.job-exec.nextcloud.command" = "php /var/www/html/cron.php"
+"ofelia.job-exec.nextcloud.user" = "www-data"
+"ofelia.smtp-host" = "${SMTP_HOST}"
+"ofelia.smtp-port" = "${SMTP_PORT}"
+"ofelia.smtp-user" = "${SMTP_USER}"
+"ofelia.smtp-password" = "${SMTP_PASSWORD}"
+"ofelia.email-to" = "${EMAIL_TO}"
+"ofelia.email-from" = "${EMAIL_FROM}"
+"ofelia.mail-only-on-error" = true
+
+[services.redis]
+image = "redis:alpine"
+container_name = "redis-nextcloud"
+networks = ["nextcloud"]
+restart = "unless-stopped"
+command = "redis-server --requirepass 123"
+
+[services.coturn]
+image = "instrumentisto/coturn"
+container_name = "coturn"
+restart = "unless-stopped"
+env_file = ".env"
+ports = ["3478:3478/tcp", "3478:3478/udp", "49160-49200:49160-49200/udp"]
+networks = ["nextcloud"]
+command = [
+  "-n",
+  "--log-file=stdout",
+  "--min-port=49160",
+  "--max-port=49200",
+  "--realm=cloud.korhonen.cc",
+  "--use-auth-secret",
+  "--static-auth-secret=${STATIC_AUTH_SECRET}",
+]
+
+[services.collabora]
+image = "collabora/code"
+container_name = "collabora"
+restart = "unless-stopped"
+env_file = ".env"
+environment = [
+  "username=${COLLABORA_USERNAME}",
+  "password=${COLLABORA_PASSWORD}",
+  "domain=cloud.korhonen.cc",
+  'extra_params=--o:ssl.enable=false --o:ssl.termination=true',
+]
+networks = ["proxy"]
+
+[networks.nextcloud]
+external = false
+
+[networks.postgres]
+external = true
+
+[networks.proxy]
+external = true

docker/nextcloud/docker-compose.yaml

@@ -1,84 +0,0 @@
-volumes:
-  nextcloud_config:
-    external: true
-  nextcloud_data:
-    external: true
-services:
-  nextcloud:
-    image: nextcloud:fpm-alpine
-    container_name: nextcloud
-    restart: unless-stopped
-    networks:
-      - nextcloud
-      - postgres
-      - proxy
-    volumes:
-      - nextcloud_config:/var/www/html
-      - nextcloud_data:/var/www/html/data
-      - /etc/localtime:/etc/localtime:ro
-    environment:
-      - REDIS_HOST=redis
-      - REDIS_HOST_PASSWORD=123
-      - TRUSTED_PROXIES=caddy
-      - NEXTCLOUD_TRUSTED_DOMAINS=cloud.korhonen.cc
-      - OVERWRITEHOST=cloud.korhonen.cc
-      - OVERWRITEPROTOCOL=https
-    depends_on:
-      - redis
-    labels:
-      ofelia.enabled: true
-      ofelia.job-exec.nextcloud.schedule: 0 */5 * * * *
-      ofelia.job-exec.nextcloud.command: php /var/www/html/cron.php
-      ofelia.job-exec.nextcloud.user: www-data
-      ofelia.smtp-host: ${SMTP_HOST}
-      ofelia.smtp-port: ${SMTP_PORT}
-      ofelia.smtp-user: ${SMTP_USER}
-      ofelia.smtp-password: ${SMTP_PASSWORD}
-      ofelia.email-to: ${EMAIL_TO}
-      ofelia.email-from: ${EMAIL_FROM}
-      ofelia.mail-only-on-error: true
-  redis:
-    image: redis:alpine
-    container_name: redis-nextcloud
-    networks:
-      - nextcloud
-    restart: unless-stopped
-    command: redis-server --requirepass 123
-  coturn:
-    image: instrumentisto/coturn
-    container_name: coturn
-    restart: unless-stopped
-    env_file: .env
-    ports:
-      - 3478:3478/tcp
-      - 3478:3478/udp
-      - 49160-49200:49160-49200/udp
-    networks:
-      - nextcloud
-    command:
-      - -n
-      - --log-file=stdout
-      - --min-port=49160
-      - --max-port=49200
-      - --realm=cloud.korhonen.cc
-      - --use-auth-secret
-      - --static-auth-secret=${STATIC_AUTH_SECRET}
-  collabora:
-    image: collabora/code
-    container_name: collabora
-    restart: unless-stopped
-    env_file: .env
-    environment:
-      - username=${COLLABORA_USERNAME}
-      - password=${COLLABORA_PASSWORD}
-      - domain=cloud.korhonen.cc
-      - extra_params=--o:ssl.enable=false --o:ssl.termination=true
-    networks:
-      - proxy
-networks:
-  nextcloud:
-    external: false
-  postgres:
-    external: true
-  proxy:
-    external: true

docker/ofelia/docker-compose.toml

@@ -0,0 +1,9 @@
+[services.ofelia]
+image = "mcuadros/ofelia"
+container_name = "ofelia"
+restart = "unless-stopped"
+volumes = [
+  "/etc/localtime:/etc/localtime:ro",
+  "/var/run/docker.sock:/var/run/docker.sock:ro",
+]
+command = "daemon --docker"

docker/ofelia/docker-compose.yaml

@@ -1,9 +0,0 @@
-services:
-  ofelia:
-    image: mcuadros/ofelia
-    container_name: ofelia
-    restart: unless-stopped
-    volumes:
-      - /etc/localtime:/etc/localtime:ro
-      - /var/run/docker.sock:/var/run/docker.sock:ro
-    command: daemon --docker

docker/opentogethertube/docker-compose.toml

@@ -0,0 +1,38 @@
+[services.opentogethertube]
+image = "dyc3/opentogethertube"
+container_name = "opentogethertube"
+restart = "unless-stopped"
+environment = [
+  "PORT=8080",
+  "REDIS_HOST=redis",
+  "REDIS_PORT=6379",
+  "FFPROBE_PATH=/usr/bin/ffprobe",
+  "DB_MODE=postgres",
+  "POSTGRES_USER=opentogethertube",
+  "POSTGRES_DB=opentogethertube",
+  "POSTGRES_HOST=postgres",
+  "POSTGRES_PASSWORD",
+  "DOCKER=1",
+  "OTT_HOSTNAME=ott.korhonen.cc",
+  "YOUTUBE_API_KEY",
+  "OPENTOGETHERTUBE_API_KEY",
+  "SESSION_SECRET",
+]
+ports = ["8080:8080", "3002:3002"]
+networks = ["default", "postgres", "proxy"]
+depends_on = ["redis"]
+volumes = ["./production.toml:/app/env/production.toml"]
+
+[services.redis]
+container_name = "redis-opentogethertube"
+image = "redis:alpine"
+restart = "unless-stopped"
+
+[services.redis.healthcheck]
+test = "redis-cli ping"
+
+[networks.postgres]
+external = true
+
+[networks.proxy]
+external = true

docker/opentogethertube/docker-compose.yaml

@@ -1,42 +0,0 @@
-services:
-  opentogethertube:
-    image: dyc3/opentogethertube
-    container_name: opentogethertube
-    restart: unless-stopped
-    environment:
-      - PORT=8080
-      - REDIS_HOST=redis
-      - REDIS_PORT=6379
-      - FFPROBE_PATH=/usr/bin/ffprobe
-      - DB_MODE=postgres
-      - POSTGRES_USER=opentogethertube
-      - POSTGRES_DB=opentogethertube
-      - POSTGRES_HOST=postgres
-      - POSTGRES_PASSWORD
-      - DOCKER=1
-      - OTT_HOSTNAME=ott.korhonen.cc
-      - YOUTUBE_API_KEY
-      - OPENTOGETHERTUBE_API_KEY
-      - SESSION_SECRET
-    ports:
-      - 8080:8080
-      - 3002:3002
-    networks:
-      - default
-      - postgres
-      - proxy
-    depends_on:
-      - redis
-    volumes:
-      - ./production.toml:/app/env/production.toml
-  redis:
-    container_name: redis-opentogethertube
-    image: redis:alpine
-    restart: unless-stopped
-    healthcheck:
-      test: redis-cli ping
-networks:
-  postgres:
-    external: true
-  proxy:
-    external: true

docker/pihole/docker-compose.toml

@@ -0,0 +1,23 @@
+[volumes]
+config = {}
+dnsmasq = {}
+
+[services.pihole]
+container_name = "pihole"
+image = "pihole/pihole"
+ports = ["53:53/tcp", "53:53/udp", "67:67/udp", "8069:80/tcp"]
+networks = ["proxy"]
+volumes = [
+  "config:/etc/pihole/",
+  "dnsmasq:/etc/dnsmasq.d/",
+]
+dns = ["127.0.0.1", "1.1.1.1"]
+cap_add = ["NET_ADMIN"]
+restart = "unless-stopped"
+
+[services.pihole.environment]
+TZ = "Europe/Helsinki"
+WEBPASSWORD = "${WEBPASSWORD}"
+
+[networks.proxy]
+external = true

docker/pihole/docker-compose.yaml

@@ -1,29 +0,0 @@
-volumes:
-  config: {}
-  dnsmasq: {}
-services:
-  pihole:
-    container_name: pihole
-    image: pihole/pihole
-    ports:
-      - 53:53/tcp
-      - 53:53/udp
-      - 67:67/udp
-      - 8069:80/tcp
-    networks:
-      - proxy
-    volumes:
-      - config:/etc/pihole/
-      - dnsmasq:/etc/dnsmasq.d/
-    dns:
-      - 127.0.0.1
-      - 1.1.1.1
-    cap_add:
-      - NET_ADMIN
-    restart: unless-stopped
-    environment:
-      TZ: Europe/Helsinki
-      WEBPASSWORD: ${WEBPASSWORD}
-networks:
-  proxy:
-    external: true

docker/postgres/docker-compose.toml

@@ -0,0 +1,17 @@
+[volumes]
+data = {}
+
+[services.postgres]
+container_name = "postgres"
+image = "postgres:16"
+environment = ["TZ=Europe/Helsinki"]
+ports = ["127.0.0.1:5432:5432"]
+networks = ["postgres"]
+volumes = [
+  "data:/var/lib/postgresql/data",
+  "/etc/localtime:/etc/localtime:ro",
+]
+restart = "unless-stopped"
+
+[networks.postgres]
+external = true

docker/postgres/docker-compose.yaml

@@ -1,17 +0,0 @@
-volumes:
-  data: {}
-services:
-  postgres:
-    container_name: postgres
-    image: postgres:16
-    ports:
-      - 127.0.0.1:5432:5432
-    networks:
-      - postgres
-    volumes:
-      - /etc/localtime:/etc/localtime:ro
-      - data:/var/lib/postgresql/data
-    restart: unless-stopped
-networks:
-  postgres:
-    external: true

docker/searx/docker-compose.toml

@@ -0,0 +1,37 @@
+[volumes]
+config = {}
+
+[services.searx]
+container_name = "searx"
+image = "searxng/searxng"
+restart = "unless-stopped"
+networks = ["searx", "proxy"]
+volumes = [
+  "config:/etc/searxng",
+  #"/docker/searx/logo.png:/usr/local/searxng/searx/static/themes/simple/img/searxng.png:ro"
+]
+environment = ["SEARXNG_BASE_URL=https://search.korhonen.cc/"]
+cap_drop = ["ALL"]
+cap_add = ["CHOWN", "SETGID", "SETUID", "DAC_OVERRIDE"]
+
+[services.searx.logging]
+driver = "json-file"
+
+[services.searx.logging.options]
+max-size = "1m"
+max-file = "1"
+
+[services.redis]
+container_name = "redis-searx"
+image = "redis:alpine"
+command = "redis-server --save \"\" --appendonly \"no\""
+networks = ["searx"]
+tmpfs = ["/var/lib/redis"]
+cap_drop = ["ALL"]
+cap_add = ["SETGID", "SETUID", "DAC_OVERRIDE"]
+
+[networks.searx.ipam]
+driver = "default"
+
+[networks.proxy]
+external = true

docker/searx/docker-compose.yaml

@@ -1,46 +0,0 @@
-volumes:
-  config: {}
-services:
-  searx:
-    container_name: searx
-    image: searxng/searxng
-    restart: unless-stopped
-    networks:
-      - searx
-      - proxy
-    volumes:
-      - config:/etc/searxng
-    environment:
-      - SEARXNG_BASE_URL=https://search.korhonen.cc/
-    cap_drop:
-      - ALL
-    cap_add:
-      - CHOWN
-      - SETGID
-      - SETUID
-      - DAC_OVERRIDE
-    logging:
-      driver: json-file
-      options:
-        max-size: 1m
-        max-file: '1'
-  redis:
-    container_name: redis-searx
-    image: redis:alpine
-    command: redis-server --save "" --appendonly "no"
-    networks:
-      - searx
-    tmpfs:
-      - /var/lib/redis
-    cap_drop:
-      - ALL
-    cap_add:
-      - SETGID
-      - SETUID
-      - DAC_OVERRIDE
-networks:
-  searx:
-    ipam:
-      driver: default
-  proxy:
-    external: true

docker/stats/docker-compose.toml

@@ -0,0 +1,27 @@
+[services.grafana]
+image = "grafana/grafana"
+container_name = "grafana"
+volumes = ["grafana:/var/lib/grafana"]
+networks = ["stats", "proxy"]
+user = "1000:984"
+env_file = [".env"]
+environment = [
+  "GF_AUTH_GENERIC_OAUTH_CLIENT_ID",
+  "GF_AUTH_GENERIC_OAUTH_CLIENT_SECRET",
+  "GF_AUTH_GENERIC_OAUTH_ENABLED=true",
+  "GF_AUTH_GENERIC_OAUTH_NAME=authentik",
+  "GF_AUTH_GENERIC_OAUTH_SCOPES=openid profile email",
+  "GF_AUTH_GENERIC_OAUTH_AUTH_URL=https://sso.korhonen.cc/application/o/authorize/",
+  "GF_AUTH_GENERIC_OAUTH_TOKEN_URL=https://sso.korhonen.cc/application/o/token/",
+  "GF_AUTH_GENERIC_OAUTH_API_URL=https://sso.korhonen.cc/application/o/userinfo/",
+  "GF_AUTH_SIGNOUT_REDIRECT_URL=https://sso.korhonen.cc/application/o/grafana/end-session/",
+  "GF_AUTH_OAUTH_AUTO_LOGIN=true",
+  "GF_SERVER_ROOT_URL=https://grafana.korhonen.cc",
+  "GF_AUTH_GENERIC_OAUTH_ROLE_ATTRIBUTE_PATH=contains(groups[*], 'Administrators') && 'Admin' || 'Viewer'",
+]
+
+[networks.stats]
+external = false
+
+[networks.proxy]
+external = true

docker/stats/docker-compose.yaml

@@ -1,30 +0,0 @@
-services:
-  grafana:
-    image: grafana/grafana
-    container_name: grafana
-    volumes:
-      - grafana:/var/lib/grafana
-    networks:
-      - stats
-      - proxy
-    user: 1000:984
-    env_file:
-      - .env
-    environment:
-      - GF_AUTH_GENERIC_OAUTH_CLIENT_ID
-      - GF_AUTH_GENERIC_OAUTH_CLIENT_SECRET
-      - GF_AUTH_GENERIC_OAUTH_ENABLED=true
-      - GF_AUTH_GENERIC_OAUTH_NAME=authentik
-      - GF_AUTH_GENERIC_OAUTH_SCOPES=openid profile email
-      - GF_AUTH_GENERIC_OAUTH_AUTH_URL=https://sso.korhonen.cc/application/o/authorize/
-      - GF_AUTH_GENERIC_OAUTH_TOKEN_URL=https://sso.korhonen.cc/application/o/token/
-      - GF_AUTH_GENERIC_OAUTH_API_URL=https://sso.korhonen.cc/application/o/userinfo/
-      - GF_AUTH_SIGNOUT_REDIRECT_URL=https://sso.korhonen.cc/application/o/grafana/end-session/
-      - GF_AUTH_OAUTH_AUTO_LOGIN=true
-      - GF_SERVER_ROOT_URL=https://grafana.korhonen.cc
-      - GF_AUTH_GENERIC_OAUTH_ROLE_ATTRIBUTE_PATH=contains(groups[*], 'Administrators') && 'Admin' || 'Viewer'
-networks:
-  stats:
-    external: false
-  proxy:
-    external: true

docker/tftp/docker-compose.toml

@@ -0,0 +1,9 @@
+[services]
+
+[services.tftp]
+container_name = "tftp"
+image = "pghalliday/tftp"
+environment = ["TZ=Europe/Helsinki"]
+restart = "unless-stopped"
+ports = ["69:69/udp"]
+volumes = ["/etc/localtime:/etc/localtime:ro", "/docker/tftp:/var/tftpboot"]

docker/tftp/docker-compose.yaml

@@ -1,10 +0,0 @@
-services:
-  tftp:
-    container_name: tftp
-    image: pghalliday/tftp
-    restart: unless-stopped
-    ports:
-      - 69:69/udp
-    volumes:
-      - /etc/localtime:/etc/localtime:ro
-      - /docker/tftp:/var/tftpboot

docker/tvheadend/docker-compose.toml

@@ -0,0 +1,21 @@
+[volumes]
+config = {}
+picons = {}
+
+[services.tvheadend]
+image = "linuxserver/tvheadend"
+container_name = "tvheadend"
+environment = ["TZ=Europe/Helsinki", "PUID=1000", "PGID=985"]
+volumes = [
+  "config:/config",
+  "picons:/picons",
+  "/mnt/Storage/Media/PVR:/recordings",
+  "/etc/localtime:/etc/localtime:ro",
+]
+ports = ["9981:9981", "9982:9982"]
+devices = ["/dev/dvb:/dev/dvb"]
+restart = "unless-stopped"
+networks = ["proxy"]
+
+[networks.proxy]
+external = true

docker/tvheadend/docker-compose.yaml

@@ -1,26 +0,0 @@
-volumes:
-  config: {}
-  picons: {}
-services:
-  tvheadend:
-    image: linuxserver/tvheadend
-    container_name: tvheadend
-    environment:
-      - PUID=1000
-      - PGID=985
-    volumes:
-      - /etc/localtime:/etc/localtime:ro
-      - config:/config
-      - picons:/picons
-      - /mnt/Storage/Media/PVR:/recordings
-    ports:
-      - 9981:9981
-      - 9982:9982
-    devices:
-      - /dev/dvb:/dev/dvb
-    restart: unless-stopped
-    networks:
-      - proxy
-networks:
-  proxy:
-    external: true

docker/umami/docker-compose.toml

@@ -0,0 +1,20 @@
+[services.umami]
+image = "ghcr.io/umami-software/umami:postgresql-latest"
+container_name = "umami"
+restart = "unless-stopped"
+networks = ["postgres", "proxy"]
+env_file = ".env"
+
+[services.umami.environment]
+DATABASE_URL = "postgresql://umami:${POSTGRES_PASS}@postgres:5432/umami"
+HASH_SALT = "${HASH_SALT}"
+
+[services.umami.logging.options]
+max-size = "10m"
+max-file = "10"
+
+[networks.postgres]
+external = true
+
+[networks.proxy]
+external = true

docker/umami/docker-compose.yaml

@@ -1,21 +0,0 @@
-services:
-  umami:
-    image: ghcr.io/umami-software/umami:postgresql-latest
-    container_name: umami
-    restart: unless-stopped
-    networks:
-      - postgres
-      - proxy
-    env_file: .env
-    environment:
-      DATABASE_URL: postgresql://umami:${POSTGRES_PASS}@postgres:5432/umami
-      HASH_SALT: ${HASH_SALT}
-    logging:
-      options:
-        max-size: 10m
-        max-file: '10'
-networks:
-  postgres:
-    external: true
-  proxy:
-    external: true

docker/watchtower/docker-compose.toml

@@ -0,0 +1,19 @@
+[services.watchtower]
+image = "containrrr/watchtower"
+container_name = "watchtower"
+restart = "unless-stopped"
+environment = [
+  "WATCHTOWER_CLEANUP=true",
+  "WATCHTOWER_NOTIFICATION_EMAIL_FROM=watchtower@korhonen.cc",
+  "WATCHTOWER_NOTIFICATION_EMAIL_TO=admin@korhonen.cc",
+  "WATCHTOWER_NOTIFICATION_EMAIL_SERVER=smtp.migadu.com",
+  "WATCHTOWER_NOTIFICATION_EMAIL_SERVER_PORT=587",
+  "WATCHTOWER_NOTIFICATION_EMAIL_SERVER_USER=${WATCHTOWER_NOTIFICATION_EMAIL_SERVER_USER}",
+  "WATCHTOWER_NOTIFICATION_EMAIL_SERVER_PASSWORD=${WATCHTOWER_NOTIFICATION_EMAIL_SERVER_PASSWORD}",
+  "WATCHTOWER_NOTIFICATION_EMAIL_DELAY=30",
+  "WATCHTOWER_NOTIFICATIONS=email",
+]
+volumes = [
+  "/var/run/docker.sock:/var/run/docker.sock",
+  "/etc/localtime:/etc/localtime:ro",
+]

docker/watchtower/docker-compose.yaml

@@ -1,18 +0,0 @@
-services:
-  watchtower:
-    image: containrrr/watchtower
-    container_name: watchtower
-    restart: unless-stopped
-    environment:
-      - WATCHTOWER_CLEANUP=true
-      - WATCHTOWER_NOTIFICATION_EMAIL_FROM=watchtower@korhonen.cc
-      - WATCHTOWER_NOTIFICATION_EMAIL_TO=admin@korhonen.cc
-      - WATCHTOWER_NOTIFICATION_EMAIL_SERVER=smtp.migadu.com
-      - WATCHTOWER_NOTIFICATION_EMAIL_SERVER_PORT=587
-      - WATCHTOWER_NOTIFICATION_EMAIL_SERVER_USER=${WATCHTOWER_NOTIFICATION_EMAIL_SERVER_USER}
-      - WATCHTOWER_NOTIFICATION_EMAIL_SERVER_PASSWORD=${WATCHTOWER_NOTIFICATION_EMAIL_SERVER_PASSWORD}
-      - WATCHTOWER_NOTIFICATION_EMAIL_DELAY=30
-      - WATCHTOWER_NOTIFICATIONS=email
-    volumes:
-      - /var/run/docker.sock:/var/run/docker.sock
-      - /etc/localtime:/etc/localtime:ro

docker/wud/docker-compose.yaml

@@ -1,12 +0,0 @@
-services:
-  whatsupdocker:
-    image: getwud/wud
-    container_name: wud
-    env_file: .env
-    environment:
-      - WUD_TRIGGER_SMTP_EMAIL_SIMPLETITLE=Container $${container.name} can be updated
-      - WUD_TRIGGER_SMTP_EMAIL_SIMPLEBODY=Container $${name} can be updated from $${local.substring(0, 15)} to $${remote.substring(0, 15)}
-    volumes:
-      - /var/run/docker.sock:/var/run/docker.sock
-    ports:
-      - 3000:3000

flake.lock

@@ -0,0 +1,82 @@
+{
+  "nodes": {
+    "firefox-gnome-theme": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1730674701,
+        "narHash": "sha256-lf9MQs8+NUvQd8b5t+7c4kLqUQixGO9WwWcLa1XYuiQ=",
+        "owner": "rafaelmardojai",
+        "repo": "firefox-gnome-theme",
+        "rev": "823756d8ddd21cfd3a24a87dad402e490e0eb5ee",
+        "type": "github"
+      },
+      "original": {
+        "owner": "rafaelmardojai",
+        "repo": "firefox-gnome-theme",
+        "type": "github"
+      }
+    },
+    "home-manager": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1726989464,
+        "narHash": "sha256-Vl+WVTJwutXkimwGprnEtXc/s/s8sMuXzqXaspIGlwM=",
+        "owner": "nix-community",
+        "repo": "home-manager",
+        "rev": "2f23fa308a7c067e52dfcc30a0758f47043ec176",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "ref": "release-24.05",
+        "repo": "home-manager",
+        "type": "github"
+      }
+    },
+    "nixpkgs": {
+      "locked": {
+        "lastModified": 1730883749,
+        "narHash": "sha256-mwrFF0vElHJP8X3pFCByJR365Q2463ATp2qGIrDUdlE=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "dba414932936fde69f0606b4f1d87c5bc0003ede",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-24.05",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nur": {
+      "locked": {
+        "lastModified": 1731008709,
+        "narHash": "sha256-RBUutTfh/bcvWHzjnqybjB50evgMYGngOG1Iosxbs0E=",
+        "owner": "nix-community",
+        "repo": "NUR",
+        "rev": "dc5cb7606d6359297287945f6908ddf9d60e20f3",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "NUR",
+        "type": "github"
+      }
+    },
+    "root": {
+      "inputs": {
+        "firefox-gnome-theme": "firefox-gnome-theme",
+        "home-manager": "home-manager",
+        "nixpkgs": "nixpkgs",
+        "nur": "nur"
+      }
+    }
+  },
+  "root": "root",
+  "version": 7
+}

flake.nix

@@ -0,0 +1,44 @@
+{
+  description = "FunctionalHacker's NixOS config";
+
+  inputs = {
+    nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.05";
+    nur.url = "github:nix-community/NUR";
+
+    home-manager = {
+      url = "github:nix-community/home-manager/release-24.05";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+
+    firefox-gnome-theme = {
+      url = "github:rafaelmardojai/firefox-gnome-theme";
+      flake = false;
+    };
+  };
+
+  outputs = { nixpkgs, home-manager, nur, ... } @inputs:
+    let
+      configureNixSystem = hostname: nixpkgs.lib.nixosSystem {
+        system = "x86_64-linux";
+        modules = [
+          # Common settings for all hosts
+          ({ pkgs, ... }: import ./nixos_common.nix
+            { inherit inputs; inherit pkgs; })
+
+          # Host specific configuration
+          ./hosts/${hostname}/configuration.nix
+
+          # home-manager
+          home-manager.nixosModules.home-manager
+          ({ ... }: import ./home-manager.nix { inherit inputs; })
+        ];
+      };
+
+    in
+    {
+      nixosConfigurations = {
+        Mirkwood = configureNixSystem "Mirkwood";
+        Shire = configureNixSystem "Shire";
+      };
+    };
+}

gpg.nix

@@ -0,0 +1,19 @@
+{ pkgs, ... }:
+
+{
+  programs = {
+    ssh.startAgent = false;
+    gnupg.agent = {
+      enable = true;
+      enableSSHSupport = true;
+      enableExtraSocket = true;
+    };
+  };
+
+  services = {
+    pcscd.enable = true;
+    udev.packages = [
+      pkgs.yubikey-personalization
+    ];
+  };
+}

home-manager.nix

@@ -0,0 +1,14 @@
+{ inputs, ... }:
+
+{
+  home-manager = {
+    useGlobalPkgs = true;
+    useUserPackages = true;
+    extraSpecialArgs = { inherit inputs; };
+    backupFileExtension = "hm-backup";
+    users = {
+      functionalhacker = import ./users/functionalhacker/home.nix;
+      som = import ./users/som/home.nix;
+    };
+  };
+}

home/.Xresources

@@ -1,21 +0,0 @@
-! Snazzy - Converted from https://github.com/sindresorhus/iterm2-snazzy
-!          using https://github.com/richo/itermcolors2xdefaults
-URxvt*background:   #1e1f28
-URxvt*foreground:   #ebece6
-URxvt*cursorColor:   #e4e4e4
-URxvt*color0:   #000
-URxvt*color1:   #fb4245
-URxvt*color2:   #50fa7b
-URxvt*color3:   #f0fa8b
-URxvt*color4:   #49b9fe
-URxvt*color5:   #fb4cb3
-URxvt*color6:   #8be9fd
-URxvt*color7:   #ededec
-URxvt*color8:   #555555
-URxvt*color9:   #fb4245
-URxvt*color10:   #50fa7b
-URxvt*color11:   #f0fa8b
-URxvt*color12:   #49b9fe
-URxvt*color13:   #fb4cb3
-URxvt*color14:   #8be9fd
-URxvt*color15:   #ededec

home/.abcde.conf

@@ -1,89 +0,0 @@
-# -----------------$HOME/.abcde.conf----------------- #
-# 
-# A sample configuration file to convert music cds to 
-#       FLAC using abcde version 2.7.2
-# 
-# http://andrews-corner.org/linux/abcde/index.html
-# -------------------------------------------------- #
-
-# Encode tracks immediately after reading. Saves disk space, gives
-# better reading of 'scratchy' disks and better troubleshooting of
-# encoding process but slows the operation of abcde quite a bit:
-LOWDISK=y
-
-# Specify the method to use to retrieve the track information,
-# the alternative is to specify 'musicbrainz':
-CDDBMETHOD=cddb
-
-# Make a local cache of cddb entries and then volunteer to use 
-# these entries when and if they match the cd:
-CDDBCOPYLOCAL="y"
-CDDBLOCALDIR="$HOME/.cddb"
-CDDBLOCALRECURSIVE="y"
-CDDBUSELOCAL="y"
-
-# Specify the encoder to use for FLAC. In this case
-# flac is the only choice.
-FLACENCODERSYNTAX=flac
-
-# Specify the path to the selected encoder. In most cases the encoder
-# should be in your $PATH as I illustrate below, otherwise you will 
-# need to specify the full path. For example: /usr/bin/flac
-FLAC=flac
-
-# Specify your required encoding options here. Multiple options can
-# be selected as '--best --another-option' etc.
-# Overall bitrate is about 880 kbs/s with level 8.
-FLACOPTS='-s -e -V -8' 
-
-# Output type for FLAC.
-OUTPUTTYPE="flac"
-
-# The cd ripping program to use. There are a few choices here: cdda2wav,
-# dagrab, cddafs (Mac OS X only) and flac. New to abcde 2.7 is 'libcdio'.
-CDROMREADERSYNTAX=cdparanoia            
-                                     
-# Give the location of the ripping program and pass any extra options,
-# if using libcdio set 'CD_PARANOIA=cd-paranoia'.
-CDPARANOIA=cdparanoia  
-CDPARANOIAOPTS="--never-skip=40"
-
-# Give the location of the CD identification program:       
-CDDISCID=cd-discid            
-                               
-# Give the base location here for the encoded music files.
-OUTPUTDIR="$HOME/Documents/Rip"               
-
-# The default actions that abcde will take.
-ACTIONS=cddb,playlist,read,encode,tag,move,clean
-              
-# Decide here how you want the tracks labelled for a standard 'single-artist',
-# multi-track encode and also for a multi-track, 'various-artist' encode:
-OUTPUTFORMAT='${OUTPUT}/${ARTISTFILE}-${ALBUMFILE}/${TRACKNUM}.${TRACKFILE}'
-VAOUTPUTFORMAT='${OUTPUT}/Various-${ALBUMFILE}/${TRACKNUM}.${ARTISTFILE}-${TRACKFILE}'
-
-# Decide here how you want the tracks labelled for a standard 'single-artist',
-# single-track encode and also for a single-track 'various-artist' encode.
-# (Create a single-track encode with 'abcde -1' from the commandline.)
-ONETRACKOUTPUTFORMAT='${OUTPUT}/${ARTISTFILE}-${ALBUMFILE}/${ALBUMFILE}'
-VAONETRACKOUTPUTFORMAT='${OUTPUT}/Various-${ALBUMFILE}/${ALBUMFILE}'
-
-# Create playlists for single and various-artist encodes. I would suggest
-# commenting these out for single-track encoding.
-PLAYLISTFORMAT='${OUTPUT}/${ARTISTFILE}-${ALBUMFILE}/${ALBUMFILE}.m3u'
-VAPLAYLISTFORMAT='${OUTPUT}/Various-${ALBUMFILE}/${ALBUMFILE}.m3u'
-
-# This function takes out dots preceding the album name, and removes a grab
-# bag of illegal characters. It allows spaces, if you do not wish spaces add
-# in -e 's/ /_/g' after the first sed command.
-mungefilename ()
-{
-  echo "$@" | sed -e 's/^\.*//' | tr -d ":><|*/\"'?[:cntrl:]"
-}
-
-# What extra options?
-MAXPROCS=2                              # Run a few encoders simultaneously
-PADTRACKS=y                             # Makes tracks 01 02 not 1 2
-EXTRAVERBOSE=2                          # Useful for debugging
-COMMENT='abcde version 2.7.2'           # Place a comment...
-EJECTCD=y                               # Please eject cd when finished :-)

home/.config/alacritty/alacritty.yml

@@ -1,192 +0,0 @@
-window:
-  opacity: 1.0
-  dimensions:
-    columns: 0
-    lines: 0
-  padding:
-    x: 30
-    y: 20
-  dynamic_padding: false
-  dynamic_title: true
-  decorations: full
-
-scrolling:
-  history: 10000
-  multiplier: 3
-
-font:
-  normal:
-    family: Hack Nerd Font Mono
-  size: 12.0
-  offset:
-    x: 0
-    y: 0
-  glyph_offset:
-    x: 0
-    y: 0
-  use_thin_strokes: true
-
-# Colors (One Dark)
-colors:
-  # Default colors
-  primary:
-    background: '0x282c34'
-    foreground: '0xabb2bf'
-
-  # Cursor colors
-  cursor:
-    text: '0x282c34'
-    cursor: '0xabb2bf'
-
-  # Normal colors
-  normal:
-    black: '0x282c34'
-    red: '0xe06c75'
-    green: '0x98c379'
-    yellow: '0xe5c07b'
-    blue: '0x61afef'
-    magenta: '0xc678dd'
-    cyan: '0x56b6c2'
-    white: '0xabb2bf'
-
-  # Bright colors
-  bright:
-    black: '0x3e4452'
-    red: '0xbe5046'
-    green: '0x98c379'
-    yellow: '0xd19a66'
-    blue: '0x61afef'
-    magenta: '0xc678dd'
-    cyan: '0x56b6c2'
-    white: '0x5c6370'
-
-bell:
-  animation: EaseOutExpo
-  duration: 0
-  color: '#ffffff'
-
-mouse_bindings:
-  - { mouse: Middle, action: PasteSelection }
-
-mouse:
-  double_click: { threshold: 300 }
-  triple_click: { threshold: 300 }
-  hide_when_typing: false
-
-selection:
-  semantic_escape_chars: ',│`|:"'' ()[]{}<>'
-  save_to_clipboard: false
-
-cursor:
-  style: Block
-  unfocused_hollow: true
-
-live_config_reload: true
-
-enable_experimental_conpty_backend: true
-
-alt_send_esc: true
-
-key_bindings:
-  - { key: Paste, action: Paste }
-  - { key: Copy, action: Copy }
-  - { key: L, mods: Control, action: ClearLogNotice }
-  - { key: L, mods: Control, chars: "\x0c" }
-  - { key: Home, chars: "\x1bOH", mode: AppCursor }
-  - { key: Home, chars: "\x1b[H", mode: ~AppCursor }
-  - { key: End, chars: "\x1bOF", mode: AppCursor }
-  - { key: End, chars: "\x1b[F", mode: ~AppCursor }
-  - { key: PageUp, mods: Shift, action: ScrollPageUp, mode: ~Alt }
-  - { key: PageUp, mods: Shift, chars: "\x1b[5;2~", mode: Alt }
-  - { key: PageUp, mods: Control, chars: "\x1b[5;5~" }
-  - { key: PageUp, chars: "\x1b[5~" }
-  - { key: PageDown, mods: Shift, action: ScrollPageDown, mode: ~Alt }
-  - { key: PageDown, mods: Shift, chars: "\x1b[6;2~", mode: Alt }
-  - { key: PageDown, mods: Control, chars: "\x1b[6;5~" }
-  - { key: PageDown, chars: "\x1b[6~" }
-  - { key: Tab, mods: Shift, chars: "\x1b[Z" }
-  - { key: Back, chars: "\x7f" }
-  - { key: Back, mods: Alt, chars: "\x1b\x7f" }
-  - { key: Insert, chars: "\x1b[2~" }
-  - { key: Delete, chars: "\x1b[3~" }
-  - { key: Left, mods: Shift, chars: "\x1b[1;2D" }
-  - { key: Left, mods: Control, chars: "\x1b[1;5D" }
-  - { key: Left, mods: Alt, chars: "\x1b[1;3D" }
-  - { key: Left, chars: "\x1b[D", mode: ~AppCursor }
-  - { key: Left, chars: "\x1bOD", mode: AppCursor }
-  - { key: Right, mods: Shift, chars: "\x1b[1;2C" }
-  - { key: Right, mods: Control, chars: "\x1b[1;5C" }
-  - { key: Right, mods: Alt, chars: "\x1b[1;3C" }
-  - { key: Right, chars: "\x1b[C", mode: ~AppCursor }
-  - { key: Right, chars: "\x1bOC", mode: AppCursor }
-  - { key: Up, mods: Shift, chars: "\x1b[1;2A" }
-  - { key: Up, mods: Control, chars: "\x1b[1;5A" }
-  - { key: Up, mods: Alt, chars: "\x1b[1;3A" }
-  - { key: Up, chars: "\x1b[A", mode: ~AppCursor }
-  - { key: Up, chars: "\x1bOA", mode: AppCursor }
-  - { key: Down, mods: Shift, chars: "\x1b[1;2B" }
-  - { key: Down, mods: Control, chars: "\x1b[1;5B" }
-  - { key: Down, mods: Alt, chars: "\x1b[1;3B" }
-  - { key: Down, chars: "\x1b[B", mode: ~AppCursor }
-  - { key: Down, chars: "\x1bOB", mode: AppCursor }
-  - { key: F1, chars: "\x1bOP" }
-  - { key: F2, chars: "\x1bOQ" }
-  - { key: F3, chars: "\x1bOR" }
-  - { key: F4, chars: "\x1bOS" }
-  - { key: F5, chars: "\x1b[15~" }
-  - { key: F6, chars: "\x1b[17~" }
-  - { key: F7, chars: "\x1b[18~" }
-  - { key: F8, chars: "\x1b[19~" }
-  - { key: F9, chars: "\x1b[20~" }
-  - { key: F10, chars: "\x1b[21~" }
-  - { key: F11, chars: "\x1b[23~" }
-  - { key: F12, chars: "\x1b[24~" }
-  - { key: F1, mods: Shift, chars: "\x1b[1;2P" }
-  - { key: F2, mods: Shift, chars: "\x1b[1;2Q" }
-  - { key: F3, mods: Shift, chars: "\x1b[1;2R" }
-  - { key: F4, mods: Shift, chars: "\x1b[1;2S" }
-  - { key: F5, mods: Shift, chars: "\x1b[15;2~" }
-  - { key: F6, mods: Shift, chars: "\x1b[17;2~" }
-  - { key: F7, mods: Shift, chars: "\x1b[18;2~" }
-  - { key: F8, mods: Shift, chars: "\x1b[19;2~" }
-  - { key: F9, mods: Shift, chars: "\x1b[20;2~" }
-  - { key: F10, mods: Shift, chars: "\x1b[21;2~" }
-  - { key: F11, mods: Shift, chars: "\x1b[23;2~" }
-  - { key: F12, mods: Shift, chars: "\x1b[24;2~" }
-  - { key: F1, mods: Control, chars: "\x1b[1;5P" }
-  - { key: F2, mods: Control, chars: "\x1b[1;5Q" }
-  - { key: F3, mods: Control, chars: "\x1b[1;5R" }
-  - { key: F4, mods: Control, chars: "\x1b[1;5S" }
-  - { key: F5, mods: Control, chars: "\x1b[15;5~" }
-  - { key: F6, mods: Control, chars: "\x1b[17;5~" }
-  - { key: F7, mods: Control, chars: "\x1b[18;5~" }
-  - { key: F8, mods: Control, chars: "\x1b[19;5~" }
-  - { key: F9, mods: Control, chars: "\x1b[20;5~" }
-  - { key: F10, mods: Control, chars: "\x1b[21;5~" }
-  - { key: F11, mods: Control, chars: "\x1b[23;5~" }
-  - { key: F12, mods: Control, chars: "\x1b[24;5~" }
-  - { key: F1, mods: Alt, chars: "\x1b[1;6P" }
-  - { key: F2, mods: Alt, chars: "\x1b[1;6Q" }
-  - { key: F3, mods: Alt, chars: "\x1b[1;6R" }
-  - { key: F4, mods: Alt, chars: "\x1b[1;6S" }
-  - { key: F5, mods: Alt, chars: "\x1b[15;6~" }
-  - { key: F6, mods: Alt, chars: "\x1b[17;6~" }
-  - { key: F7, mods: Alt, chars: "\x1b[18;6~" }
-  - { key: F8, mods: Alt, chars: "\x1b[19;6~" }
-  - { key: F9, mods: Alt, chars: "\x1b[20;6~" }
-  - { key: F10, mods: Alt, chars: "\x1b[21;6~" }
-  - { key: F11, mods: Alt, chars: "\x1b[23;6~" }
-  - { key: F12, mods: Alt, chars: "\x1b[24;6~" }
-  - { key: F1, mods: Super, chars: "\x1b[1;3P" }
-  - { key: F2, mods: Super, chars: "\x1b[1;3Q" }
-  - { key: F3, mods: Super, chars: "\x1b[1;3R" }
-  - { key: F4, mods: Super, chars: "\x1b[1;3S" }
-  - { key: F5, mods: Super, chars: "\x1b[15;3~" }
-  - { key: F6, mods: Super, chars: "\x1b[17;3~" }
-  - { key: F7, mods: Super, chars: "\x1b[18;3~" }
-  - { key: F8, mods: Super, chars: "\x1b[19;3~" }
-  - { key: F9, mods: Super, chars: "\x1b[20;3~" }
-  - { key: F10, mods: Super, chars: "\x1b[21;3~" }
-  - { key: F11, mods: Super, chars: "\x1b[23;3~" }
-  - { key: F12, mods: Super, chars: "\x1b[24;3~" }
-  - { key: NumpadEnter, chars: "\n" }

home/.config/aria2/aria2.conf

@@ -1,9 +0,0 @@
-continue
-file-allocation=falloc
-log-level=warn
-max-connection-per-server=4
-max-concurrent-downloads=3
-max-overall-download-limit=0
-min-split-size=5M
-enable-http-pipelining=true
-rpc-secret="{{@@ env['PASS_ARIA2'] @@}}"

home/.config/beets/config.yaml

@@ -1,39 +0,0 @@
-directory: ~/Music
-library: ~/Music/beets.db
-plugins:
-  - edit
-  - fetchart
-  - fuzzy
-  - info
-  - lastgenre
-  - lyrics
-  #  - mbcollection
-  - mpdupdate
-  - play
-  - replaygain
-  - thumbnails
-  - web
-import:
-  write: yes
-  copy: yes
-lastgenre:
-  whitelist: ~/.config/beets/whitelist
-lyrics:
-  fallback: ''
-play:
-  command: mpv --no-vid --no-resume-playback
-mpd:
-  host: localhost
-  port: 6600
-  password: "{{@@ env['PASS_MPD_ADMIN'] @@}}"
-follow:
-  email: reekymarko@reekynet.com
-  password: "{{@@ env['PASS_MUSPY'] @@}}"
-  userid: w8njp08ude90mfzsgumjhqinnirj4g
-  auto: yes
-replaygain:
-  backend: gstreamer
-  auto: yes
-#mbcollection:
-#  auto: 'yes'
-#  collection: 'a4955b5c-db7f-4e27-9887-f77f820bad34'

home/.config/beets/whitelist

@@ -1,37 +0,0 @@
-avantgarde
-experimental music
-lofi
-blues
-classical
-comedy
-comedy music
-comedy rock
-humor
-parody music
-standup
-country
-country rap
-country rock
-rockabilly
-easy listening
-electronic
-drum and bass
-hardcore
-house
-techno
-uk garage
-dubstep
-rap
-folk
-hip hop
-countryrap
-rap rock
-jazz
-pop
-rhythm and blues
-rock
-hard rock
-alternative rock
-heavy metal
-punk rock
-reggae

home/.config/bspwm/bspwmrc

@@ -1,75 +0,0 @@
-#! /bin/sh
-
-# set screen timeout
-xset s 300 120
-xset dpms 422
-
-# screen locker
-xss-lock -n ~/Scripts/dim-screen.sh -- evenbetterlockscreen -l &
-
-# lock screen
-evenbetterlockscreen -l &
-
-# set wallpaper
-wal -R
-
-# Start hotkey daemon
-sxhkd &
-
-bspc monitor -d web term chat mail music 6 7 
-
-bspc config border_width         0 
-bspc config window_gap           37 
-
-bspc config split_ratio          0.52
-bspc config borderless_monocle   true
-bspc config gapless_monocle      true
-
-bspc rule -a TelegramDesktop desktop=^3
-bspc rule -a Franz desktop=^3
-bspc rule -a Thunderbird desktop=^4
-
-bspc rule -a Zathura state=tiled
-bspc rule -a Nightly:Navigator state=tiled
-bspc rule -a kdeconnect-indicator state=tiled
-bspc rule -a libreoffice state=tiled
-bspc rule -a Screenkey manage=off
-
-bspc config super mod4
-bspc config pointer_action1 move
-bspc config pointer_action2 none
-bspc config pointer_action3 resize_corner
-bspc config click_to_focus true
-
-# set pywal colors
-. "${HOME}/.cache/wal/colors.sh"
-bspc config normal_border_color "$color1"
-bspc config active_border_color "$color2"
-bspc config focused_border_color "$color15"
-bspc config presel_feedback_color "$color1"
-
-
-# set cursor style
-xsetroot -cursor_name left_ptr
- 
-# startup applications
-joplin-desktop &
-compton -f --config ~/.config/compton/config &
-redshift &
-/usr/lib/xfce4/notifyd/xfce4-notifyd &
-telegram-desktop &
-setxkbmap eu &
-/usr/lib/kdeconnectd &
-kdeconnect-indicator &
-udiskie --tray &
-xfce4-clipman &
-/usr/bin/gnome-keyring-daemon --start --components=secrets &
-~/Scripts/polybar.sh &
-/usr/lib/mate-polkit/polkit-mate-authentication-agent-1 &
-blueberry-tray &
-nm-applet &
-thunderbird &
-mpDris2 &
-
-# hide mouse cursor
-unclutter -idle 1 &

home/.config/compton/config

@@ -1,53 +0,0 @@
-backend = "glx";
-glx-no-stencil = true;
-glx-copy-from-front = false;
-glx-swap-method = 1;
-inactive-opacity-override = true;
-
-# Fix tearing
-vsync = "opengl-swc";
-unredir-if-possible = false;
-paint-on-overlay = true;
- 
-# Shadow
-shadow = true;			# Enabled client-side shadows on windows.
-no-dock-shadow = true;		# Avoid drawing shadows on dock/panel windows.
-no-dnd-shadow = true;		# Don't draw shadows on DND windows.
-shadow-radius = 10;		# The blur radius for shadows. (default 12)
-shadow-offset-x = -15;		# The left offset for shadows. (default -15)
-shadow-offset-y = -15;		# The top offset for shadows. (default -15)
-shadow-opacity = 0.5;
-menu-opacity = 1;
-shadow-exclude = [
- "class_g = 'slop'",
- "n:e:Notification",
- "class_g ?= 'Xfce4-notifyd'",
- #"class_g ?= 'Xfce4-power-manager'"
-];
-
-opacity-rule = [
-	"50:class_g = 'Bspwm' && class_i = 'presel_feedback'",
-	"99:class_g = 'slop'"
-];
-
-# The shadow exclude options are helpful if you have shadows enabled. Due to the way compton draws its shadows, certain applications will have visual glitches 
-# (most applications are fine, only apps that do weird things with xshapes or argb are affected). 
-# This list includes all the affected apps I found in my testing. The "! name~=''" part excludes shadows on any "Unknown" windows, this prevents a visual glitch with the XFWM alt tab switcher.
-
-# Fading
-fading = true; # Fade windows during opacity changes.
-fade-delta = 4; # The time between steps in a fade in milliseconds. (default 10).
-fade-in-step = 0.03; # Opacity change between steps while fading in. (default 0.028).
-fade-out-step = 0.03; # Opacity change between steps while fading out. (default 0.03).
-no-fading-openclose = false; # Fade windows in/out when opening/closing
-
-detect-client-opacity = true; # This prevents opacity being ignored for some apps. For example without this enabled my xfce4-notifyd is 100% opacity no matter what.
-
-#Window type settings
-wintypes:
-{
-  tooltip = { fade = true; shadow = false; };
-  menu = { shadow = false; };
-  dropdown_menu = { shadow = false; };
-  popup_menu =  { shadow = false; };
-};

home/.config/dconf.ini

@@ -1,88 +0,0 @@
-[io/github/celluloid-player/celluloid]
-dark-theme-enable=false
-mpv-config-enable=true
-mpv-config-file='file:///home/{{@@ env['USER'] @@}}/.config/mpv/mpv.conf'
-mpv-input-config-enable=true
-mpv-input-config-file='file:///home/{{@@ env['USER'] @@}}/.config/mpv/input.conf'
-settings-migrated=true
-
-[org/gnome/Connections]
-first-run=false
-
-[org/gnome/shell/weather]
-automatic-location=false
-locations=[<(uint32 2, <('Lappeenranta', 'EFLP', false, [(1.0654507804726074, 0.49128594181309354)], @a(dd) [])>)>]
-
-[org/gnome/Weather]
-locations=[<(uint32 2, <('Lappeenranta', 'EFLP', false, [(1.0654507804726074, 0.49128594181309354)], @a(dd) [])>)>]
-
-[org/gnome/shell/world-clocks]
-locations=[<(uint32 2, <('Bangkok', 'VTBD', true, [(0.24289166005364171, 1.7558012275062955)], [(0.23998277214922031, 1.754346792280731)])>)>, <(uint32 2, <('Lappeenranta', 'EFLP', true, [(1.0654507804726074, 0.49128594181309354)], [(1.065814402368968, 0.49189195503597105)])>)>]
-
-[org/gnome/clocks]
-world-clocks=[{'location': <(uint32 2, <('Bangkok', 'VTBD', true, [(0.24289166005364171, 1.7558012275062955)], [(0.23998277214922031, 1.754346792280731)])>)>}, {'location': <(uint32 2, <('Lappeenranta', 'EFLP', true, [(1.0654507804726074, 0.49128594181309354)], [(1.065814402368968, 0.49189195503597105)])>)>}]
-
-[org/gnome/desktop/a11y/mouse]
-dwell-click-enabled=false
-dwell-threshold=10
-dwell-time=1.2
-secondary-click-enabled=true
-secondary-click-time=1.2
-
-[org/gnome/desktop/calendar]
-show-weekdate=true
-
-[org/gnome/desktop/input-sources]
-show-all-sources=true
-sources=[('xkb', 'eu'), ('xkb', 'fi')]
-xkb-options=['lv3:ralt_switch']
-
-[org/gnome/desktop/peripherals/touchpad]
-tap-to-click=true
-two-finger-scrolling-enabled=true
-
-[org/gnome/desktop/privacy]
-disable-microphone=false
-old-files-age=uint32 14
-recent-files-max-age=-1
-remove-old-temp-files=true
-remove-old-trash-files=true
-
-[org/gnome/desktop/wm/keybindings]
-close=['<Super>w']
-move-to-workspace-down=['<Shift><Super>j']
-move-to-workspace-left=['<Shift><Super>h']
-move-to-workspace-right=['<Shift><Super>l']
-move-to-workspace-up=['<Shift><Super>k']
-switch-to-workspace-down=['<Super>j']
-switch-to-workspace-left=['<Super>h']
-switch-to-workspace-right=['<Super>l']
-switch-to-workspace-up=['<Super>k']
-toggle-fullscreen=@as []
-toggle-maximized=['<Super>f']
-
-[org/gnome/settings-daemon/plugins/media-keys]
-custom-keybindings=['/org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom0/']
-screensaver=['<Super>BackSpace']
-www=['<Super>b']
-volume-step=1
-
-[org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom0]
-binding='<Super>Return'
-command='kgx'
-name='Open terminal'
-
-[org/gnome/file-roller/dialogs/new]
-default-extension='.tar.zst'
-
-[org/gnome/software]
-check-timestamp=int64 1667730233
-download-updates=true
-download-updates-notify=true
-first-run=false
-
-[org/gnome/system/location]
-enabled=true
-
-[org/gnome/tweaks]
-show-extensions-notice=false

home/.config/efm-langserver/config.yaml

@@ -1,6 +0,0 @@
-languages:
-  markdown:
-    lint-command: 'yarn --cwd ~/.bin/node run markdownlint -s'
-    lint-stdin: true
-    lint-formats:
-      - '%f: %l: %m'

home/.config/electron-flags.conf

@@ -1,2 +0,0 @@
---enable-features=UseOzonePlatform
---ozone-platform=wayland

home/.config/electron12-flags.conf

@@ -1,2 +0,0 @@
---enable-features=UseOzonePlatform
---ozone-platform=wayland

home/.config/environment.d/firefox.conf

@@ -1,3 +0,0 @@
-MOZ_ENABLE_WAYLAND=1
-MOZ_USE_XINPUT2=1
-MOZ_WEBRENDER=1

home/.config/environment.d/sway.conf

@@ -1,14 +0,0 @@
-# Fix java on wayland
-_JAVA_AWT_WM_NONREPARENTING=1
-_JAVA_OPTIONS='-Dawt.useSystemAAFontSettings=on -Dswing.aatext=true -Dswing.defaultlaf=com.sun.java.swing.plaf.gtk.GTKLookAndFeel'
-
-# Enable qt5 theming and wayland support
-QT_QPA_PLATFORMTHEME=qt5ct
-QT_QPA_PLATFORM=wayland-egl
-QT_WAYLAND_DISABLE_WINDOWDECORATION=1
-
-# Fix redshift on wlroots
-WLR_DRM_NO_ATOMIC=1
-
-# Use wayland in SDL2
-SDL_VIDEODRIVER=wayland

home/.config/flashfocus/flashfocus.yml

@@ -1,8 +0,0 @@
-flash-opacity: 0.8
-default-opacity: 1
-time: 300
-simple: false
-ntimepoints: 10
-flash-on-focus: true
-flash-fullscreen: true
-flash-lone-windows: 'always'

home/.config/fontconfig/fonts.conf

@@ -1,22 +0,0 @@
-<?xml version='1.0'?>
-<!DOCTYPE fontconfig SYSTEM 'fonts.dtd'>
-<fontconfig>
-  <alias>
-    <family>sans-serif</family>
-    <prefer>
-      <family>Adwaita Sans</family>
-    </prefer>
-  </alias>
-  <alias>
-    <family>serif</family>
-    <prefer>
-      <family>Adwaita Sans</family>
-    </prefer>
-  </alias>
-  <alias>
-    <family>monospace</family>
-    <prefer>
-      <family>Adwaita mono</family>
-    </prefer>
-  </alias>
-</fontconfig>