Ignored a few unwanted files

.gitignore

@@ -1,2 +1,6 @@
-.vim/bundle
+files/.vim/bundle
+files/.vim/spell
+files/.vim/.netrwhist
 *.swp
+*__pycache__
+files/.config/systemd/user/*.wants

files/.bashrc

@@ -43,6 +43,7 @@ export GTK_IM_MODULE=xim
 export EDITOR=/usr/bin/vim
 
 export _JAVA_OPTIONS='-Dawt.useSystemAAFontSettings=on -Dswing.aatext=true -Dswing.defaultlaf=com.sun.java.swing.plaf.gtk.GTKLookAndFeel'
+export ANDROID_HOME=/opt/android-sdk
 
 export PATH="$PATH:/home/tobast/bin"
 export MANPATH="$MANPATH:$HOME/local/man"
@@ -52,4 +53,4 @@ export TERMINAL="/usr/bin/terminator"
 export LC_REALUSER='tbastian'
 
 # Opam
-which opam > /dev/null 2>&1 && [ -f ~/.opam ] && eval `opam config env`
+which opam > /dev/null 2>&1 && [ -d ~/.opam ] && eval `opam config env`

files/.config/i3/bin/i3lock

@@ -3,4 +3,11 @@
 WPDIR=~/Images/wallpapers/
 WALLPAPER=$WPDIR/wallpaper_lock.png
 
+if [ -x /usr/bin/gpg-connect-agent ] ; then
+	[ -f ~/.bash_sshagent ] && source ~/.bash_sshagent
+	echo "$SSH_AUTH_SOCK" | grep -q gpg && \
+		echo "RELOADAGENT" | gpg-connect-agent > /dev/null
+	echo "FORGET MEH" | xclip -selection clipboard
+fi
+
 /usr/bin/i3lock -tefi "$WALLPAPER"

files/.config/i3/bin/screenplace

@@ -1,6 +1,7 @@
 #!/bin/bash
 
 dftScreen="LVDS1"
+WALLPAPER_CMD="$(dirname $(readlink -f $0))/wallpaper"
 
 screens=$(xrandr | grep " connected" | cut -f 1 -d ' ' | grep -v "LVDS")
 screen=$(echo $screens | head -n 1)
@@ -19,6 +20,9 @@ case "$1" in
 	;;
 *)
 	>&2 echo -e "Missing argument. Usage:\n$0 [reset|left|right]"
+	exit 1
 	;;
 esac
 
+$WALLPAPER_CMD
+

files/.config/i3/config

@@ -220,6 +220,7 @@ exec --no-startup-id /bin/bash ~/.config/i3/bin/wallpaper
 # Tray
 #exec --no-startup-id gnome-settings-daemon
 exec --no-startup-id nm-applet
+exec --no-startup-id setxkbmap -option caps:swapescape
 
 # Screen lock
 exec --no-startup-id xautolock -time 10 -locker ~/.config/i3/bin/i3lock

files/.config/terminator/config

@@ -1,4 +1,5 @@
 [global_config]
+  dbus = False
   enabled_plugins = LaunchpadCodeURLHandler, APTURLHandler, LaunchpadBugURLHandler
   title_inactive_bg_color = "#000000"
   title_inactive_fg_color = "#909090"
@@ -23,8 +24,9 @@
     background_darkness = 0.79
     background_image = None
     background_type = transparent
-    font = Monospace 9
+    cursor_color = "#fffeab"
-    foreground_color = "#fffeab"
+    font = DejaVu Sans Mono 8
+    foreground_color = "#faffb4"
     scrollbar_position = hidden
     show_titlebar = False
     use_system_font = False

files/.i3/py3status/microphone.py

@@ -19,45 +19,65 @@ Colors:
 import subprocess
 
 
+class NoMicrophone(Exception):
+    pass
+
+
+class Error(Exception):
+    pass
+
+
 class Py3status:
     format_muted = '\uf131'  # FontAwesome
     format_unmuted = '\uf130'  # FontAwesome
 
-    class Error(Exception):
-        pass
-
     def microphone(self):
-        isMute = self.__getMuteStatus__()
+        try:
-        color = self.py3.COLOR_MUTE if isMute else self.py3.COLOR_UNMUTE
+            isMute = self.__getMuteStatus__()
-        text = self.format_muted if isMute else self.format_unmuted
+            color = self.py3.COLOR_MUTE if isMute else self.py3.COLOR_UNMUTE
-        return {
+            text = self.format_muted if isMute else self.format_unmuted
-            'full_text': text,
+            return {
-            'color': color,
+                'full_text': text,
-        }
+                'color': color,
+            }
+        except NoMicrophone:
+            return {
+                'full_text': '',
+            }
+        except Error:
+            return {
+                'full_text': '...',
+            }
 
     def __getPaList__(self):
         try:
             paOutput = subprocess.check_output(["pacmd", "list-sources"])
-        except CalledProcessError:
+        except subprocess.CalledProcessError:
             raise Error()
 
         return paOutput.decode()
 
     def __getMuteStatus__(self):
-        paList = self.__getPaList__()
+        try:
-        fromCurrent = paList[paList.find('* index:'):]
+            paList = self.__getPaList__()
-        MUTED_STR = 'muted: '
+            fromCurrent = paList[paList.index('* index:'):]
-        fromMutestat = fromCurrent[fromCurrent.find(MUTED_STR)
+            MUTED_STR = 'muted: '
-                                   + len(MUTED_STR):]
+            fromMutestat = fromCurrent[fromCurrent.index(MUTED_STR)
-        return fromMutestat[:3] == 'yes'
+                                       + len(MUTED_STR):]
+            return fromMutestat[:3] == 'yes'
+        except ValueError:
+            raise NoMicrophone()
 
     def __toggleMuteStatus__(self):
-        isMuted = self.__getMuteStatus__()
+        try:
-        paList = self.__getPaList__()
+            isMuted = self.__getMuteStatus__()
-        fromCurrent = paList[paList.find('* index: ')+len('* index: '):]
+            paList = self.__getPaList__()
-        sourceId = int(fromCurrent[:fromCurrent.find('\n')])
+            fromCurrent = paList[paList.index('* index: ')+len('* index: '):]
-        subprocess.call(['pacmd', 'set-source-mute', str(sourceId),
+            sourceId = int(fromCurrent[:fromCurrent.index('\n')])
-                         str(int(not isMuted))])
+            subprocess.call(['pacmd', 'set-source-mute', str(sourceId),
+                             str(int(not isMuted))])
+        except ValueError:
+            raise NoMicrophone()
 
     def on_click(self, event):
         self.__toggleMuteStatus__()

files/.ssh/config

@@ -1,76 +0,0 @@
-Host sas
-	User tbastian
-	Hostname sas.eleves.ens.fr
-
-Host minecraft
-	User minecraft
-	Hostname games.tobast.fr
-
-Host teeworlds
-	User teeworlds
-	Hostname games.tobast.fr
-
-Host insurgency
-	User insurgency
-	Hostname games.tobast.fr
-
-Host factorio
-	User factorio
-	Hostname games.tobast.fr
-
-Host orac
-	User btheophile
-	Hostname orac.amt.edu.au
-
-Host www.tobast
-	User www
-	Hostname tobast.fr
-
-Host proloVM
-	User tobast
-	Hostname prologin.org
-	Port 42022
-
-Host rosa
-	Hostname prologin.org
-
-Host git-pass
-	User gogs
-	Hostname git.tobast.fr
-	Identityfile ~/.password-store/id_rsa_pass
-	IdentitiesOnly yes
-
-Host promethee
-	User root
-	Hostname promethee.tobast.fr
-	ProxyJump paquebot
-
-Host gourous
-	User gourous
-	Hostname sas.eleves.ens.fr
-	SendEnv LC_REALUSER
-
-# Virtual networks, safe anyway
-Host 10.42.0.*
-	StrictHostKeyChecking no
-	UserKnownHostsFile=/dev/null
-
-Host paquebot
-	User tbastian
-	Hostname paquebot.ens.fr
-Host thym
-	User tbastian
-	Hostname thym.ens.fr
-Host allege
-	User tbastian
-	Hostname allege.ens.fr
-
-Host annuaire-dev
-	User annuaire-dev
-	Hostname www.eleves.ens.fr
-	SendEnv LC_REALUSER
-
-Host tartelette
-	User tobast
-	ProxyJump paquebot
-	Hostname tartelette.tobast.fr

files/.vim/.netrwhist

@@ -1,7 +0,0 @@
-let g:netrw_dirhistmax  =10
-let g:netrw_dirhist_cnt =5
-let g:netrw_dirhist_1='/etc/initcpio'
-let g:netrw_dirhist_2='/home/tobast/.opam/system/share/merlin/vim/ftplugin'
-let g:netrw_dirhist_3='/home/tobast/cours/L3/semantique/project/repo/.git'
-let g:netrw_dirhist_4='/home/tobast/cours/L3/internship/code/cam-strategies/operations'
-let g:netrw_dirhist_5='/home/tobast/.config/systemd/user'

files/.vim/ftplugin/ocaml.vim

@@ -0,0 +1,4 @@
+" Few more key bindings definitions for Merlin
+
+nnoremap <LocalLeader>l :MerlinLocate<CR>
+nnoremap <LocalLeader>d :MerlinDestruct<CR>

files/.vim/spell/en.utf-8.add

@@ -1,34 +0,0 @@
-injectivity
-ESPs
-Théophile
-Bastian
-Winskel
-github
-tobast
-Clairambault
-Glynn
-functor
-iteratively
-CCS
-isomorphism
-pre
-https
-acyclic
-Hasse
-games
-PCF
-Ghica
-Murowski
-Murawski
-interleavings
-LTS
-poset
-bicategory
-preorder
-chktex
-backend
-Javascript
-frontend
-spelllang=fr
-Reprojection
-Prologin

files/.vim/spell/fr.utf-8.add

@@ -1,13 +0,0 @@
-typage
-copycat
-contraposée
-Adequacy
-Villette
-Bastian
-Vandermonde
-iid
-PPV
-d'overfitting
-Prologin
-qu'intelligemment
-non-bloquante

files/.vimrc

@@ -29,11 +29,13 @@ call vundle#begin()
 Plugin 'VundleVim/Vundle.vim'
 Plugin 'LucHermitte/lh-vim-lib'
 Plugin 'LucHermitte/local_vimrc'
+Plugin 'tpope/vim-fugitive'
 "Plugin 'Smart-Tabs'
 Plugin 'hynek/vim-python-pep8-indent'
 Plugin 'tpope/vim-git'
 Plugin 'fs111/pydoc.vim'
 Plugin 'vim-syntastic/syntastic'
+Plugin 'itchyny/vim-haskell-indent'
 
 call vundle#end()            " required
 filetype plugin indent on    " required
@@ -92,4 +94,8 @@ map [[ :lprev<CR>
 map ]] :lnext<CR>
 map [] :ll<CR>
 nnoremap <Leader>w :call TrimWhitespace()<CR>
+nnoremap K <Esc>i<CR><Esc>
 
+xnoremap <Leader>x <esc>:'<,'>:w !xclip -selection clipboard<CR><esc>
+
+set tw=79