From 7d5dabfb88d95905098962cbc2e041045fbce7fb Mon Sep 17 00:00:00 2001
From: Simon Bruder <simon@sbruder.de>
Date: Mon, 30 Apr 2018 17:38:37 +0000
Subject: [PATCH] some changes (should use git more often)

---
 home/.tmux.conf                  | 33 ++++++++++++++++++++++++++++++++
 home/.vim/ftdetect/filetypes.vim |  2 +-
 home/.zshrc.docker               |  5 +++--
 home/.zshrc.local                | 20 ++++++++++++++++++-
 4 files changed, 56 insertions(+), 4 deletions(-)
 create mode 100644 home/.tmux.conf

diff --git a/home/.tmux.conf b/home/.tmux.conf
new file mode 100644
index 0000000..3a76d52
--- /dev/null
+++ b/home/.tmux.conf
@@ -0,0 +1,33 @@
+# screen behaviour
+unbind C-b
+set -g prefix C-a
+unbind C-a
+bind C-a send-prefix
+
+# config reload
+unbind r
+bind r source-file ~/.tmux.conf
+
+# more ergonomic splitting
+unbind |
+bind | split-window -h
+
+unbind -
+bind - split-window -v
+
+# vim bindings in copy mode
+bind-key -T copy-mode-vi v send -X begin-selection
+bind-key -T copy-mode-vi y send -X copy-selection
+bind-key -T copy-mode-vi p send -X paste-buffer
+
+# enable mouse
+set -g mouse on
+
+# plugins
+set -g @plugin 'tmux-plugins/tpm'
+
+## solarized colors
+set -g @plugin 'seebi/tmux-colors-solarized'
+set -g @colors-solarized 'dark'
+
+run '~/.tmux/plugins/tpm/tpm'
diff --git a/home/.vim/ftdetect/filetypes.vim b/home/.vim/ftdetect/filetypes.vim
index f0a7e6b..d34d787 100644
--- a/home/.vim/ftdetect/filetypes.vim
+++ b/home/.vim/ftdetect/filetypes.vim
@@ -23,7 +23,7 @@ autocmd Filetype openscad setlocal ts=2 sw=2 sts=2 expandtab
 autocmd Filetype php setlocal ts=2 sw=2 sts=2 expandtab
 autocmd Filetype python setlocal ts=4 sw=4 sts=4 expandtab
 autocmd Filetype scss setlocal ts=2 sw=2 sts=2 expandtab
-autocmd Filetype shell setlocal ts=4 sw=4 sts=4 expandtab
+autocmd Filetype sh setlocal ts=4 sw=4 sts=4 expandtab
 autocmd Filetype svg setlocal ts=2 sw=2 sts=2 expandtab
 autocmd Filetype tex setlocal ts=2 sw=2 sts=2 expandtab
 autocmd Filetype toml setlocal ts=4 sw=4 sts=4 expandtab
diff --git a/home/.zshrc.docker b/home/.zshrc.docker
index c7266cf..09e52e0 100755
--- a/home/.zshrc.docker
+++ b/home/.zshrc.docker
@@ -42,10 +42,11 @@ function vobsub2srt() {
 }
 
 function aucdtect() {
-	docker run --rm \
+	docker run \
+		--rm \
 		-v "$PWD:/home/aucdtect/:ro" \
 		-e uid=$(id -u) \
 		-e gid=$(id -g) \
-		aucdtect \
+		sbruder/aucdtect \
 		$@
 }
diff --git a/home/.zshrc.local b/home/.zshrc.local
index 9edfa5b..f6f14ad 100644
--- a/home/.zshrc.local
+++ b/home/.zshrc.local
@@ -103,7 +103,7 @@ function ränder() {
 		"office")
 			xrandr \
 				--output VGA-1 --off \
-				--output LVDS-1 --primary --mode 1280x800 --pos 0x721 --rotate normal \
+				--output LVDS-1 --primary --mode 1280x800 --pos 0x720 --rotate normal \
 				--output HDMI-3 --mode 1920x1200 --pos 1280x0 --rotate normal \
 				--output HDMI-2 --off \
 				--output HDMI-1 --off \
@@ -111,6 +111,17 @@ function ränder() {
 				--output DP-2 --off \
 				--output DP-1 --off
 			;;
+		"officealt")
+			xrandr \
+				--output VGA-1 --off \
+				--output LVDS-1 --primary --mode 1280x800 --pos 0x1000 --rotate normal \
+				--output HDMI-3 --mode 1920x1200 --pos 1280x0 --rotate left \
+				--output HDMI-2 --off \
+				--output HDMI-1 --off \
+				--output DP-3 --off \
+				--output DP-2 --off \
+				--output DP-1 --off
+			;;
 		"solo")
 			xrandr \
 				--output VGA-1 --off \
@@ -146,6 +157,7 @@ alias mpvhdr="mpv --tone-mapping=hable"
 alias rls="/bin/ls --color=auto"
 alias exa="exa --git"
 alias ls="exa"
+alias presirandr="arandr; feh --bg-fill bg.jpg"
 
 ## Environment variables
 export HVSC_BASE="$HOME/Dokumente/sound/HVSC/"
@@ -163,6 +175,12 @@ function drone-add-registry() {
 	)
 }
 
+function drone-add-netlify() {
+	(
+	drone secret add --name netlify_key --value "$(pass show devops/netlify |grep Drone-Key|cut -d: -f2|tr -d ' ')" "$1"
+	)
+}
+
 function drone() {
 	(
 	source ~/.drone-env