uncommited shit

Utils/emojenu

@@ -0,0 +1,22 @@
+#!/bin/bash
+
+window=$(xdotool getactivewindow)
+
+pushd "$(dirname "$0")"
+
+#set -- junk $(cat kaomoji | cut -d '|' -f 1 | dmenu -p emoji)
+set -- junk $(cat kaomoji |  rofi -dmenu -i | cut -d'|' -f1)
+
+shift
+
+if [ $# -eq 0 ]; then
+    exit
+fi
+
+emoji=$(cat kaomoji | grep "^$(echo $@)|" | cut -d '|' -f 2 | tr -s '\r')
+
+#echo "$emoji" | xclip -selection clipboard
+
+xdotool windowactivate $window
+echo -n "$emoji" | xclip -sel clip
+xdotool type "$emoji"

Utils/nsh

@@ -0,0 +1,73 @@
+#!/bin/bash
+#
+# This is a nsh script compatible wrapper written uin bash + curl
+# Status: Prototype
+#
+# It is supposed to be fully compatible inside script.
+#
+# Not working: long option format ex: --clientid
+
+exec_curl() {
+  local server=$1
+  local method=$2
+  shift 2
+
+  # -k disable SSL validation h2-master cert seems invalid
+  # curl: (60) SSL certificate problem: unable to get local issuer certificate
+  # was a bad certif on h2-master, changed by Rene.
+  local curlcmd="curl -k -s -H 'Expect:' -F \"apikey=$H2_APIKEY\""
+
+  local a v curl_arg
+  local i=1
+  local argc=$#
+  while [[ $i -le $argc ]]
+  do
+    # this is index syntax for $@[i]
+    a=${@:i:1}
+    # remove dash -a => a
+    a=${a#-}
+    v=${@:i+1:1}
+
+    if [[ -n $v ]] ; then
+      curl_arg="-F '$a=$v'"
+    elif [[ -z $v && $a == 'h' ]] ; then
+      # help force bool true
+      # https://gitlab.infomaniak.ch/production/h2-daemon-core/blob/master/nsh/cmdline.c#L62
+      curl_arg="-F '$a=1'"
+    else
+      curl_arg="-F '$a'"
+    fi
+
+    if [[ $v == '-' ]]; then
+      # file
+      curl_arg="-F '$a=@-; filename=$a'"
+      stdin=1
+    fi
+
+    curlcmd+=" $curl_arg"
+    i=$((i + 2))
+  done
+
+  #local url="https://$server.infomaniak.ch:888/$method"
+  if [ -z $NSH_PORT ]; then
+    NSH_PORT=888
+  fi
+
+  if [ -z $NSH_HTTP ]; then
+    NSH_PROTO=https
+  else
+    NSH_PROTO=http
+  fi
+
+  local url="$NSH_PROTO://$server:$NSH_PORT/$method"
+  curlcmd+=" $url"
+
+  if [[ -d ~/tmp/ ]]; then
+    # debug logging
+    echo "$(date "+%y%m%d_%H%M%S") $curlcmd" >> ~/tmp/nsh.log
+  fi
+  eval "$curlcmd"
+}
+
+exec_curl "$@"
+

Utils/octopus.sh

@@ -89,9 +89,9 @@ case $1 in
 
 
 	"monitor")
-		SNU=`xrandr | grep VGA | cut -d' ' -f1 | cut -c4`
+		#SNU=`xrandr | grep VGA | cut -d' ' -f1 | cut -c4`
-		VGA=VGA$SNU
+		VGA=eDP-1
-		LVDS=LVDS$SNU
+		LVDS=DP-1
 		case $2 in
 			"extern")
 				xrandr --output $LVDS --off \
@@ -137,7 +137,7 @@ case $1 in
 				xset dpms force off
 				;;
 		esac
-		$0 wallpaper
+		#$0 wallpaper
 		;;
 
 	"refresh")
@@ -149,20 +149,14 @@ case $1 in
 		VOLUME=`/usr/bin/amixer get Master | grep "%" | cut -d' ' -f7 | head -n1`
 ##		VOLUME=`amixer get Master | grep '\[' | cut -d' ' -f6`
 
-		SONG=`mpc | head -n 1 | cut -d. -f1`
-		maxSL=22
-		if [ ${#SONG} -gt $maxSL ]; then
-			SONG=`echo $SONG | cut -c1-$maxSL`.
-		fi
-############		BTC=`BTC_stats.sh`
 
 		MEMFREE=`awk '/MemFree/ {printf( "%.0f", $2 / 1024 )}' /proc/meminfo`
 		MEMCACHED=`awk '/Cached/ {printf( "%.0f", $2 / 10240 )}' /proc/meminfo`
 		MEMFT=`echo "$MEMFREE + $MEMCACHED" | bc`
 
-		xsetroot -name "$VOLUME [$STAT $SONG] :: Bat $BATT_PCT $BATT_TIME :: $DATE" || true
+		xsetroot -name "$VOLUME :: Bat $BATT_PCT $BATT_TIME :: $DATE" || true
-		$0 conf-ifaces
+#		$0 conf-ifaces
-		$0 leds power off
+#		$0 leds power off
 		$0 checkbatt
 		;;
 
@@ -198,18 +192,13 @@ case $1 in
 		;;
 
 	"init-all")
-		xrandr | grep "$VGA disconnected" > /dev/null
-		if [ $? -eq 0 ]; then
-			$0 monitor laptop
-		else
-			$0 monitor extern
-		fi
 
 		sudo killall dhcpcd
 		$0 init-wifi &
 		$0 init-ethernet &
 		$0 init-mouse
 		$0 wallpaper
+		$0 monitor dual
 		;;
 
 	"init-mouse")
@@ -235,7 +224,8 @@ case $1 in
 
 	"lock")
 		slock &
-		$0 monitor off
+		#/home/frank/Programmation/dotfiles/lock/i3lock-color/lock.sh
+		#$0 monitor off
 		;;
 
 	"print")

bash/.bash_ps1

@@ -89,24 +89,46 @@ __git_ps1 ()
 	fi
 }
 
-if [ $HOSTNAME = "intersect" ]; then
+if [ $HOSTNAME = "franks" ]; then
 	IntroCol=$BIBlack;
 else
 	IntroCol=$BIRed;
 fi
 
-export PS1=$IntroCol$Time12h$Color_Off'$(git branch &>/dev/null;\
+PROMPT_COMMAND=__prompt_command
-if [ $? -eq 0 ]; then \
+__prompt_command() {
-	echo "$(echo `git status` | grep "nothing to commit" > /dev/null 2>&1; \
+	local EXIT="$?"
-	if [ "$?" -eq "0" ]; then \
+	PS1=""
-		# @4 - Clean repository - nothing to commit
+
-		echo "'$Green'"$(__git_ps1 " (%s)"); \
+
-	else \
+	if [ $EXIT -eq 0 ]; then
-		# @5 - Changes to working tree
+		PS1+="✔️"
-		echo "'$IRed'"$(__git_ps1 " {%s}"); \
+	else
-	fi) '$BYellow$PathShort$Color_Off'\$ "; \
+		PS1+="❌"
-else \
+	fi
-		# @2 - Prompt when not in GIT repo
+
-		echo " '$Yellow$PathShort$Color_Off'\$ "; \
+	if [ -n "$VIRTUAL_ENV" ]; then
-fi)'"\n"
+		PS1+="(🧙)"
+	fi
+
+	PS1+=" "
+	PS1+="$IntroCol$Time12h$Color_Off"
+
+	git branch &>/dev/null
+	if [ $? -eq 0 ]; then #In repo
+		git status | grep 'nothing to commit' >/dev/null 2>&1
+		if [ $? -eq 0 ]; then
+			PS1+="$Green"$(__git_ps1 " (%s)")
+		else
+			PS1+="$IRed"$(__git_ps1 " {%s}")
+		fi
+		PS1+="$BYellow$PathShort$Color_Off"
+	else
+		PS1+=" $Yellow$PathShort$Color_Off\$ "
+	fi
+
+	PS1+="\n"
+
+}
+
 

bash/.bashrc

@@ -6,6 +6,7 @@ shopt -s dirspell
 ##shopt -s autocd #Like zsh
 PROMPT_COMMAND='history -a'
 
+ source /usr/share/bash-completion/completions/pass
 
 alias dvorak='setxkbmap dvorak; setxkbmap -option compose:ralt && xmodmap .Xmodmap'
 #dvorak
@@ -49,30 +50,19 @@ xterm*|rxvt*)
 esac
 
 
-#####LA COULEUR DU SHELL
-#PS1="$RED\u$DFT$white@$magenta\h $DFT>>$CYAN\w $DFT"
-#PS1="\u@\h >>\w "
-#PS1="\[$RED\u$DFT$white@$magenta\h $DFT>>$CYAN\w $DFT\]"
-#PS1="\[$RED\]\u\[$DFT$white\]@\[$magenta\]\h \[$DFT\]>>\[$CYAN\]\w \[$DFT\]"
-#PROMPT_COMMAND='history -a;echo -en "\033[m\033[38;5;2m"$(( `sed -nu "s/MemFree:[\t ]\+\([0-9]\+\) kB/\1/p" /proc/meminfo`/1024))"\033[38;5;22m/"$((`sed -nu "s/MemTotal:[\t ]\+\([0-9]\+\) kB/\1/Ip" /proc/meminfo`/1024 ))MB"\t\033[m\033[38;5;55m$(< /proc/loadavg)\033[m"'
 
-#if [ "$HOSTNAME" == "chuck" ]; then
-#	MY_HOST_COL='[31m' #ugly !
-#else
-#	MY_HOST_COL='[34m'
-#fi
-
-#PS1='\[\e[0;36m\]\t \[\e[1;30m\][\[\e$MY_HOST_COL\]\u@\H\[\e[1;30m\]\[\e[0;32m\]\[\e[1;30m\]] \[\e[1;37m\]\w\[\e[0;37m\] \n$ '
 source ~/.bash_ps1
 
-#PS1='\[\e[0;36m\] \T \[\e[1;30m\][\[\e$MY_HOST_COL\]\u@\H\[\e[1;30m\]\[\e[0;32m\]\[\e[1;30m\]] \[\e[1;37m\]\w\[\e[0;37m\] \n$ '
-
 
+alias change_yubikey='pkill gpg-agent ssh-agent pinentry ; eval $(gpg-agent --daemon --enable-ssh-support) ; gpg-connect-agent updatestartuptty /bye'
 
 ###############
 #### 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 dockre='docker'
+alias connect='ssh ra "sudo issh ra /home/scripts/connect $1"'
 alias activate='source venv/bin/activate'
 alias baticolux='cd ~/Documents/baticolux'
 alias spotify='spotify --force-device-scale-factor=1.0000001'
@@ -136,11 +126,7 @@ alias amke='make'
 alias mak='make'
 alias amek='make'
 
-alias BSI2='cd ~/Documents/Studies/BSI2*/'
+OCTOPUS=~/Programmation/dotfiles/Utils/octopus.sh
-UNI_STUDY_PATH='/home/frank/Documents/Studies/MUSE1/'
-alias BSI3='cd "$UNI_STUDY_PATH"'
-
-OCTOPUS=~/.my_utils/octopus.sh
 alias dual='$OCTOPUS monitor dual'
 alias laptop='$OCTOPUS monitor laptop'
 alias programming='$OCTOPUS monitor programming'
@@ -154,29 +140,17 @@ alias volmute='$OCTOPUS volume mute'
 
 alias suspend='$OCTOPUS suspend'
 
-alias mfilms='cd /dev/shm && mkdir films && sshfs frank@vi-di.fr:/media/ films/'
-alias muni='cd /dev/shm && mkdir uni && sshfs villaro0@pc69240:/user/l1/2011/villaro0/ uni/'
-alias mlakes='cd /dev/shm && mkdir lakes && sshfs frank@lilakes:/home/frank lakes'
-alias mswisselecfrank='cd /dev/shm && mkdir swisselec-frank && sshfs frank@11.10.10.2:/home/frank swisselec-frank/'
-alias mswisselecnas='cd /dev/shm && mkdir swisselec-nas && sshfs frank_swe:/run/user/1000/gvfs/smb-share:server=192.168.128.11,share=file_servers swisselec-nas/'
-alias mmac='cd /dev/shm && mkdir -p frank-mac && sshfs frank@192.168.42.10:/Users/frank/ frank-mac/'
-alias mmur='cd /dev/shm && mkdir -p mur && sshfs root@11.42.1.5:/motion mur'
-
 alias upgrub='sudo grub-mkconfig -o /boot/grub/grub.cfg'
 
 alias upkey='gpg --keyserver subkeys.pgp.net --send-key 6F36914A'
 alias shm='cd /dev/shm'
 
-alias ip6='ip -6'
-alias disk-usage-analyser='baobab'
-alias o='octave --quiet --no-gui'
 alias R='R --quiet'
 alias cdu='cdu -idh'
 alias dus='du -sh * | sort -h'
 alias eclipseJEE='/home/frank/Programmation/J2EE/eclipse/eclipse'
 alias mst='mvn install -DskipTests'
 alias arc='tig'
-alias ccat='pygmentize -g' #python-fragments
 alias phpserver='php -S localhost:8080'
 # }}}
 
@@ -186,16 +160,6 @@ alias phpserver='php -S localhost:8080'
 ###############
 # {{{
 
-function toGVA {
-	wget http://frank.villaro-dixon.eu/TPG/ -q -O -
-	echo ""
-}
-
-function fuck {
-	killall -9 "$1"
-	echo "fucking $1" killed
-}
-
 function cd #{{{
 {
 	MY_LAST=`pwd`
@@ -230,7 +194,8 @@ function man { #{{{
 	man "$@"
 } #}}}
 
-if [[ -z $SSH_CLIENT ]]; then
+#if [[ -z $SSH_CLIENT ]]; then
+if false; then
 	alias ssh='my_ssh'
 	function my_ssh #{{{
 	{
@@ -597,6 +562,7 @@ function dockat
 {
 	docker exec -ti $1 bash
 }
+alias dockip='docker inspect --format "{{ .NetworkSettings.IPAddress }}"'
 
 # }}}
 
@@ -634,17 +600,16 @@ export HISTSIZE=99999999
 HISTTIMEFORMAT="%d/%m/%y %T "
 # }}}
 export PATH="$HOME/opt/cross/bin:$PATH"
-export PATH="$HOME/.gem/ruby/2.2.0/bin:$PATH"
-export PYTHONSTARTUP=~/Programmation/dotfiles/startup.py
-NPM_PACKAGES="${HOME}/.npm-packages"
 
-PATH="$NPM_PACKAGES/bin:$PATH"
 
-# Unset manpath so we can inherit from /etc/manpath via the `manpath` command
+PATH=$PATH:/home/frank/Programmation/kubectx
-unset MANPATH # delete if you already modified MANPATH elsewhere in your config
+export KUBECONFIG=$(echo ~/.kube/*yml | tr ' ' ':')
-export MANPATH="$NPM_PACKAGES/share/man:$(manpath)"
+
 
 #Launch startx when login
 [[ -z $DISPLAY && $XDG_VTNR -le 4 && -z $SSH_CLIENT ]] && exec startx
 
 
+source ~/.env-secrets
+export SSH_AUTH_SOCK=/run/user/1000/gnupg/S.gpg-agent.ssh
+source <(kubectl completion bash)

dwm/config.h

@@ -34,8 +34,8 @@ static const char *tags[] = {
 	"m2", };
 */
 static const char *tags[] = {
-	"1:FF", "2", "3:CONS", "4:CONS", "5:CONS", "6:IDE", "7", "8", "9",
+	"1", "2", "3:CONS", "4:CONS", "5:CONS", "6:IDE", "7", "8", "9",
-	"q", "w", "e", "r:RSS", "m:MAIL", "z:IM", };
+	"q", "w", "e", "r:RSS", "t:MAIL", "z:IM", };
 
 static const char *urgent_cmd = "/home/frank/Programmation/dotfiles/Utils/urgent.sh";
 
@@ -85,10 +85,9 @@ static const Layout layouts[] = {
 
 /* commands */
 static const char *dmenucmd[] = { "dmenu_run", "-fn", font, "-nb", normbgcolor, "-nf", normfgcolor, "-sb", selbgcolor, "-sf", selfgcolor, NULL };
-static const char *termcmd[]  = { "roxterm", NULL };
+static const char *termcmd[]  = { "/usr/bin/gnome-terminal", NULL };
 static const char *webcmd[] = { "firefox", NULL };
-//static const char *mailcmd[] = { "thunderbird", NULL };
+static const char *mailcmd[] = { "thunderbird", NULL };
-static const char *muttcmd[] = {"roxterm", "-e", "mutt", NULL};
 
 //static const char *lockcmd[] = { "xlock", "-mode", "blank", "-startCmd", "~/Programmation/Utils/monitorOff.sh", "-timeout", "15", "-dpmsoff", "1", NULL };
 
@@ -102,15 +101,16 @@ static const char *audionext[] = {"octopus.sh", "audio", "next", NULL};
 static const char *audioprev[] = {"octopus.sh", "audio", "prev", NULL};
 static const char *inceptionplay[] = {"octopus.sh", "play", "inception", NULL};
 static const char *printscreen[] = {"scrot", "-s", NULL};
+static const char *emojenu[] = {"emojenu",  NULL};
 
 static Key keys[] = {
 	/* modifier                     key        function        argument */
 	{ MODKEY|ShiftMask,      XK_p,      spawn,          {.v = dmenucmd } },
 	{ MODKEY|ShiftMask,      XK_Return, spawn,          {.v = termcmd } },
 	{ MODKEY|ShiftMask,      XK_f,      spawn,          {.v = webcmd } },
-//	{ MODKEY|ShiftMask,      XK_t,      spawn,          {.v = mailcmd } },
+	{ MODKEY|ShiftMask,      XK_t,      spawn,          {.v = mailcmd } },
-	{ MODKEY|ShiftMask,      XK_m,      spawn,          {.v = muttcmd } },
 	{ MODKEY|ShiftMask,      XK_l,      spawn,          {.v = lockcmd } },
+	{ MODKEY,                XK_e,      spawn,          {.v = emojenu} },
 	{ MODKEY,      XK_m,      spawn,          {.v = monoff } },
 	{ MODKEY,                XK_b,      togglebar,      {0} },
 	{ MODKEY,                XK_j,      focusstack,     {.i = +1 } }, /* change window focus */
@@ -154,7 +154,6 @@ static Key keys[] = {
 	TAGKEYS(                 XK_9,                      8)
 	TAGKEYS(                 XK_q,                      9)
 	TAGKEYS(                 XK_w,                      10)
-	TAGKEYS(                 XK_e,                      11)
 	TAGKEYS(                 XK_r,                      12)
 	TAGKEYS(                 XK_t,                      13)
 	TAGKEYS(                 XK_z,                      14)

git/.gitconfig

@@ -1,6 +1,6 @@
 [user]
 	name = Frank Villaro-Dixon
-	email = frank@vi-di.fr
+	email = frank.villaro@infomaniak.com
 
 [color]
 	branch = auto
@@ -17,6 +17,7 @@
 	br = branch
 	pu = push
 	psuh = push
+	psh = push
 	undo-commit = reset --soft HEAD^
 
 [core]
@@ -32,14 +33,6 @@
 [push]
 	default = current
 
-[sendemail]
-	smtpencryption = tls
-	smtpserver = www.villaro-dixon.eu
-	smtpserverport = 587
-	smtpuser = frank_mail
 
 [credential]
 	helper = cache
-[http]
-	sslCAInfo = /home/frank/.git_certificates
-	sslcainfo = /home/frank/.git_certificates

graphical/.Xmodmap

@@ -18,10 +18,10 @@
 !Espace insécable: Shift-Space ou Compose-Space-Space
 !keycode 65 = space nobreakspace emspace
 
-remove Shift = Shift_L
+!remove Shift = Shift_L
-remove Lock = Caps_Lock
+!remove Lock = Caps_Lock
-remove Control = Control_L
+!remove Control = Control_L
-keysym Control_L = Caps_Lock
+!keysym Control_L = Caps_Lock
-keysym Caps_Lock = Control_L
+!keysym Caps_Lock = Control_L
-add Lock = Caps_Lock
+!add Lock = Caps_Lock
-add Control = Control_L
+!add Control = Control_L

graphical/.xinitrc

@@ -8,7 +8,7 @@ if [ -d /etc/X11/xinit/xinitrc.d ]; then
   unset f
 fi
 
-export PATH=~/.my_utils/:$PATH
+export PATH=~/Programation/dotfiles/Utils/:$PATH
 
 source ~/.bashrc
 
@@ -26,12 +26,6 @@ xbindkeysrc &
 xmodmap ~/.Xmodmap
 
 $OCTOPUS init-all 1>> /dev/shm/Octopus_logs 2>> /dev/shm/Octopus_logs &
-ftpfct.sh >/dev/null || true &
-
-ps aux | grep mpd | grep -v grep
-if [ $? -eq 1 ]; then
-	mpd &
-fi;
 
 #The status bar
 while true; do
@@ -55,10 +49,7 @@ done &
 #xautolock -time 60 -locker "systemctl suspend" &
 redshift -l 46:6 || true &
 
-#WTF is wrong with it always forgetting the fucking playlist !?
+xautolock -time 0 -locker slock &
-mpc ls | mpc add
-mpc random on
-
 
 
 #ssh-agent -t 10 /home/frank/Programmation/dotfiles/dwm/dwm

vim/.vim/skeletons/skel.py

@@ -1,7 +1,7 @@
 #!/usr/bin/env python3
 # -*- coding: utf-8 -*-
-## Frank@Villaro-Dixon.eu - DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE, etc.
+## frank.villaro@infomaniak.com - DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE, etc.
 
 <+CODE+>
 
-# vim: set ts=4 sw=4 noet:
+# vim: set ts=4 sw=4 et:

vim/.vim/vimrc

@@ -1,6 +1,8 @@
 " Ma conf vim - Frank
 
-"execute pathogen#infect()
+"set ttyfast
+set lazyredraw
+set modeline
 
 syntax on
 color desert
@@ -102,8 +104,8 @@ set preserveindent
 set autoread "lit les modifs externes
 
 "highlight identical words
-autocmd CursorMoved *
+"autocmd CursorMoved *
-	\ exe printf('match IncSearch /\V\<%s\>/', escape(expand('<cword>'), '/\'))
+"	\ exe printf('match IncSearch /\V\<%s\>/', escape(expand('<cword>'), '/\'))
 
 " lines longer than 80 chars {{{
 set cc=80
@@ -186,7 +188,8 @@ au BufRead,BufNewFile *.js set ts=4 sw=4
 
 
 "Automatic documentation
-autocmd BufNewFile,BufRead *.py set keywordprg=pydoc ts=4 sw=4 noexpandtab
+autocmd BufNewFile,BufRead *.yml set autoindent ts=2 sw=2
+autocmd BufNewFile,BufRead *.py set keywordprg=pydoc ts=4 sw=4 expandtab
 autocmd BufNewFile,BufRead *.php set autoindent ts=4 sw=4 keywordprg=~/.vim/scripts/doc.php.sh
 autocmd BufNewFile,BufRead *.R set ts=4 sw=4 keywordprg=~/.vim/scripts/doc.R.sh
 autocmd BufNewFile,BufRead *.m set ts=4 sw=4 keywordprg=~/.vim/scripts/doc.octave.sh