From 786df2d3c663ca6e6b3c26588b248a6b1a31e681 Mon Sep 17 00:00:00 2001
From: Frank Villaro-Dixon <frank.villaro@infomaniak.com>
Date: Fri, 22 Nov 2019 16:15:22 +0100
Subject: [PATCH] thingies

---
 Utils/octopus.sh            | 7 ++++---
 Utils/slock_bis/Makefile    | 4 ++--
 bash/.bashrc                | 5 ++++-
 git/.gitconfig              | 5 ++++-
 graphical/.xinitrc          | 2 +-
 vim/.vim/spell/en.utf-8.add | 2 ++
 vim/.vim/vimrc              | 2 --
 7 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/Utils/octopus.sh b/Utils/octopus.sh
index ff22e62..bceb052 100755
--- a/Utils/octopus.sh
+++ b/Utils/octopus.sh
@@ -20,6 +20,7 @@ case $1 in
 				amixer -q set Master 5%- unmute
 				;;
 			"mute")
+				amixer -q set Headphone toggle
 				amixer -q set Master toggle
 				;;
 			"max")
@@ -90,8 +91,8 @@ case $1 in
 
 	"monitor")
 		#SNU=`xrandr | grep VGA | cut -d' ' -f1 | cut -c4`
-		VGA=eDP-1
-		LVDS=DP-1
+		VGA=DP-1
+		LVDS=eDP-1
 		case $2 in
 			"extern")
 				xrandr --output $LVDS --off \
@@ -108,7 +109,7 @@ case $1 in
 			"dual")
 				xrandr --output $LVDS --auto --rotate normal \
 				       --output $VGA --auto --rotate normal \
-				       --right-of $LVDS
+				       --left-of $LVDS
 				;;
 			"CV")
 				xrandr --output $LVDS --auto --rotate normal \
diff --git a/Utils/slock_bis/Makefile b/Utils/slock_bis/Makefile
index 8477db4..7667cc4 100644
--- a/Utils/slock_bis/Makefile
+++ b/Utils/slock_bis/Makefile
@@ -1,5 +1,5 @@
-LIBS= -L/usr/X11R6/lib -lX11 -lXext
-INCS= -I/usr/X11R6/include
+LIBS= -L/usr/lib/x86_64-linux-gnu/ -lX11 -lXext
+INCS= -I/usr/include/ -I/usr/include/X11/ -I/usr/include/xkbcommon/
 
 LDFLAGS= -s ${LIBS}
 
diff --git a/bash/.bashrc b/bash/.bashrc
index 40a5383..e48dd8b 100644
--- a/bash/.bashrc
+++ b/bash/.bashrc
@@ -60,8 +60,11 @@ alias change_yubikey='pkill gpg-agent ssh-agent pinentry ; eval $(gpg-agent --da
 #### ALIAS ####
 ###############
 # {{{
-alias flake='docker run -v $(pwd):/data -it gitlab.infomaniak.ch:4567/production-purple/ci/flake8/master:latest flake8 --ignore=E266,E303,E501,W391,E722,W503 --max-line-length=110 /data'
+alias kl='kubectl'
+alias dockerdns=' docker run -d --hostname dns.mageddo --restart=unless-stopped -p 5380:5380 -v /var/run/docker.sock:/var/run/docker.sock -v /etc/resolv.conf:/etc/resolv.conf -d defreitas/dns-proxy-server'
+alias flake='docker run --rm -v $(pwd):/data -it gitlab.infomaniak.ch:4567/production-purple/ci/flake8/master:latest flake8 --ignore=E266,E303,E501,W391,E722,W503,F403,F405 --max-line-length=110 /data'
 alias dockre='docker'
+alias dokcer='docker'
 alias connect='ssh ra "sudo issh ra /home/scripts/connect $1"'
 alias activate='source venv/bin/activate'
 alias baticolux='cd ~/Documents/baticolux'
diff --git a/git/.gitconfig b/git/.gitconfig
index 8fb12cc..2d8b458 100644
--- a/git/.gitconfig
+++ b/git/.gitconfig
@@ -1,6 +1,8 @@
 [user]
 	name = Frank Villaro-Dixon
 	email = frank.villaro@infomaniak.com
+	signingKey = 34EB3167C1C803629833E5E40139000E88CF36E7
+
 
 [color]
 	branch = auto
@@ -19,10 +21,12 @@
 	psuh = push
 	psh = push
 	undo-commit = reset --soft HEAD^
+	tag = tag -s
 
 [core]
 	editor = vim
 	excludesfile = ~/.gitignore
+	hooksPath = .githooks
 
 [merge]
 	tool = vimdiff
@@ -33,6 +37,5 @@
 [push]
 	default = current
 
-
 [credential]
 	helper = cache
diff --git a/graphical/.xinitrc b/graphical/.xinitrc
index 5955856..336bacb 100644
--- a/graphical/.xinitrc
+++ b/graphical/.xinitrc
@@ -49,7 +49,7 @@ done &
 #xautolock -time 60 -locker "systemctl suspend" &
 redshift -l 46:6 || true &
 
-xautolock -time 0 -locker slock &
+xautolock -time 4 -locker slock &
 
 
 #ssh-agent -t 10 /home/frank/Programmation/dotfiles/dwm/dwm
diff --git a/vim/.vim/spell/en.utf-8.add b/vim/.vim/spell/en.utf-8.add
index d390969..fe6bbc9 100644
--- a/vim/.vim/spell/en.utf-8.add
+++ b/vim/.vim/spell/en.utf-8.add
@@ -109,3 +109,5 @@ self/!
 Baticolux
 hydrologic
 hydropower
+spec
+NEIGHBOR
diff --git a/vim/.vim/vimrc b/vim/.vim/vimrc
index f3397f9..9eb3834 100644
--- a/vim/.vim/vimrc
+++ b/vim/.vim/vimrc
@@ -82,9 +82,7 @@ nnoremap n nzz
 
 set list
 set listchars=tab:\|\-"Cool for ifs/whiles
-"set listchars=tab:\|\ "Cool for ifs/whiles
 set listchars+=trail:· "For eol with spaces
-"set listchars+=eol:↲ "To show eol;not very useful with trail, but cool anyway :p
 set listchars+=nbsp:⍽ "For unbreakeable spaces
 
 highlight NonText ctermfg=8 guifg=lightblue "EOL