git: Use "master" as default branch

_machines/ares.yml

@@ -8,7 +8,7 @@ users:
 - name: hannes
   vt: 1
   firefox_profiles:
-    - name: lu9k8ywl.default
+    - name: 7kqv7aco.default-release
       manage_css: true
   mail: hannes@hkoerber.de
   git_gpg_sign: false
@@ -19,16 +19,16 @@ users:
     MACHINE_HAS_NEXTCLOUD: "true"
 
 screen:
-  1: eDP-1
+  1: DisplayPort-0
-  2: eDP-1
+  2: DisplayPort-0
-  3: eDP-1
+  3: DisplayPort-0
-  4: eDP-1
+  4: DisplayPort-0
-  5: eDP-1
+  5: DisplayPort-0
-  6: eDP-1
+  6: DisplayPort-0
-  7: eDP-1
+  7: DisplayPort-0
-  8: eDP-1
+  8: DisplayPort-0
-  9: eDP-1
+  9: DisplayPort-0
-  0: eDP-1
+  0: DisplayPort-0
 
 workspace:
 

alacritty/alacritty.yml.j2

@@ -251,7 +251,7 @@ colors:
 # The value `0.0` is completely transparent and `1.0` is opaque.
 #background_opacity: 1.0
 
-#selection:
+selection:
   # This string contains all characters that are used as separators for
   # "semantic words" in Alacritty.
   #semantic_escape_chars: ",│`|:\"' ()[]{}<>\t"

autostart/services/autostart.target

@@ -8,6 +8,7 @@ Wants=dpms.service
 Wants=dunst.service
 Wants=firefox.service
 Wants=gpg-agent.service
+Wants=gnome-keyring.service
 Wants=keepassx.service
 Wants=keyboard.service
 Wants=laptop-lid.service

autostart/services/gnome-keyring.service

@@ -0,0 +1,6 @@
+[Unit]
+BindsTo=autostart.target
+After=windowmanager.target
+
+[Service]
+ExecStart=/usr/bin/env gnome-keyring-daemon --start --foreground --components secrets

autostart/services/nextcloud.service

@@ -1,6 +1,7 @@
 [Unit]
 BindsTo=autostart.target
 After=windowmanager.target
+After=gnome-keyring.service
 
 ConditionEnvironment=MACHINE_HAS_NEXTCLOUD=true
 

bin/markdown-to-pdf

@@ -0,0 +1,53 @@
+#!/usr/bin/env bash
+
+set -o nounset
+
+usage() {
+    cat <<EOF >&2
+$0 <input file> <output file>
+EOF
+}
+
+if (( $# != 2 )) ; then
+    usage
+    exit 1
+fi
+
+markdown_extensions=(
+    blank_before_header
+    space_in_atx_header
+    blank_before_blockquote
+    yaml_metadata_block
+    backtick_code_blocks
+    fancy_lists
+    native_divs
+    fenced_divs
+    task_lists
+    pipe_tables
+)
+
+function join_by { local d=$1; shift; local f=$1; shift; printf %s "$f" "${@/#/$d}"; }
+
+pandoc \
+    --from markdown+"$(join_by "+" "${markdown_extensions[@]}")"\
+    --to pdf \
+    --verbose \
+    --email-obfuscation=none \
+    --columns=2000 \
+    --fail-if-warnings \
+    --standalone \
+    --variable tables=true \
+    --variable euro=yes \
+    --variable colorlinks=yes \
+    --variable linestretch=1.3 \
+    --variable papersize=a4 \
+    --variable date=$(date --iso-8601=date) \
+    --variable fontsize=12pt \
+    --variable fontfamily=libertine \
+    --variable familydefault=sfdefault \
+    --variable documentclass=scrartcl \
+    --variable fontfamilyoptions= \
+    --variable lof= \
+    --variable lot= \
+    -i "${1}" \
+    --output "${2}" \

bin/mypass

@@ -43,7 +43,7 @@ def cmd_get(*args):
         print(get_stdout(['pass', 'show', args[0]]).split(b'\n')[0].decode())
         return 0
 
-    if len(args) != 2:
+    if len(args) < 2:
         print("what do you want to get?")
         return 1
 
@@ -62,7 +62,8 @@ def cmd_get(*args):
         print("invalid YAML data, not a dict")
         return 2
 
-    keydata = extract_from_dict(data, args[1])
+    for element in args[1:]:
+        keydata = extract_from_dict(data, element)
         if isinstance(keydata, list) or isinstance(keydata, dict):
             print(yaml.safe_dump(keydata, default_flow_style=False).strip())
         else:

bin/tasktrack

@@ -0,0 +1,6 @@
+#!/usr/bin/env bash
+
+set -o errexit
+cd $HOME/sync/projects/time-tracking
+source venv/bin/activate
+./call.py "${@}"

dotfiles.yml

@@ -66,3 +66,5 @@ dotfiles:
     to: .config/qt5ct/qt5ct.conf
   - from: screencfg
     to: .screencfg
+  - from: scripts
+    to: scripts

git/gitconfig.j2

@@ -116,3 +116,6 @@
 
 [url "ssh://git@code.hkoerber.de:2222/"]
     insteadOf = https://code.hkoerber.de/
+
+[init]
+	defaultBranch = master

gnupg/gpg-agent.conf

@@ -6,4 +6,4 @@ max-cache-ttl-ssh 34560000
 
 enable-ssh-support
 
-pinentry-program /usr/bin/pinentry-curses
+pinentry-program /usr/bin/pinentry-qt

i3/config.j2

@@ -109,9 +109,20 @@ workspace $workspace8 output {{ machine.screen.8 }}
 workspace $workspace9 output {{ machine.screen.9 }}
 workspace $workspace10 output {{ machine.screen.0 }}
 
+
 assign [class="^Keepassx$"] $workspace8
+
+# See https://github.com/i3/i3/issues/2060
+for_window [class="^Spotify$"] move to workspace $workspace9
 assign [class="^Spotify$"] $workspace9
+
 assign [class="^Google-chrome$"] $workspace7
+assign [class="^Chromium$"] $workspace7
+assign [class="^discord"] $workspace7
+assign [class="^Steam"] $workspace5
+
+assign [class="^dota2$"] $workspace10
+assign [class="^Wine$"] $workspace10
 
 ################################################################################
 ### KEYBINDINGS ################################################################

i3/scripts/i3exit

@@ -19,11 +19,11 @@ lock()
 {
     set -x
     playing=0
-    if [[ "$(playerctl status)" == "Playing" ]] ; then
+    if [[ "$(playerctl -p spotify status)" == "Playing" ]] ; then
         playing=1
     fi
     if (( $playing )) ; then
-        playerctl pause
+        playerctl -p spotify pause
     fi
 
     if [[ -f "$LOCKSCREEN" ]] ; then
@@ -37,7 +37,7 @@ lock()
             --color "$_fallback_color"
     fi
     if (( $playing )) ; then
-        playerctl play
+        playerctl -p spotify play
     fi
 }
 

i3/scripts/spotify-control

@@ -16,5 +16,5 @@ previous)
     ;;
 esac
 
-playerctl "${cmd}"
+playerctl -p spotify "${cmd}"
 ~/.i3/scripts/bar-update spotify

packages.yml

@@ -168,7 +168,7 @@ packages:
     pass:
       fedora: ["pass"]
       ubuntu: ["pass"]
-      archlinux: ["pass"]
+      archlinux: ["pass", "passff-host"]
     keepassx:
       fedora: ["keepassx"]
       ubuntu: ["keepassx"]
@@ -200,7 +200,7 @@ packages:
     pandoc:
       fedora: ["pandoc"]
       ubuntu: ["pandoc"]
-      archlinux: ["pandoc"]
+      archlinux: ["pandoc", "texlive-core", "texlive-fontsextra", "texlive-latexextra"]
     libvirt:
       fedora: ["virt-manager", "libvirt-client"]
       ubuntu: ["virt-manager", "libvirt-bin"]
@@ -497,6 +497,10 @@ packages:
       fedora: []
       ubuntu: []
       archlinux: ["mpv"]
+    gnome-keyring:
+      fedora: []
+      ubuntu: []
+      archlinux: ["gnome-keyring"]
 
   remove:
     mousepad:

scripts/fix-aoe2.sh

@@ -0,0 +1,12 @@
+#!/usr/bin/env bash
+
+cd $(mktemp -d)
+
+wget "https://aka.ms/vs/16/release/vc_redist.x64.exe"
+
+cabextract vc_redist.x64.exe
+
+cabextract a10
+
+rm /var/games/steamapps/compatdata/813780/pfx/drive_c/windows/system32/ucrtbase.dll
+cp ucrtbase.dll -t /var/games/steamapps/compatdata/813780/pfx/drive_c/windows/system32

scripts/install-gothic.sh

@@ -0,0 +1,54 @@
+#!/usr/bin/env bash
+
+read -p "Make sure that gothic was installed via Steam! <Enter> to continue, <CTRL+C> to abort "
+
+set -o nounset
+set -o xtrace
+set -o errexit
+
+downloaddir=~/download/gothic
+
+mkdir -p "${downloaddir}"
+cd "${downloaddir}"
+
+curl -L -o gothic_patch_108k.exe "https://www.worldofgothic.de/download.php?id=15"
+curl -L -o gothic1_playerkit-1.08k.exe "https://www.worldofgothic.de/download.php?id=61"
+curl -L -o Definitive_Edition_1_4_2.exe "https://www.worldofgothic.de/download.php?id=1586"
+curl -L -O https://github.com/GothicFixTeam/GothicFix/releases/download/v1.8/G1Classic-SystemPack-1.8.exe
+curl -L -O https://github.com/GothicFixTeam/GothicFix/releases/download/v1.8/Gothic1_PlayerKit-2.8.exe
+
+read -p "During installation, use \"Z:\\var\\games\\steamapps\\common\\Gothic\\\" as the install directory! <Enter> to continue, <CTRL+C> to abort "
+
+export WINEPREFIX=/var/games/steamapps/compatdata/65540/pfx/
+
+wine "${downloaddir}"/gothic1_playerkit-1.08k.exe
+wine "${downloaddir}"/Gothic1_PlayerKit-2.8.exe
+wine "${downloaddir}"/G1Classic-SystemPack-1.8.exe
+wine "${downloaddir}"/Definitive_Edition_1_4_2.exe
+
+read -p "Now run the game once and exit! <Enter> to continue, <CTRL+C> to abort "
+
+cd /var/games/steamapps/common/Gothic
+
+sed -i 's/^playLogoVideos=.*$/playLogoVideos=0\r/' system/Gothic.ini
+sed -i 's/^sightValue=.*$/sightValue=14\r/' system/Gothic.ini
+sed -i 's/^modelDetail=.*$/modelDetail=1\r/' system/Gothic.ini
+sed -i 's/^subTitles=.*$/subTitles=0\r/' system/Gothic.ini
+sed -i 's/^bloodDetail=.*$/bloodDetail=3\r/' system/Gothic.ini
+sed -i 's/^zVidResFullscreenX=.*$/zVidResFullscreenX=2560\r/' system/Gothic.ini
+sed -i 's/^zVidResFullscreenY=.*$/zVidResFullscreenY=1440\r/' system/Gothic.ini
+
+sed -i 's/^SimpleWindow=.*$/SimpleWindow=0\r/' system/SystemPack.ini
+sed -i 's/^Gothic2_Control=.*$/Gothic2_Control=1\r/' system/SystemPack.ini
+sed -i 's/^USInternationalKeyboardLayout=.*$/USInternationalKeyboardLayout=0\r/' system/SystemPack.ini
+sed -i 's/^FPS_Limit=.*$/FPS_Limit=144\r/' system/SystemPack.ini
+sed -i 's/^VerticalFOV=.*$/VerticalFOV=50.625\r/' system/SystemPack.ini
+
+sed -i 's/^OutDoorPortalDistanceMultiplier=.*$/OutDoorPortalDistanceMultiplier=3\r/' system/SystemPack.ini
+sed -i 's/^InDoorPortalDistanceMultiplier=.*$/InDoorPortalDistanceMultiplier=3\r/' system/SystemPack.ini
+sed -i 's/^WoodPortalDistanceMultiplier=.*$/WoodPortalDistanceMultiplier=3\r/' system/SystemPack.ini
+sed -i 's/^DrawDistanceMultiplier=.*$/DrawDistanceMultiplier=3\r/' system/SystemPack.ini
+
+sed -i 's/^HideFocus=.*$/HideFocus=0\r/' system/SystemPack.ini
+
+sed -i 's/^Scale=.*$/Scale=1.9\r/' system/SystemPack.ini

user.yml

@@ -351,7 +351,7 @@
 - block:
   - name: set portfolio performance version
     set_fact:
-      portfolio_performace_version: "0.49.4"
+      portfolio_performace_version: "0.50.0"
 
   - name: look of current installation
     stat:

vim/vimrc

@@ -42,7 +42,7 @@ Plug 'scrooloose/nerdtree'
 "Plugin 'wincent/Command-T'
 Plug 'vimwiki/vimwiki'
 "Plug 'blindFS/vim-taskwarrior'
-Plug 'tbabej/taskwiki'
+" Plug 'tbabej/taskwiki'
 Plug 'rodjek/vim-puppet'
 Plug 'suan/vim-instant-markdown'
 "Plug 'marshallward/vim-restructuredtext'