aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xbin/nginx-here2
-rw-r--r--cache/.gitignore (renamed from vim/backup/.gitignore)0
-rw-r--r--cache/vim/swp/.gitignore (renamed from vim/plugged/.gitignore)0
-rw-r--r--config/firefox/chrome/userChrome.css (renamed from userChrome.css)0
-rw-r--r--config/firefox/my-umatrix-rules.txt129
-rw-r--r--config/firefox/user.js (renamed from user.js)6
-rw-r--r--config/fontconfig/fonts.conf (renamed from fonts.conf)0
-rw-r--r--config/git/config (renamed from gitconfig)8
-rw-r--r--config/git/ignore (renamed from gitignore_global)2
-rw-r--r--config/gtk-2.0/gtkrc-2.0 (renamed from gtkrc-2.0)1
-rw-r--r--config/gtk-3.0/gtk.css (renamed from gtk-3.0/gtk.css)0
-rw-r--r--config/gtk-3.0/settings.ini (renamed from gtk-3.0/settings.ini)23
-rw-r--r--config/ksh/kshrc (renamed from kshrc)1
-rw-r--r--config/mblaze/.gitignore1
-rw-r--r--config/mblaze/filter4
-rw-r--r--config/mblaze/profile2
l---------config/mblaze/seq1
-rw-r--r--config/mksh/mkshrc21
-rw-r--r--config/mpv/mpv.conf8
l---------config/mpv/watch_later1
-rw-r--r--config/readline/inputrc (renamed from inputrc)0
-rw-r--r--config/sh/aliases (renamed from aliases)7
-rw-r--r--config/sh/profile42
l---------config/ssh/authorized_keys1
-rw-r--r--config/ssh/config (renamed from ssh/config)0
l---------config/ssh/id_ed255191
l---------config/ssh/id_ed25519.pub1
l---------config/ssh/id_rsa1
l---------config/ssh/id_rsa.pub1
l---------config/ssh/known_hosts1
l---------config/ssh/known_hosts21
-rw-r--r--config/tmux/tmux.conf (renamed from tmux.conf)0
-rw-r--r--config/vim/colors/shblah.vim (renamed from vim/colors/shblah.vim)0
-rw-r--r--config/vim/pack/plugins/start/vim-commentary/.gitignore (renamed from vim/pack/plugins/start/vim-commentary/.gitignore)0
-rw-r--r--config/vim/pack/plugins/start/vim-commentary/CONTRIBUTING.markdown (renamed from vim/pack/plugins/start/vim-commentary/CONTRIBUTING.markdown)0
-rw-r--r--config/vim/pack/plugins/start/vim-commentary/README.markdown (renamed from vim/pack/plugins/start/vim-commentary/README.markdown)0
-rw-r--r--config/vim/pack/plugins/start/vim-commentary/doc/commentary.txt (renamed from vim/pack/plugins/start/vim-commentary/doc/commentary.txt)0
-rw-r--r--config/vim/pack/plugins/start/vim-commentary/plugin/commentary.vim (renamed from vim/pack/plugins/start/vim-commentary/plugin/commentary.vim)0
-rw-r--r--config/vim/pack/plugins/start/vim-surround/.gitignore (renamed from vim/pack/plugins/start/vim-surround/.gitignore)0
-rw-r--r--config/vim/pack/plugins/start/vim-surround/README.markdown (renamed from vim/pack/plugins/start/vim-surround/README.markdown)0
-rw-r--r--config/vim/pack/plugins/start/vim-surround/doc/surround.txt (renamed from vim/pack/plugins/start/vim-surround/doc/surround.txt)0
-rw-r--r--config/vim/pack/plugins/start/vim-surround/plugin/surround.vim (renamed from vim/pack/plugins/start/vim-surround/plugin/surround.vim)0
-rw-r--r--config/vim/vimrc (renamed from vimrc)17
-rw-r--r--config/xorg/Xresources (renamed from Xresources)0
-rw-r--r--config/xorg/us-intl-german.xmodmap (renamed from us-intl-german.xmodmap)0
-rw-r--r--config/xorg/xinitrc (renamed from xinitrc)21
-rw-r--r--config/yash/completion/doas26
-rw-r--r--config/yash/completion/xbps (renamed from yashrc)114
-rw-r--r--config/yash/yashrc84
-rw-r--r--data/mblaze/.gitignore (renamed from vim/swp/.gitignore)0
-rw-r--r--data/mpv/watch_later/.gitignore (renamed from vim/undo/.gitignore)0
-rw-r--r--data/ssh/.gitignore2
-rw-r--r--data/vim/.gitignore2
-rw-r--r--data/vim/backup/.gitignore2
-rw-r--r--data/vim/undo/.gitignore2
-rw-r--r--install-new.sh63
-rwxr-xr-xinstall-root.sh5
-rw-r--r--mkshrc35
-rw-r--r--my-umatrix-rules.txt47
-rw-r--r--notes.md38
-rw-r--r--profile27
l---------service.x/cwm1
l---------service.x/nclttr1
l---------service.x/statusbar1
l---------service.x/unclutter1
l---------service.x/vbox-win1
l---------service/syncthing1
-rwxr-xr-xsv/nclttr/run3
l---------sv/nclttr/supervise1
-rwxr-xr-xsv/runsvdir-duncan/run5
-rwxr-xr-xsv/ssh-agent/finish3
-rwxr-xr-xsv/ssh-agent/run4
72 files changed, 465 insertions, 308 deletions
diff --git a/bin/nginx-here b/bin/nginx-here
index cff1001..ae84861 100755
--- a/bin/nginx-here
+++ b/bin/nginx-here
@@ -7,7 +7,7 @@ PORT=${2:-8080}
mkdir -p /tmp/.nginx-here.$$
cat >/tmp/.nginx-here.$$/cfg <<EOF
worker_processes 1;
-error_log "/dev/stdout";
+error_log "/dev/stderr";
daemon off;
pid "/tmp/.nginx-here.$$/pid";
events {
diff --git a/vim/backup/.gitignore b/cache/.gitignore
index d6b7ef3..d6b7ef3 100644
--- a/vim/backup/.gitignore
+++ b/cache/.gitignore
diff --git a/vim/plugged/.gitignore b/cache/vim/swp/.gitignore
index d6b7ef3..d6b7ef3 100644
--- a/vim/plugged/.gitignore
+++ b/cache/vim/swp/.gitignore
diff --git a/userChrome.css b/config/firefox/chrome/userChrome.css
index 566d32d..566d32d 100644
--- a/userChrome.css
+++ b/config/firefox/chrome/userChrome.css
diff --git a/config/firefox/my-umatrix-rules.txt b/config/firefox/my-umatrix-rules.txt
new file mode 100644
index 0000000..df06b2a
--- /dev/null
+++ b/config/firefox/my-umatrix-rules.txt
@@ -0,0 +1,129 @@
+https-strict: behind-the-scene false
+matrix-off: about-scheme true
+matrix-off: behind-the-scene true
+matrix-off: chrome-extension-scheme true
+matrix-off: chrome-scheme true
+matrix-off: clangformat.com true
+matrix-off: facebook.com true
+matrix-off: googleblog.com true
+matrix-off: localhost true
+matrix-off: moz-extension-scheme true
+matrix-off: nightdev.com true
+matrix-off: opera-scheme true
+matrix-off: vivaldi-scheme true
+matrix-off: wyciwyg-scheme true
+matrix-off: youtube.com true
+noscript-spoof: * true
+referrer-spoof: * true
+referrer-spoof: behind-the-scene false
+referrer-spoof: strato.de false
+referrer-spoof: twitter.com false
+referrer-spoof: youtube.com false
+* * * block
+* * css allow
+* * frame block
+* * image allow
+* 1st-party * allow
+* 1st-party frame allow
+amazon.de images-eu.ssl-images-amazon.com script allow
+amazon.de images-na.ssl-images-amazon.com script allow
+amazon.de m.media-amazon.com script allow
+arte.tv akamaihd.net xhr allow
+arte.tv jwpcdn.com script allow
+arte.tv jwpcdn.com xhr allow
+arte.tv jwplayer.com xhr allow
+atlassian.com aid-frontend.prod.atl-paas.net script allow
+bild.de code.bildstatic.de script allow
+bitbucket.org d301sr5gafysq2.cloudfront.net script allow
+digitalocean.com cdnjs.cloudflare.com script allow
+digitalocean.com cloud-cdn-digitalocean-com.global.ssl.fastly.net script allow
+discordapp.com discord.media xhr allow
+discordapp.com discordapp.net cookie allow
+discordapp.com gateway.discord.gg xhr allow
+discordapp.com images-ext-2.discordapp.net media allow
+dlive.tv mncdn.com xhr allow
+duolingo.com d1vq87e9lcf771.cloudfront.net * allow
+duolingo.com d35aaqx5ub95lt.cloudfront.net * allow
+duolingo.com d7mj4aqfscim2.cloudfront.net * allow
+file-scheme mobile.twitter.com frame allow
+gfycat.com cdn.ampproject.org script allow
+github.com github.githubassets.com script allow
+github.com raw.githubusercontent.com * allow
+github.com render.githubusercontent.com * allow
+github.com render.githubusercontent.com frame allow
+gitlab.com assets.gitlab-static.net script allow
+google.com accounts.youtube.com frame allow
+google.com accounts.youtube.com script allow
+google.com content.googleapis.com frame allow
+google.com ssl.gstatic.com script allow
+google.com ssl.gstatic.com xhr allow
+google.com www.gstatic.com xhr allow
+google.com youtube.googleapis.com frame allow
+gyazo.com cdnjs.cloudflare.com script allow
+iceposeidon.com ajax.cloudflare.com script allow
+imgur.com cdnjs.cloudflare.com script allow
+instagram.com cdninstagram.com * allow
+instagram.com instagramstatic-a.akamaihd.net script allow
+instagram.com scontent-waw1-1.cdninstagram.com media allow
+oddshot.tv oddshot.akamaized.net script allow
+op.gg djtflbt20bdde.cloudfront.net script allow
+op.gg opgg-cdn.akamaized.net script allow
+op.gg opgg-static.akamaized.net script allow
+openfoodfacts.org cdnjs.cloudflare.com script allow
+prnt.sc prntscr.com frame allow
+prnt.sc prntscr.com script allow
+reddit.com clips-media-assets2.twitch.tv media allow
+reddit.com clips.twitch.tv frame allow
+reddit.com clips.twitch.tv script allow
+reddit.com g.redditmedia.com media allow
+reddit.com gfycat.com * allow
+reddit.com giant.gfycat.com media allow
+reddit.com i.imgur.com media allow
+reddit.com player.twitch.tv script allow
+reddit.com preview.redd.it media allow
+reddit.com twitch.tv xhr allow
+reddit.com v.redd.it media allow
+reddit.com v.redd.it xhr allow
+reddit.com www.redditstatic.com script allow
+soundcloud.com sndcdn.com * allow
+speedtest.net * * allow
+stackexchange.com ajax.googleapis.com script allow
+stackexchange.com cdn.sstatic.net script allow
+steamcommunity.com steamcommunity-a.akamaihd.net script allow
+travis-ci.org s3.amazonaws.com xhr allow
+travis-ci.org ws.pusherapp.com other allow
+twitch.tv akamaized.net * allow
+twitch.tv algolia.net xhr allow
+twitch.tv betterttv.net * allow
+twitch.tv ext-twitch.tv frame allow
+twitch.tv ext-twitch.tv script allow
+twitch.tv manage.betterttv.net frame allow
+twitch.tv static.twitchcdn.net script allow
+twitch.tv static.twitchcdn.net xhr allow
+twitch.tv ttvnw.net * allow
+twitter.com ma-0.twimg.com script allow
+twitter.com ton.twimg.com script allow
+twitter.com twimg.com script allow
+twitter.com twimg.com xhr allow
+twitter.com video.twimg.com media allow
+twitter.com video.twimg.com other allow
+twitter.com video.twimg.com xhr allow
+typing.academy ajax.googleapis.com script allow
+utrace.de maps.google.com script allow
+utrace.de maps.googleapis.com script allow
+vimeo.com f.vimeocdn.com script allow
+vimeo.com fpdl.vimeocdn.com other allow
+vimeo.com vimeocdn.com * allow
+vultr.com www.google.com cookie allow
+vultr.com www.google.com frame allow
+vultr.com www.google.com script allow
+vultr.com www.google.com xhr allow
+vultr.com www.gstatic.com script allow
+youtube-nocookie.com googlevideo.com xhr allow
+youtube-nocookie.com ytimg.com script allow
+youtube.com apis.google.com script allow
+youtube.com googlevideo.com * allow
+youtube.com s.ytimg.com script allow
+youtube.com www.google.com script allow
+youtube.com ytimg.com * allow
+zalando.de ztat.net script allow
diff --git a/user.js b/config/firefox/user.js
index 08093f4..808076e 100644
--- a/user.js
+++ b/config/firefox/user.js
@@ -122,9 +122,9 @@ user_pref('geo.enabled', false);
user_pref('geo.wifi.logging.enabled', false);
user_pref('geo.wifi.uri', '');
-user_pref('javascript.options.asmjs', false);
-user_pref('javascript.options.wasm', false);
+// user_pref('javascript.options.asmjs', false);
+// user_pref('javascript.options.wasm', false);
-user_pref('webgl.disabled', true);
+// user_pref('webgl.disabled', true);
user_pref('toolkit.cosmeticAnimations.enabled', false);
diff --git a/fonts.conf b/config/fontconfig/fonts.conf
index 8585031..8585031 100644
--- a/fonts.conf
+++ b/config/fontconfig/fonts.conf
diff --git a/gitconfig b/config/git/config
index 3eafa20..b46f8bc 100644
--- a/gitconfig
+++ b/config/git/config
@@ -1,16 +1,14 @@
[user]
email = mail@duncano.de
- name = Duncaen
+ name = Duncan Overbruck
[alias]
l = log --pretty='format:%h %s%d' -n 20 --graph
tags = tag -l
branches = branch -a
remotes = remote -v
-
-[core]
- pager = less -r
- excludesfile = /home/duncan/.gitignore_global
+ s = status -sb
+ ss = s -uno
[color]
ui = false
diff --git a/gitignore_global b/config/git/ignore
index 07d94cc..36169d7 100644
--- a/gitignore_global
+++ b/config/git/ignore
@@ -1 +1,3 @@
.ropeproject/
+*.gcno
+*.gcda
diff --git a/gtkrc-2.0 b/config/gtk-2.0/gtkrc-2.0
index 3c293d4..8d7efe2 100644
--- a/gtkrc-2.0
+++ b/config/gtk-2.0/gtkrc-2.0
@@ -1,4 +1,3 @@
-gtk-icon-theme-name="Paper"
gtk-font-name="Liberation Sans 9"
gtk-toolbar-style=GTK_TOOLBAR_ICONS
gtk-toolbar-icon-size=GTK_ICON_SIZE_SMALL_TOOLBAR
diff --git a/gtk-3.0/gtk.css b/config/gtk-3.0/gtk.css
index 0f4ff8f..0f4ff8f 100644
--- a/gtk-3.0/gtk.css
+++ b/config/gtk-3.0/gtk.css
diff --git a/gtk-3.0/settings.ini b/config/gtk-3.0/settings.ini
index 593b2bd..7c33f3e 100644
--- a/gtk-3.0/settings.ini
+++ b/config/gtk-3.0/settings.ini
@@ -1,26 +1,19 @@
[Settings]
+gtk-button-images=0
gtk-cursor-theme-name=plan9
gtk-cursor-theme-size=0
-
-gtk-toolbar-style=GTK_TOOLBAR_ICONS
-gtk-toolbar-icon-size=GTK_ICON_SIZE_SMALL_TOOLBAR
-
-gtk-icon-theme-name=Paper
-gtk-font-name=Liberation Sans 9
-
gtk-decoration-layout=menu:
-gtk-button-images=0
-gtk-menu-images=0
-gtk-menu-popup-delay=0
-
-gtk-primary-button-warps-slider=0
-
gtk-enable-animations=0
gtk-enable-event-sounds=0
gtk-enable-input-feedback-sounds=0
-
+gtk-font-name=Liberation Sans 9
+gtk-menu-images=0
+gtk-menu-popup-delay=0
+gtk-primary-button-warps-slider=0
+gtk-theme-name=gnome
+gtk-toolbar-icon-size=GTK_ICON_SIZE_SMALL_TOOLBAR
+gtk-toolbar-style=GTK_TOOLBAR_ICONS
gtk-xft-antialias=1
gtk-xft-hinting=1
gtk-xft-hintstyle=hintfull
gtk-xft-rgba=rgb
-gtk-theme-name=gnome
diff --git a/kshrc b/config/ksh/kshrc
index 5b98892..3b99644 100644
--- a/kshrc
+++ b/config/ksh/kshrc
@@ -15,7 +15,6 @@ d=${PWD/$HOME/\~}; d=${d##*/};\
print "$d$s$e$i ")'
;;
xterm|*-256color)
- alias weechat='print "\033]0;weechat\a$d$s$e$i " && weechat'
PS1=$'\001\r\W'$([ "$SSH_CONNECTION" ] && print '@\h')'$(((e=$?)) && print "?\e[0;31;40m$e\e[0m")\$ '
;;
esac
diff --git a/config/mblaze/.gitignore b/config/mblaze/.gitignore
new file mode 100644
index 0000000..3803999
--- /dev/null
+++ b/config/mblaze/.gitignore
@@ -0,0 +1 @@
+cur
diff --git a/config/mblaze/filter b/config/mblaze/filter
new file mode 100644
index 0000000..9bb345c
--- /dev/null
+++ b/config/mblaze/filter
@@ -0,0 +1,4 @@
+# text/html: elinks -force-html -dump 1 -dump-color-mode 3 -localhost 1
+# application/pdf: pdftotext - - | par
+# application: file -b -
+# image: file -b -
diff --git a/config/mblaze/profile b/config/mblaze/profile
new file mode 100644
index 0000000..bd42c81
--- /dev/null
+++ b/config/mblaze/profile
@@ -0,0 +1,2 @@
+local-mailbox: "Duncan Overbruck" <mail@duncano.de>
+outbox: /home/duncan/mail/outbox
diff --git a/config/mblaze/seq b/config/mblaze/seq
new file mode 120000
index 0000000..b1a4a7f
--- /dev/null
+++ b/config/mblaze/seq
@@ -0,0 +1 @@
+../../data/mblaze/seq \ No newline at end of file
diff --git a/config/mksh/mkshrc b/config/mksh/mkshrc
new file mode 100644
index 0000000..10002bc
--- /dev/null
+++ b/config/mksh/mkshrc
@@ -0,0 +1,21 @@
+\: "${MKSH:=$(\builtin whence -p mksh)}"; \: "${MKSH:=/bin/mksh}";
+\: SHELL=$MKSH;
+\: HISTFILE=~/.mksh_history; \: HISTSIZE=1000;
+\export MKSH SHELL HISTFILE HISTSIZE
+
+case "$TERM" in
+xterm|linux|screen|alacritty|*256col*)
+ PS1=$'\001\r''$(\
+((e=$?))||e="";
+d=${PWD/$HOME/\~};
+\print "${d##*/}'"${SSH_CONNECTION:+"@${HOSTNAME:=$(hostname)}"}"'${e:+"?\001\e[0;31m$e\001\e[0m"}\001\e[0;32m'"$(((USER_ID)) && \print \$ || \print \#)\001\e[0m"'") '
+;;
+network|dump|*)
+ PS1=$'\001\r''$(\
+((e=$?))||e="";
+d=${PWD/$HOME/\~};
+\print "${d##*/}'"${SSH_CONNECTION:+"@${HOSTNAME:=$(hostname)}"}"'${e:+"?$e"}'"$(((USER_ID)) && \print \$ || \print \#)"'") '
+;;
+esac
+
+. "${XDG_CONFIG_HOME:-$HOME/.config}"/sh/aliases 2>/dev/null
diff --git a/config/mpv/mpv.conf b/config/mpv/mpv.conf
new file mode 100644
index 0000000..8aa14d3
--- /dev/null
+++ b/config/mpv/mpv.conf
@@ -0,0 +1,8 @@
+force-window=immediate
+
+slang=en,eng
+alang=en,eng
+
+ao=sndio
+volume=40
+no-stop-screensaver
diff --git a/config/mpv/watch_later b/config/mpv/watch_later
new file mode 120000
index 0000000..9713dc0
--- /dev/null
+++ b/config/mpv/watch_later
@@ -0,0 +1 @@
+../../data/mpv/watch_later \ No newline at end of file
diff --git a/inputrc b/config/readline/inputrc
index 55e23de..55e23de 100644
--- a/inputrc
+++ b/config/readline/inputrc
diff --git a/aliases b/config/sh/aliases
index 762e4d2..be3f88e 100644
--- a/aliases
+++ b/config/sh/aliases
@@ -1,7 +1,8 @@
alias ga='git add'
alias gc='git commit'
alias gp='git pull'
-alias gs='git status -sb'
+alias gs='git s'
+alias gss='git ss'
alias gb='git branch'
alias gd='git diff'
alias gl='git l'
@@ -32,3 +33,7 @@ alias rot13='tr \
type hd >/dev/null || hd() hexdump -e '"%08.8_ax " 8/1 "%02X " \
" - " 8/1 "%02X "' -e '" |" "%_p"' -e '"|\n"' "$@"
+
+alias xlint='PATH=/usr/bin xlint'
+
+err() errstr $?
diff --git a/config/sh/profile b/config/sh/profile
new file mode 100644
index 0000000..f657839
--- /dev/null
+++ b/config/sh/profile
@@ -0,0 +1,42 @@
+\: ${LANG:=C.UTF-8}
+\export LANG
+
+\: ${XDG_CACHE_HOME:=$HOME/cache}
+\: ${XDG_CONFIG_HOME:=$HOME/config}
+\: ${XDG_DATA_HOME:=$HOME/data}
+\: ${XDG_RUNTIME_DIR:=/run/$USER}
+\export XDG_CACHE_HOME XDG_CONFIG_HOME XDG_DATA_HOME XDG_RUNTIME_DIR
+
+\: ${BROWSER:=firefox}
+\: ${EDITOR:=vim}
+\: ${PAGER:=less}
+\: ${VISUAL:=vim}
+\export BROWSER EDITOR PAGER PATH VISUAL
+
+\: ${GCC_COLORS:=locus=34}
+\export GCC_COLORS
+
+\: ${GOPATH:="$HOME/go"}
+\export GOPATH
+
+\: ${SSH_AUTH_SOCK:="${XDG_CACHE_HOME:-$HOME/.cache}"/ssh-agent.sock}
+\export SSH_AUTH_SOCK
+
+for x in \
+ "$HOME/bin" \
+ "$HOME/.local/bin" \
+ "$HOME/.cargo/bin" \
+ "$HOME/.cabal/bin" \
+ "$GOPATH/bin" \
+ "/usr/local/lobase/sbin" \
+ "/usr/local/lobase/bin" \
+ "/usr/local/bin" \
+ "/usr/bin" \
+ ; do
+ [ -d "$x" ] || continue
+ case ":${PATH}:" in
+ *":${x}:"*) ;;
+ *) PATH="${PATH+${PATH}:}${x}" ;;
+ esac
+done
+
diff --git a/config/ssh/authorized_keys b/config/ssh/authorized_keys
new file mode 120000
index 0000000..327c18f
--- /dev/null
+++ b/config/ssh/authorized_keys
@@ -0,0 +1 @@
+../../data/ssh/authorized_keys \ No newline at end of file
diff --git a/ssh/config b/config/ssh/config
index 115b7f4..115b7f4 100644
--- a/ssh/config
+++ b/config/ssh/config
diff --git a/config/ssh/id_ed25519 b/config/ssh/id_ed25519
new file mode 120000
index 0000000..6c7540c
--- /dev/null
+++ b/config/ssh/id_ed25519
@@ -0,0 +1 @@
+../../data/ssh/id_ed25519 \ No newline at end of file
diff --git a/config/ssh/id_ed25519.pub b/config/ssh/id_ed25519.pub
new file mode 120000
index 0000000..651b0e5
--- /dev/null
+++ b/config/ssh/id_ed25519.pub
@@ -0,0 +1 @@
+../../data/ssh/id_ed25519.pub \ No newline at end of file
diff --git a/config/ssh/id_rsa b/config/ssh/id_rsa
new file mode 120000
index 0000000..bd1226f
--- /dev/null
+++ b/config/ssh/id_rsa
@@ -0,0 +1 @@
+../../data/ssh/id_rsa \ No newline at end of file
diff --git a/config/ssh/id_rsa.pub b/config/ssh/id_rsa.pub
new file mode 120000
index 0000000..bac6a99
--- /dev/null
+++ b/config/ssh/id_rsa.pub
@@ -0,0 +1 @@
+../../data/ssh/id_rsa.pub \ No newline at end of file
diff --git a/config/ssh/known_hosts b/config/ssh/known_hosts
new file mode 120000
index 0000000..a1fcc4e
--- /dev/null
+++ b/config/ssh/known_hosts
@@ -0,0 +1 @@
+../../data/ssh/known_hosts \ No newline at end of file
diff --git a/config/ssh/known_hosts2 b/config/ssh/known_hosts2
new file mode 120000
index 0000000..bc15c79
--- /dev/null
+++ b/config/ssh/known_hosts2
@@ -0,0 +1 @@
+../../data/ssh/known_hosts2 \ No newline at end of file
diff --git a/tmux.conf b/config/tmux/tmux.conf
index ea79dcb..ea79dcb 100644
--- a/tmux.conf
+++ b/config/tmux/tmux.conf
diff --git a/vim/colors/shblah.vim b/config/vim/colors/shblah.vim
index ac73643..ac73643 100644
--- a/vim/colors/shblah.vim
+++ b/config/vim/colors/shblah.vim
diff --git a/vim/pack/plugins/start/vim-commentary/.gitignore b/config/vim/pack/plugins/start/vim-commentary/.gitignore
index 0a56e3f..0a56e3f 100644
--- a/vim/pack/plugins/start/vim-commentary/.gitignore
+++ b/config/vim/pack/plugins/start/vim-commentary/.gitignore
diff --git a/vim/pack/plugins/start/vim-commentary/CONTRIBUTING.markdown b/config/vim/pack/plugins/start/vim-commentary/CONTRIBUTING.markdown
index b3f0095..b3f0095 100644
--- a/vim/pack/plugins/start/vim-commentary/CONTRIBUTING.markdown
+++ b/config/vim/pack/plugins/start/vim-commentary/CONTRIBUTING.markdown
diff --git a/vim/pack/plugins/start/vim-commentary/README.markdown b/config/vim/pack/plugins/start/vim-commentary/README.markdown
index 5387ba6..5387ba6 100644
--- a/vim/pack/plugins/start/vim-commentary/README.markdown
+++ b/config/vim/pack/plugins/start/vim-commentary/README.markdown
diff --git a/vim/pack/plugins/start/vim-commentary/doc/commentary.txt b/config/vim/pack/plugins/start/vim-commentary/doc/commentary.txt
index b048569..b048569 100644
--- a/vim/pack/plugins/start/vim-commentary/doc/commentary.txt
+++ b/config/vim/pack/plugins/start/vim-commentary/doc/commentary.txt
diff --git a/vim/pack/plugins/start/vim-commentary/plugin/commentary.vim b/config/vim/pack/plugins/start/vim-commentary/plugin/commentary.vim
index 9aa0f32..9aa0f32 100644
--- a/vim/pack/plugins/start/vim-commentary/plugin/commentary.vim
+++ b/config/vim/pack/plugins/start/vim-commentary/plugin/commentary.vim
diff --git a/vim/pack/plugins/start/vim-surround/.gitignore b/config/vim/pack/plugins/start/vim-surround/.gitignore
index 0a56e3f..0a56e3f 100644
--- a/vim/pack/plugins/start/vim-surround/.gitignore
+++ b/config/vim/pack/plugins/start/vim-surround/.gitignore
diff --git a/vim/pack/plugins/start/vim-surround/README.markdown b/config/vim/pack/plugins/start/vim-surround/README.markdown
index fef61a8..fef61a8 100644
--- a/vim/pack/plugins/start/vim-surround/README.markdown
+++ b/config/vim/pack/plugins/start/vim-surround/README.markdown
diff --git a/vim/pack/plugins/start/vim-surround/doc/surround.txt b/config/vim/pack/plugins/start/vim-surround/doc/surround.txt
index 674b6a9..674b6a9 100644
--- a/vim/pack/plugins/start/vim-surround/doc/surround.txt
+++ b/config/vim/pack/plugins/start/vim-surround/doc/surround.txt
diff --git a/vim/pack/plugins/start/vim-surround/plugin/surround.vim b/config/vim/pack/plugins/start/vim-surround/plugin/surround.vim
index 46f3252..46f3252 100644
--- a/vim/pack/plugins/start/vim-surround/plugin/surround.vim
+++ b/config/vim/pack/plugins/start/vim-surround/plugin/surround.vim
diff --git a/vimrc b/config/vim/vimrc
index b8ad4da..93f96b8 100644
--- a/vimrc
+++ b/config/vim/vimrc
@@ -1,6 +1,16 @@
set nocompatible
filetype off
+if empty($XDG_CACHE_HOME)
+ let $XDG_CACHE_HOME = fnamemodify("~/.cache", ":p:h")
+endif
+if empty($XDG_CONFIG_HOME)
+ let $XDG_CONFIG_HOME = fnamemodify("~/.config", ":p:h")
+endif
+if empty($XDG_DATA_HOME)
+ let $XDG_DATA_HOME = fnamemodify("~/.local/share", ":p:h")
+endif
+
" ============================================================================
" Basic settings
" ============================================================================
@@ -33,9 +43,10 @@ set completeopt=menuone,longest
set wildignore+=*/tmp/*,*.so,*.swp,*.zip,*.db,*.o,*.a
" directories
-set undodir=~/.vim/undo//
-set backupdir=~/.vim/backup//
-set directory=~/.vim/swp//
+set undodir=$XDG_DATA_HOME/vim/undo//
+set backupdir=$XDG_DATA_HOME/vim/backup//
+set directory=$XDG_CACHE_HOME/vim/swp//
+let g:netrw_home=expand("$XDG_DATA_HOME/vim")
" histroy/undo
set history=1000 " store a ton of history (default is 20)
diff --git a/Xresources b/config/xorg/Xresources
index 84c72c3..84c72c3 100644
--- a/Xresources
+++ b/config/xorg/Xresources
diff --git a/us-intl-german.xmodmap b/config/xorg/us-intl-german.xmodmap
index 774526c..774526c 100644
--- a/us-intl-german.xmodmap
+++ b/config/xorg/us-intl-german.xmodmap
diff --git a/xinitrc b/config/xorg/xinitrc
index 33330db..63bb129 100644
--- a/xinitrc
+++ b/config/xorg/xinitrc
@@ -1,5 +1,7 @@
#!/bin/sh
+cfg="${XDG_CONFIG_HOME:-$HOME/.config}/xorg"
+
[ -d /etc/X11/xinit/xinitrc.d ] && \
for f in /etc/X11/xinit/xinitrc.d/*; do [ -x "$f" ] && . "$f"; done && unset f
@@ -10,14 +12,21 @@
setxkbmap \
-layout 'us(altgr-intl),de(nodeadkeys)' \
-option 'grp:shifts_toggle,compose:menu'
-xmodmap ~/.us-intl-german.xmodmap
-xrdb -merge ~/.Xresources
-xset b off
+xmodmap "$cfg"/us-intl-german.xmodmap
+
+if [ "$(command -v uim-xim >/dev/null >&2)" ]; then
+ export GTK_IM_MODULE="uim"
+ export QT_IM_MODULE="uim"
+ export XMODIFIERS="@im=uim"
+fi
+
+# xrdb -merge "$cfg"/Xresources
+# xset b off
-xinput --set-prop 11 'libinput Accel Speed' -0.7
+xinput --set-prop 'Razer Razer Salmosa' 'libinput Accel Speed' -0.7 >/dev/null 2>&1
# color temperature
-[ $(command -v sct 2>/dev/null) ] && sct 4400
+sct 4400 2>&- || :
-exec $STARTUP runsvdir -P ~/service.x 'log: ...........................................................................................................................................................................................................................................................................................................................................................................................................'
+exec runsvdir -P ~/service.x 'log: ...........................................................................................................................................................................................................................................................................................................................................................................................................'
diff --git a/config/yash/completion/doas b/config/yash/completion/doas
new file mode 100644
index 0000000..958ceef
--- /dev/null
+++ b/config/yash/completion/doas
@@ -0,0 +1,26 @@
+function completion/doas {
+ typeset OPTIONS ARGOPT PREFIX
+ OPTIONS=( #>#
+ "C:; Parse and check configuration file"
+ "n; Non interactive mode"
+ "s; Execute the shell"
+ "u:; Specify the user"
+ ) #<#
+
+ command -f completion//parseoptions
+ case $ARGOPT in
+ (-)
+ command -f completion//completeoptions
+ ;;
+ (C)
+ complete -P "$PREFIX" -f
+ ;;
+ (u)
+ complete -P "$PREFIX" -u
+ ;;
+ ('')
+ command -f completion//getoperands
+ command -f completion//reexecute
+ ;;
+ esac
+}
diff --git a/yashrc b/config/yash/completion/xbps
index 0a2d5a3..4b9169b 100644
--- a/yashrc
+++ b/config/yash/completion/xbps
@@ -1,90 +1,3 @@
-[ -r ~/.profile ] && . ~/.profile
-
-# enable bash-like extended expansion
-set --brace-expand
-
-# enable recursive pathname expansion
-set --extended-glob
-
-# prevent redirections from overwriting existing files
-set --no-clobber
-
-# don't implicitly expand non-existent variables to empty strings
-set --no-unset
-
-# if yash is built with command history enabled...
-if command --identify --builtin-command history >/dev/null; then
- # don't save commands starting with a space in history
- set --hist-space
-fi
-
-if command --identify --builtin-command bindkey >/dev/null; then
- # print job status update ASAP, but only while line-editing
- set --notify-le
- # some terminfo data are broken; meta flags have to be ignored for UTF-8
- set --le-no-conv-meta
-
- # most users are more familiar with emacs mode than vi mode
- [ -o vi ] && set --emacs
-
- # some useful key bindings
- bindkey --emacs '\^N' beginning-search-forward
- bindkey --emacs '\^O' clear-candidates
- bindkey --emacs '\^P' beginning-search-backward
- bindkey --emacs '\N' complete-next-column
- bindkey --emacs '\P' complete-prev-column
- bindkey --emacs '\^[[1;5C' forward-emacsword
- bindkey --emacs '\^[[1;5D' backward-emacsword
- bindkey --emacs '\^I' complete-max-then-list
-
- # key bindings for vi mode, some of which are from emacs mode
- bindkey --vi-insert '\^A' beginning-of-line
- bindkey --vi-insert '\^B' backward-char
- bindkey --vi-insert '\^D' eof-or-delete
- bindkey --vi-insert '\#' eof-or-delete
- bindkey --vi-insert '\^E' end-of-line
- bindkey --vi-insert '\^F' forward-char
- bindkey --vi-insert '\^K' forward-kill-line
- bindkey --vi-insert '\^N' beginning-search-forward
- bindkey --vi-insert '\^O' clear-candidates
- bindkey --vi-insert '\^P' beginning-search-backward
- bindkey --vi-insert '\^U' backward-kill-line
- bindkey --vi-insert '\$' backward-kill-line
- bindkey --vi-insert '\^W' backward-delete-viword
- bindkey --vi-insert '\^Y' put-left
- bindkey --vi-insert '\N' complete-next-column
- bindkey --vi-insert '\P' complete-prev-column
- bindkey --vi-command '\^N' beginning-search-forward
- bindkey --vi-command '\^P' beginning-search-backward
-fi
-
-[ -r ~/.aliases ] && . ~/.aliases
-[ -z "$SSH_AUTH_SOCK" ] && [ -r ~/.cache/ssh-agent-info ] && \
- . ~/.cache/ssh-agent-info
-
-# define some basic variables if missing
-: ${PAGER:=less} ${EDITOR:=vi} ${FCEDIT:=$EDITOR}
-: ${LOGNAME:=$(logname)} ${HOSTNAME:=$(uname -n)}
-
-# disable confusing treatment of arguments in the echo command
-: ${ECHO_STYLE:=RAW}
-
-# variables needed for command history
-HISTFILE=~/.yash_history HISTSIZE=5000
-
-PS1=\
-'${{{PWD:/~/\~}##*/}:-$PWD}'\
-'${SSH_CONNECTION:+@${HOSTNAME}}'\
-'${{?:/0/}:+?\\fr.$?\\fd.}'\
-'\fg\$\fd '
-PS1R=
-PS1S=
-PS2='> '
-PS2R=
-PS2S=$PS1S
-PS4='\fm.+ '
-PS4S='\fmo.'
-
function completion/xbps::all_packages {
while read -r _ name desc; do
complete -P "$PREFIX" -D "$desc" -- "$name"
@@ -226,30 +139,3 @@ function completion/xbps-src {
;;
esac
}
-
-function completion/doas {
- typeset OPTIONS ARGOPT PREFIX
- OPTIONS=( #>#
- "C:; Parse and check configuration file"
- "n; Non interactive mode"
- "s; Execute the shell"
- "u:; Specify the user"
- ) #<#
-
- command -f completion//parseoptions
- case $ARGOPT in
- (-)
- command -f completion//completeoptions
- ;;
- (C)
- complete -P "$PREFIX" -f
- ;;
- (u)
- complete -P "$PREFIX" -u
- ;;
- ('')
- command -f completion//getoperands
- command -f completion//reexecute
- ;;
- esac
-}
diff --git a/config/yash/yashrc b/config/yash/yashrc
new file mode 100644
index 0000000..3048da7
--- /dev/null
+++ b/config/yash/yashrc
@@ -0,0 +1,84 @@
+[ -r ~/.profile ] && . ~/.profile
+
+# enable bash-like extended expansion
+set --brace-expand
+
+# enable recursive pathname expansion
+set --extended-glob
+
+# prevent redirections from overwriting existing files
+set --no-clobber
+
+# don't implicitly expand non-existent variables to empty strings
+set --no-unset
+
+# if yash is built with command history enabled...
+if command --identify --builtin-command history >/dev/null; then
+ # don't save commands starting with a space in history
+ set --hist-space
+fi
+
+if command --identify --builtin-command bindkey >/dev/null; then
+ # print job status update ASAP, but only while line-editing
+ set --notify-le
+ # some terminfo data are broken; meta flags have to be ignored for UTF-8
+ set --le-no-conv-meta
+
+ # most users are more familiar with emacs mode than vi mode
+ [ -o vi ] && set --emacs
+
+ # some useful key bindings
+ bindkey --emacs '\^N' beginning-search-forward
+ bindkey --emacs '\^O' clear-candidates
+ bindkey --emacs '\^P' beginning-search-backward
+ bindkey --emacs '\N' complete-next-column
+ bindkey --emacs '\P' complete-prev-column
+ bindkey --emacs '\^[[1;5C' forward-emacsword
+ bindkey --emacs '\^[[1;5D' backward-emacsword
+ bindkey --emacs '\^I' complete-max-then-list
+
+ # key bindings for vi mode, some of which are from emacs mode
+ bindkey --vi-insert '\^A' beginning-of-line
+ bindkey --vi-insert '\^B' backward-char
+ bindkey --vi-insert '\^D' eof-or-delete
+ bindkey --vi-insert '\#' eof-or-delete
+ bindkey --vi-insert '\^E' end-of-line
+ bindkey --vi-insert '\^F' forward-char
+ bindkey --vi-insert '\^K' forward-kill-line
+ bindkey --vi-insert '\^N' beginning-search-forward
+ bindkey --vi-insert '\^O' clear-candidates
+ bindkey --vi-insert '\^P' beginning-search-backward
+ bindkey --vi-insert '\^U' backward-kill-line
+ bindkey --vi-insert '\$' backward-kill-line
+ bindkey --vi-insert '\^W' backward-delete-viword
+ bindkey --vi-insert '\^Y' put-left
+ bindkey --vi-insert '\N' complete-next-column
+ bindkey --vi-insert '\P' complete-prev-column
+ bindkey --vi-command '\^N' beginning-search-forward
+ bindkey --vi-command '\^P' beginning-search-backward
+fi
+
+. "${XDG_CONFIG_HOME:-$HOME/.config}"/sh/aliases 2>/dev/null
+
+# define some basic variables if missing
+: ${PAGER:=less} ${EDITOR:=vi} ${FCEDIT:=$EDITOR}
+: ${LOGNAME:=$(logname)} ${HOSTNAME:=$(uname -n)}
+
+# disable confusing treatment of arguments in the echo command
+: ${ECHO_STYLE:=RAW}
+
+# variables needed for command history
+HISTFILE=~/.yash_history HISTSIZE=5000
+
+PS1=\
+'${{{PWD:/~/\~}##*/}:-$PWD}'\
+"${SSH_CONNECTION:+@${HOSTNAME}}"\
+'${{?:/0/}:+?\\fr.$?\\fd.}'\
+"\fg\$\fd "
+PS1R=
+PS1S=
+PS2='> '
+PS2R=
+PS2S=$PS1S
+PS4='\fm.+ '
+PS4S='\fmo.'
diff --git a/vim/swp/.gitignore b/data/mblaze/.gitignore
index d6b7ef3..d6b7ef3 100644
--- a/vim/swp/.gitignore
+++ b/data/mblaze/.gitignore
diff --git a/vim/undo/.gitignore b/data/mpv/watch_later/.gitignore
index d6b7ef3..d6b7ef3 100644
--- a/vim/undo/.gitignore
+++ b/data/mpv/watch_later/.gitignore
diff --git a/data/ssh/.gitignore b/data/ssh/.gitignore
new file mode 100644
index 0000000..d6b7ef3
--- /dev/null
+++ b/data/ssh/.gitignore
@@ -0,0 +1,2 @@
+*
+!.gitignore
diff --git a/data/vim/.gitignore b/data/vim/.gitignore
new file mode 100644
index 0000000..d6b7ef3
--- /dev/null
+++ b/data/vim/.gitignore
@@ -0,0 +1,2 @@
+*
+!.gitignore
diff --git a/data/vim/backup/.gitignore b/data/vim/backup/.gitignore
new file mode 100644
index 0000000..d6b7ef3
--- /dev/null
+++ b/data/vim/backup/.gitignore
@@ -0,0 +1,2 @@
+*
+!.gitignore
diff --git a/data/vim/undo/.gitignore b/data/vim/undo/.gitignore
new file mode 100644
index 0000000..d6b7ef3
--- /dev/null
+++ b/data/vim/undo/.gitignore
@@ -0,0 +1,2 @@
+*
+!.gitignore
diff --git a/install-new.sh b/install-new.sh
new file mode 100644
index 0000000..4ddfc58
--- /dev/null
+++ b/install-new.sh
@@ -0,0 +1,63 @@
+#!/bin/sh
+
+: ${DOTFILES_HOME:=$HOME/.dotfiles}
+
+: ${XDG_CACHE_HOME:=$HOME/cache}
+: ${XDG_CONFIG_HOME:=$HOME/config}
+: ${XDG_DATA_HOME:=$HOME/data}
+
+: ${BIN_HOME:=$HOME/bin}
+: ${SV_HOME:=$HOME/sv}
+: ${SERVICE_HOME:=$HOME/service}
+: ${SERVICEX_HOME:=$HOME/service.x}
+
+cat <<! >&2
+XDG_CACHE_HOME = ${XDG_CACHE_HOME}
+XDG_CONFIG_HOME = ${XDG_CONFIG_HOME}
+XDG_DATA_HOME = ${XDG_DATA_HOME}
+BIN_HOME = ${BIN_HOME}
+SV_HOME = ${SV_HOME}
+SERVICE_HOME = ${SERVICE_HOME}
+SERVICEX_HOME = ${SERVICEX_HOME}
+
+!
+
+
+printf "creating home directory symlinks\n" >&2
+ln -sfn "${DOTFILES_HOME}"/config "${XDG_CONFIG_HOME}"
+ln -sfn "${DOTFILES_HOME}"/data "${XDG_DATA_HOME}"
+ln -sfn "${DOTFILES_HOME}"/cache "${XDG_CACHE_HOME}"
+ln -sfn "${DOTFILES_HOME}"/bin "${BIN_HOME}"
+ln -sfn "${DOTFILES_HOME}"/sv "${SV_HOME}"
+ln -sfn "${DOTFILES_HOME}"/service "${SERVICE_HOME}"
+ln -sfn "${DOTFILES_HOME}"/service.x "${SERVICEX_HOME}"
+
+printf "creating compat directory symlinks\n" >&2
+ln -sfn "${DOTFILES_HOME}"/config/vim ~/.vim
+ln -sfn "${DOTFILES_HOME}"/config/ssh ~/.ssh
+ln -sfn "${DOTFILES_HOME}"/config/mblaze ~/.mblaze
+
+printf "creating compat file symlinks\n" >&2
+ln -sf "${DOTFILES_HOME}"/config/mksh/mkshrc /home/duncan/.mkshrc
+ln -sf "${DOTFILES_HOME}"/config/sh/profile /home/duncan/.profile
+ln -sf "${DOTFILES_HOME}"/config/ksh/kshrc /home/duncan/.kshrc
+ln -sf "${DOTFILES_HOME}"/config/yash/yashrc /home/duncan/.yashrc
+ln -sf "${DOTFILES_HOME}"/config/xorg/xinitrc /home/duncan/.xinitrc
+ln -sf "${DOTFILES_HOME}"/config/gtk-2.0/gtkrc-2.0 /home/duncan/.gtkrc-2.0
+ln -sf "${DOTFILES_HOME}"/config/readline/inputrc /home/duncan/.inputrc
+ln -sf "${DOTFILES_HOME}"/config/tmux/tmux.conf /home/duncan/.tmux.conf
+
+# try to setup firefox profile
+for p in ~/.mozilla/firefox/*/places.sqlite; do
+ [ -e "$p" ] || continue
+ p="${p%/*}"; p="${p##*/}"
+ printf "setting up firefox profile %s\n" "${p}" >&2
+ ln -sf ~/.dotfiles/config/firefox/user.js ~/.mozilla/firefox/"$p"/user.js
+ ln -sfn ~/.dotfiles/config/firefox/chrome ~/.mozilla/firefox/"$p"/chrome
+done
+
+printf "creating default env directory\n"
+echo "${HOME}" >"${XDG_DATA_HOME}"/env/HOME
+echo "${XDG_CACHE_HOME}" >"${XDG_DATA_HOME}"/env/XDG_CACHE_HOME
+echo "${XDG_CONFIG_HOME}" >"${XDG_DATA_HOME}"/env/XDG_CONFIG_HOME
+echo "${XDG_DATA_HOME}" >"${XDG_DATA_HOME}"/env/XDG_DATA_HOME
diff --git a/install-root.sh b/install-root.sh
index f07dbe7..95ee3e2 100755
--- a/install-root.sh
+++ b/install-root.sh
@@ -1,3 +1,6 @@
#!/bin/sh
-ln -sf "${PWD}/sv/runsvdir-duncan" /etc/sv
+install -d /etc/sv/runsvdir-duncan
+install -m755 sv/runsvdir-duncan/run /etc/sv/runsvdir-duncan/run
+install -m755 sv/runsvdir-duncan/finish /etc/sv/runsvdir-duncan/finish
+ln -sf /run/runit/supervise.runsvdir-duncan /etc/sv/runsvdir-duncan/supervise
diff --git a/mkshrc b/mkshrc
deleted file mode 100644
index 425223f..0000000
--- a/mkshrc
+++ /dev/null
@@ -1,35 +0,0 @@
-\: "${MKSH:=$(\builtin whence -p mksh)}"; \: "${MKSH:=/bin/mksh}";
-\: SHELL=$MKSH;
-\: HISTFILE=~/.mksh_history; \: HISTSIZE=1000;
-\export MKSH SHELL HISTFILE HISTSIZE
-
-case "$TERM" in
-xterm|linux|screen|alacritty|*256col*)
- # ((e=$?)) && print "${|errno2str "$e"}" && e="?\001\e[0;31m$e\001\e[0m" || e=
- PS1=$'\001\r''$(\
-((e=$?)) && e="?\001\e[0;31m$e\001\e[0m" || e=
-d=${PWD/$HOME/\~}; d=${d##*/};\
-[ "$SSH_CONNECTION" ] && s="@${HOSTNAME:=$(hostname)}" || s=;\
-i=\#; ((USER_ID)) && i=\$;\
-i1=\#; ((USER_ID)) && i1="\001\e[0;32m\$\001\e[0m";\
-\print "$d$s$e$i1") '
-;;
-network|dump|*)
- PS1=$'\001\r''$(\
-((r=$?)) && e="?$r" || e=;\
-d=${PWD/$HOME/\~}; d=${d##*/};\
-[ "$SSH_CONNECTION" ] && s="@${HOSTNAME:=$(hostname)}" || s=;\
-((USER_ID)) && i=\$ || i=\#;\
-print "$d$s$e$i ")'
-;;
-esac
-
-function fgg {
- j=$(jobs|fzy)
- [ -z "$j" ] && return
- j=${j%%]*}; j=${j#[*}
- fg "%$j"
-}
-
-. ~/.aliases 2>/dev/null
-. ~/.cache/ssh-agent-info 2>/dev/null
diff --git a/my-umatrix-rules.txt b/my-umatrix-rules.txt
deleted file mode 100644
index 6253847..0000000
--- a/my-umatrix-rules.txt
+++ /dev/null
@@ -1,47 +0,0 @@
-matrix-off: about-scheme true
-matrix-off: behind-the-scene true
-matrix-off: chrome-extension-scheme true
-matrix-off: chrome-scheme true
-matrix-off: localhost true
-matrix-off: opera-scheme true
-referrer-spoof: * true
-referrer-spoof: strato.de false
-referrer-spoof: youtube.com false
-ua-spoof: * true
-ua-spoof: strato.de false
-ua-spoof: youtube.com false
-* * * block
-* * css allow
-* * frame block
-* * image allow
-* 1st-party * allow
-* 1st-party frame allow
-file-scheme mobile.twitter.com frame allow
-github.com raw.githubusercontent.com * allow
-github.com render.githubusercontent.com * allow
-github.com render.githubusercontent.com frame allow
-imgur.com cdnjs.cloudflare.com script allow
-instagram.com instagramstatic-a.akamaihd.net script allow
-oddshot.tv oddshot.akamaized.net script allow
-prnt.sc prntscr.com frame allow
-prnt.sc prntscr.com script allow
-reddit.com www.redditstatic.com script allow
-soundcloud.com sndcdn.com * allow
-travis-ci.org s3.amazonaws.com xhr allow
-travis-ci.org ws.pusherapp.com other allow
-twitch.tv akamaized.net * allow
-twitch.tv ttvnw.net * allow
-twitter.com abs.twimg.com script allow
-twitter.com ma-0.twimg.com script allow
-twitter.com ton.twimg.com script allow
-twitter.com video.twimg.com other allow
-twitter.com video.twimg.com xhr allow
-utrace.de maps.googleapis.com script allow
-vimeo.com f.vimeocdn.com script allow
-vimeo.com fpdl.vimeocdn.com other allow
-vimeo.com vimeocdn.com * allow
-youtube.com apis.google.com script allow
-youtube.com googlevideo.com * allow
-youtube.com s.ytimg.com script allow
-youtube.com www.google.com script allow
-youtube.com ytimg.com * allow
diff --git a/notes.md b/notes.md
deleted file mode 100644
index 51390e8..0000000
--- a/notes.md
+++ /dev/null
@@ -1,38 +0,0 @@
-# Terminal
-
-`CTRL+s` `CTRL+q` Pause/resume output
-`CTRL+i` complete file
-
-## dvtm
-
-`MOD=CTRL+g`
-
-`MOD+c` New window
-`MOD+x` Close window
-`MOD+j` `MOD+k` Previous/next window
-`MOD+h` `MOD+l` Decrease/increase master window
-`MOD+e` Open history in $EDITOR
-`MOD+M` Toggle mouse selection mode
-
-# Dwm
-
-`MOD+j` `MOD+k` Previous/next window
-`MOD+h` `MOD+l` Decrease/increase master window
-`MOD+Return` Switch master window
-`MOD+Shift+Return` Open new terminal window
-`MOD+p` Start dmenu
-`MOD+Tab` Switch between current/last tag
-
-# Vim
-
-## CtrlP
-
-<CTRL>+F/C | cycle buffer/mru/file |
-<F5> | refresh files |
-
-## NERD Tree
-
-ma | add |
-mm | move |
-md | delete |
-mc | copty |
diff --git a/profile b/profile
deleted file mode 100644
index f1d3c16..0000000
--- a/profile
+++ /dev/null
@@ -1,27 +0,0 @@
-BROWSER=firefox
-EDITOR=vim
-PAGER=less
-VISUAL=vim
-
-GCC_COLORS="locus=34"
-
-: ${GOPATH:="$HOME/go"}
-: ${XDG_RUNTIME_DIR:=/run/$USER}
-
-for x in \
- "/usr/local/bin" \
- "/usr/local/lobase/bin" \
- "/usr/local/lobase/sbin" \
- "$HOME/.local/bin" \
- "$HOME/.cargo/bin" \
- "$HOME/.cabal/bin" \
- "$GOPATH/bin" \
- "$HOME/bin"; do
- [ -d "$x" ] || continue
- case "$PATH" in
- *"$x"*) ;;
- *) PATH="$x:$PATH" ;;
- esac
-done
-
-export BROWSER EDITOR PAGER PATH VISUAL GCC_COLORS XDG_RUNTIME_DIR GOPATH
diff --git a/service.x/cwm b/service.x/cwm
deleted file mode 120000
index e053409..0000000
--- a/service.x/cwm
+++ /dev/null
@@ -1 +0,0 @@
-/home/duncan/sv/cwm \ No newline at end of file
diff --git a/service.x/nclttr b/service.x/nclttr
new file mode 120000
index 0000000..4ba05ec
--- /dev/null
+++ b/service.x/nclttr
@@ -0,0 +1 @@
+/home/duncan/sv/nclttr \ No newline at end of file
diff --git a/service.x/statusbar b/service.x/statusbar
deleted file mode 120000
index e038c97..0000000
--- a/service.x/statusbar
+++ /dev/null
@@ -1 +0,0 @@
-/home/duncan/sv/statusbar \ No newline at end of file
diff --git a/service.x/unclutter b/service.x/unclutter
deleted file mode 120000
index 243053e..0000000
--- a/service.x/unclutter
+++ /dev/null
@@ -1 +0,0 @@
-/home/duncan/sv/unclutter \ No newline at end of file
diff --git a/service.x/vbox-win b/service.x/vbox-win
deleted file mode 120000
index 5327b3f..0000000
--- a/service.x/vbox-win
+++ /dev/null
@@ -1 +0,0 @@
-/home/duncan/sv/vbox-win \ No newline at end of file
diff --git a/service/syncthing b/service/syncthing
deleted file mode 120000
index f22c2a6..0000000
--- a/service/syncthing
+++ /dev/null
@@ -1 +0,0 @@
-/home/duncan/sv/syncthing \ No newline at end of file
diff --git a/sv/nclttr/run b/sv/nclttr/run
new file mode 100755
index 0000000..74116ed
--- /dev/null
+++ b/sv/nclttr/run
@@ -0,0 +1,3 @@
+#!/usr/bin/sh
+
+exec nclttr -j 50 -t 3
diff --git a/sv/nclttr/supervise b/sv/nclttr/supervise
new file mode 120000
index 0000000..5722697
--- /dev/null
+++ b/sv/nclttr/supervise
@@ -0,0 +1 @@
+/run/runit.duncan/supervise.nclttr \ No newline at end of file
diff --git a/sv/runsvdir-duncan/run b/sv/runsvdir-duncan/run
index 5de153e..c9ddea7 100755
--- a/sv/runsvdir-duncan/run
+++ b/sv/runsvdir-duncan/run
@@ -4,5 +4,8 @@
mkdir -p /run/runit.duncan && \
chown duncan:duncan /run/runit.duncan
+export HOME=/home/duncan
+groups=$(id -Gn duncan | tr ' ' ':')
+
exec 2>&1
-exec su -l -c "exec runsvdir /home/duncan/service 'log: ...........................................................................................................................................................................................................................................................................................................................................................................................................'" duncan
+exec chpst -u "duncan:$groups" sh -l -c "exec runsvdir /home/duncan/service 'log: ...........................................................................................................................................................................................................................................................................................................................................................................................................'" duncan
diff --git a/sv/ssh-agent/finish b/sv/ssh-agent/finish
index a562b6a..15ef361 100755
--- a/sv/ssh-agent/finish
+++ b/sv/ssh-agent/finish
@@ -1,5 +1,4 @@
#!/bin/sh
-[ -r ./conf ] && . ./conf
-rm -f ${SSH_AGENT_INFO_FILE:=~/.cache/ssh-agent-info}
+rm -f "${XDG_CACHE_HOME:-$HOME/.cache}"/ssh-agent.sock
exit 0
diff --git a/sv/ssh-agent/run b/sv/ssh-agent/run
index 7fa46d2..efa4430 100755
--- a/sv/ssh-agent/run
+++ b/sv/ssh-agent/run
@@ -1,4 +1,4 @@
#!/bin/sh
-[ -r ./conf ] && . ./conf
-exec ssh-agent -D > ${SSH_AGENT_INFO_FILE:=~/.cache/ssh-agent-info}
+exec >/dev/null
+exec ssh-agent -Da "${XDG_CACHE_HOME:-$HOME/.cache}"/ssh-agent.sock