Add subdirectory support.

README.md

@@ -7,6 +7,11 @@ code included, but it should be clearly marked as such. This license also
 doesn't cover other repositories included via git submodules - see those
 repositories for the correct licensing terms.
 
+## Subdirectories
+
+To keep things simple, dotfiles in subdirectories are deployed by replacing
+the slash in the filename with U+2571 - a unicode box drawing symbol (╱)
+
 ## Compatiblity
 
 These files are used on Linux systems most of the time. Once upon a time, the

dot.config╱git/config

@@ -0,0 +1,26 @@
+[user]
+	name = Tobias Gruetzmacher
+	email = [email protected]
+	signingkey = 0EBD3CD637B2EE85
+[color]
+	ui = auto
+[github]
+	user = TobiX
+[core]
+	pager = less
+	autocrlf = input
+[credential]
+	helper = store
+[push]
+	default = simple
+[alias]
+	akey = annex examinekey --format='.git/annex/objects/${hashdirmixed}${key}/${key}\n'
+	timeline = log --oneline --graph --decorate
+[rerere]
+	enabled = true
+[diff]
+	tool = kdiff3
+[difftool "idiff"]
+	cmd = diff -i $LOCAL $REMOTE
+[include]
+	file = ~/doc/secret/git.conf

dot.config╱git/ignore

@@ -0,0 +1,2 @@
+.*.swp
+.todo

dot.config╱pip/pip.conf

@@ -0,0 +1,2 @@
+[list]
+format=columns

dot.config╱youtube-dl/config

@@ -0,0 +1,31 @@
+#--console-title
+--output "%(title)s-%(fps)sfps-%(id)s.%(ext)s"
+--restrict-filenames
+# This makes sure to continue with the next file after one download fails
+--ignore-errors
+--netrc
+--add-metadata
+--prefer-ffmpeg
+--mark-watched
+--cookies /home/tobias/.cache/ytdl-cookies.txt
+#--write-info-json
+# For vimeo:
+#   h264-hd
+# For YouTube:
+#    37: 1080p
+#    22: 720p
+#   298: DASH 720p 60fps
+#   136: DASH 720p 30fps
+#   140: DASH AAC 128k
+# For arte.tv:
+#   720-2200-VA-STA
+#   720-2200-VO
+#   HTTP_MP4_SQ_1: mp4, 1280x720, VA-STA, Dt. Version 2200k
+# For twitch.tv:
+#   live - "Archive"
+# For ZDF Mediathek:
+#   h264_aac_mp4_http_na_na-veryhigh: mp4, 852x480, h264@1400k, aac@56k
+#   h264_aac_mp4_http_na_na-veryhigh-0: mp4, 852x480, h264@1400k, aac@56k
+# For Heise:
+#   mp4_720p
+--format "298+140/136+140/22/35/34/18/720-2200-VA-STA/720-2200-VO/HTTP_MP4_SQ_1/h264-hd/Blip HD 720/Source/live/h264_aac_mp4_http_na_na-veryhigh/h264_aac_mp4_http_na_na-veryhigh-0/mp4_720p"

dot.ssh╱config

@@ -0,0 +1,70 @@
+Include ~/doc/secret/ssh_config
+
+Host eisler*
+	HostName eisler.nettworks.org
+	User tobig
+
+Host kos-mos*
+	HostName kos-mos.fritz.box
+	Port 6451
+	ForwardX11 yes
+	Compression no
+
+Host phone
+	HostName 192.168.0.202
+	User root
+	StrictHostKeyChecking no
+	UserKnownHostsFile /dev/null
+
+Host weltarchiv*
+	User tobix
+
+Host nibbler*
+	Compression no
+
+Host hermes*
+	User root
+
+Host *gnu.org
+	User TobiG
+
+Host *.sf.net
+	User tobig
+
+Host w8n.koeln.ccc.de
+	Port 2222
+
+Host fork
+	User tobix
+
+Host ssp2*
+	Hostname ssp2.23.gs
+	Port 6451
+	User root
+
+Host play.23.gs
+	Port 6451
+	LocalForward 5900 localhost:5901
+
+Host may
+	Port 6451
+
+Host armbuild
+	Hostname 127.0.0.1
+	Port 2222
+
+Host *
+	Compression yes
+	ServerAliveInterval 30
+	ServerAliveCountMax 3
+	#ForwardX11Trusted no
+	HashKnownHosts no
+	CheckHostIP no
+	VisualHostKey yes
+	ControlMaster auto
+	ControlPath ~/.cache/ssh-master-%h-%p-%r
+	ControlPersist 1
+	PKCS11Provider /usr/lib/x86_64-linux-gnu/opensc-pkcs11.so
+	UseRoaming no
+
+# vim: set ft=sshconfig:

setup.py

@@ -1,4 +1,5 @@
 #!/usr/bin/env python3
+# -*- coding: utf-8 -*-
 # © 2017 qsuscs, TobiX
 
 import os
@@ -9,9 +10,15 @@
 exit = 0
 
 for f in glob('dot.*'):
-    dst = os.path.expanduser('~/' + f[3:])
+    dst = os.path.expanduser('~/' + f[3:].replace(u'\u2571', '/'))
     src = os.path.join(os.getcwd(), f)
     src_rel = os.path.relpath(src, os.path.dirname(dst))
+
+    try:
+        os.makedirs(os.path.dirname(dst))
+    except OSError:
+        pass
+
     try:
         os.symlink(src_rel, dst)
     except FileExistsError: