Better invid, git setups; shut up parallel

.config/git/config

@@ -17,17 +17,23 @@
     required = true
 [url "https://aur.archlinux.org/"] 
     insteadOf = "aur:" 
+    insteadOf = "a:" 
 [url "https://dev.getsol.us/source/"]
     insteadOf = "solus:"
     insteadOf = "sol:"
+    insteadOf = "s:"
 [url "https://github.com/"]
     insteadOf = "github:"
     insteadOf = "hub:"
     insteadOf = "gh:"
+    insteadOf = "h:"
+[url "https://github.com/Phantop/"]
+    insteadOf = "p:"
 [url "https://gitlab.com/"]
     insteadOf = "gitlab:"
     insteadOf = "lab:"
     insteadOf = "gl:"
+    insteadOf = "l:"
 [url "https://git.sr.ht"]
     insteadOf = "https://sr.ht"
 [color]
@@ -38,7 +44,7 @@
     b = branch
     c = commit
     ca = commit --amend
-    caa = commit --amend -a
+    caa = ca -a
     ch = checkout
     cl = gc --aggressive --prune=now
     g = clone

.config/invid.yml

@@ -0,0 +1,33 @@
+services:
+  postgres:
+    image: postgres:10
+    restart: unless-stopped
+    volumes:
+      - postgresdata:/var/lib/postgresql/data
+    environment:
+      POSTGRES_DB: invidious
+      POSTGRES_USER: kemal
+      POSTGRES_PASSWORD: kemal
+    healthcheck:
+      test: ["CMD-SHELL", "pg_isready -U $$POSTGRES_USER"]
+  invidious:
+    image: quay.io/invidious/invidious:latest
+    ports:
+      - "127.0.0.1:3000:3000"
+    environment:
+      INVIDIOUS_CONFIG: |
+        channel_threads: 4
+        check_tables: true
+        feed_threads: 4
+        db:
+          dbname: invidious
+          user: kemal
+          password: kemal
+          host: postgres
+          port: 5432
+        full_refresh: false
+        https_only: false
+    depends_on:
+      - postgres
+volumes:
+  postgresdata:

.config/qutebrowser/redirects.py

@@ -1,10 +1,13 @@
 from qutebrowser.api import interceptor
-import operator, typing
+import operator, typing, socket
 
 invid = 'vid.puffyan.us'
 nitter = 'nitter.snopyta.org'
 reddit = 'teddit.net'
 
+if socket.gethostname() == "aperture":
+    invid = 'localhost'
+
 o = operator.methodcaller
 s = 'setHost'
 i = interceptor

.local/bin/aliases

@@ -25,6 +25,7 @@ a open rifle
 a pagedl 'wget -H -k -p --no-clobber -e robots=off'
 a png2webp 'fd -e png -x cwebp -z 9 -mt {} -o {.}.webp && fd -e png -x rm'
 a qutainer 'qutebrowser -B /tmp'
+a rmdirs 'ff -t d -x rmdir -p'
 a rmlinks 'ff -t l -x rm'
 a qb 'qutebrowser --target auto'
 a re 'systemctl reboot -i'
@@ -39,7 +40,7 @@ a wallp 'gsettings set org.gnome.desktop.background picture-uri file://(realpath
 a wm 'startx (which $argv[1]; set -e argv[1])'
 
 a ao3 'egrep works/[0-9]+ $argv -o | uniq | tr -d a-z | parallel aria2c "https://ao3.org/downloads{}/\*.epub" -d ao3; rm'
-a invid 'tmux new -s 0 -d "cd ~/.invid; git pull; docker-compose up --build"'
+a invid 'tmux new -s 0 -d "docker-compose -f ~/.config/invid.yml up --build"'
 a launcher 'rofi -combi-modi "drun,run" -show combi -modi "combi,window"'
 a listen 'pactl list | grep loop && pactl unload-module module-loopback || pactl load-module module-loopback'
 a symlinks 'fd -td -d1 . $D -x  sh -c "rm ~/{/}; rmdir ~/{/}; ln -s {} ~/{/}"'

.local/bin/setup

@@ -0,0 +1,45 @@
+#!/bin/bash
+gnome=$(eval echo eog evolution-data-server file-roller gnome-{calendar,photos,mpv,terminal} nautilus onboard rhythmbox)
+sudo eopkg rm -y celluloid firefox $gnome hexchat libreoffice-common thunderbird transmission
+
+audio="audacious audacious-plugins audacity opus-tools quodlibet spek"
+dev="ccache docker-compose git-extras llvm-clang neovim parallel solbuild tig upx"
+gui="abiword bleachbit caja gmic-gimp engrampa keepassx kitty lutris vorta"
+media="avidemux gaupol jpegoptim mpv playerctl rsync usbmuxd viewnior zathura-poppler"
+rice="adapta-gtk-theme ant-dracula-gtk-theme font-ubuntu-ttf rofi starship stow"
+term="advancecomp autojump fd fish fzf innoextract most ncdu p7zip ranger ripgrep rsync tmux"
+sys="corectrl ifuse linux-tools-cpupower tlp"
+web="arcanist aria2 deluge nicotine-plus qutebrowser openssh-server subliminal"
+
+sudo eopkg up -y
+sudo eopkg it -y -c system.devel $audio $dev $gui $media $rice $sys $term $web
+
+echo 'source ~/.config/bashrc' > .bashrc
+fd -E .git -t d -H -x mkdir -p ~/{}
+stow -d ~/.dotfiles -t ~ .
+
+mkdir -p ~/.config/mpv/shaders ~/.local/share/qutebrowser/pdfjs ~/.parallel/will-cite
+un(){ F=$(mktemp); curl https://api.github.com/repos/$1/releases | grep -om1 http.\*zip | wget -i- -O$F; unzip $F -d $2;}
+
+un bloc97/Anime4k ~/.config/mpv/shaders
+un mozilla/pdf.js ~/.local/share/qutebrowser/pdfjs
+
+git g gh:junegunn/vim-plug ~/.config/nvim/autoload
+nvim +PlugUpdate +q +q
+
+parallel pip3 install -U ::: adblock pipipxx readability-lxml sh
+parallel pipx install ::: deemix soundscrape tldr
+
+sudo eopkg rm -y --ignore-dependency tracker
+sudo systemctl mask tracker-{store,miner-fs,miner-rss,extra,miner-apps,writeback}
+
+sudo systemctl enable --now docker
+sudo usermod -aG docker $USER
+
+git g p:appdwarf ~/.appdwarf
+git g p:haiku-icons ~/.local/share/icons/Haiku
+git g p:phantop.github.io ~/.site
+git g p:solus-stuff ~/.solus
+
+chsh -s /usr/bin/fish
+fish -c "aliases;clean"

.setup

@@ -1,46 +0,0 @@
-#!/bin/bash
-gnome=$(eval echo eog evolution-data-server file-roller gnome-{calendar,photos,mpv,terminal} nautilus onboard rhythmbox)
-sudo eopkg rm -y celluloid firefox $gnome hexchat libreoffice-common thunderbird transmission
-
-sudo eopkg up -y
-sudo eopkg it -y -c system.devel
-
-audio="audacious audacious-plugins audacity opus-tools quodlibet spek"
-dev="ccache docker-compose git-extras llvm-clang neovim parallel solbuild tig upx"
-gui="abiword bleachbit caja gmic-gimp engrampa ifuse keepassx kitty lutris vorta"
-media="avidemux gaupol jpegoptim mpv playerctl rsync usbmuxd viewnior zathura-poppler"
-rice="adapta-gtk-theme ant-dracula-gtk-theme font-ubuntu-ttf rofi starship stow"
-term="advancecomp autojump fd fish fzf innoextract most ncdu p7zip ranger ripgrep rsync tmux"
-sys="linux-tools-cpupower tlp"
-web="arcanist aria2 deluge nicotine-plus qutebrowser openssh-server speedtest-cli subliminal"
-
-sudo eopkg it -y $audio $dev $gui $media $rice $sys $term $web
-sudo eopkg rm -y --ignore-dependency tracker
-parallel pip3 install -U ::: adblock pipipxx readability-lxml sh
-parallel pipx install ::: deemix soundscrape tldr
-
-rm ~/.bashrc
-cd ~/.dotfiles
-fd -E .git -t d -H -x mkdir -p ~/{}
-stow .
-
-mkdir -p ~/.config/mpv/shaders ~/.local/share/qutebrowser/pdfjs ~/.config/nvim/autoload/
-un(){ F=$(mktemp); curl https://api.github.com/repos/$1/releases | grep -om1 http.\*zip | wget -i- -O$F; unzip $F -d $2;}
-un bloc97/Anime4k ~/.config/mpv/shaders; un mozilla/pdf.js ~/.local/share/qutebrowser/pdfjs
-
-wget https://github.com/junegunn/vim-plug/raw/master/plug.vim -O ~/.config/nvim/autoload/plug.vim
-nvim +PlugUpdate +q +q
-
-sudo systemctl mask tracker-{store,miner-fs,miner-rss,extra,miner-apps,writeback}
-sudo usermod -aG docker $USER
-sudo systemctl enable --now docker tor
-chsh -s /usr/bin/fish
-
-git g gh:iv-org/invidious ~/.invid
-git g gh:Phantop/appdwarf ~/.appdwarf
-git g gh:Phantop/haiku-icons ~/.local/share/icons/Haiku
-git g gh:Phantop/phantop.github.io ~/.site
-git g gh:Phantop/solus-stuff ~/.solus
-
-cd ~/.solus && git update-index --assume-unchanged packager
-fish -c "aliases;clean"

.setup

@@ -0,0 +1 @@
+.local/bin/setup