Use environment variable in dotfiles

14 files changed, 88 insertions, 55 deletions

diff --git a/.dotmap b/.dotmap
index 9686014..f3a6946 100644
--- a/.dotmap
+++ b/.dotmap
@@ -1,34 +1,35 @@
 declare -A dotmap
-dotmap[/home/urbain/.bashrc]=/home/urbain/dotfiles/bashrc
-dotmap[/home/urbain/bin]=/home/urbain/dotfiles/bin
-dotmap[/home/urbain/.config/dunst/dunstrc]=/home/urbain/dotfiles/dunstrc
-dotmap[/home/urbain/.config/i3/config]=/home/urbain/dotfiles/i3/config
-dotmap[/home/urbain/.config/i3status/config]=/home/urbain/dotfiles/i3/i3status.conf
-dotmap[/home/urbain/.config/newsbeuter]=/home/urbain/dotfiles/newsbeuter
-dotmap[/home/urbain/.config/nvim]=/home/urbain/dotfiles/vim
-dotmap[/home/urbain/.config/qutebrowser]=/home/urbain/dotfiles/qutebrowser
-dotmap[/home/urbain/.config/zathura/zathurarc]=/home/urbain/dotfiles/zathurarc
-dotmap[/home/urbain/.gitconfig]=/home/urbain/dotfiles/gitconfig
-dotmap[/home/urbain/.git_template]=/home/urbain/dotfiles/git_template
-dotmap[/home/urbain/.inputrc]=/home/urbain/dotfiles/inputrc
-dotmap[/home/urbain/.latexmkrc]=/home/urbain/dotfiles/latexmkrc
-dotmap[/home/urbain/.ledgerrc]=/home/urbain/dotfiles/ledgerrc
-dotmap[/home/urbain/.local/share/qutebrowser/userscripts]=/home/urbain/dotfiles/qutebrowser/userscripts
-dotmap[/home/urbain/.mbsyncrc]=/home/urbain/dotfiles/mbsyncrc
-dotmap[/home/urbain/.mrconfig]=/home/urbain/dotfiles/mr/mrconfig
-dotmap[/home/urbain/.mrtrust]=/home/urbain/dotfiles/mr/mrtrust
-dotmap[/home/urbain/.msmtprc]=/home/urbain/dotfiles/msmtprc
-dotmap[/home/urbain/.mutt]=/home/urbain/dotfiles/mutt
-dotmap[/home/urbain/.ncmpcpp]=/home/urbain/dotfiles/ncmpcpp
-dotmap[/home/urbain/.password-store]=/home/urbain/dotfiles/passwords
-dotmap[/home/urbain/.surfraw.bookmarks]=/home/urbain/dotfiles/surfraw.bookmarks
-dotmap[/home/urbain/.tmux.conf]=/home/urbain/dotfiles/tmux.conf
-dotmap[/home/urbain/.urxvt]=/home/urbain/dotfiles/urxvt
-dotmap[/home/urbain/.vifm]=/home/urbain/dotfiles/vifm
-dotmap[/home/urbain/.vim]=/home/urbain/dotfiles/vim
-dotmap[/home/urbain/.vimrc]=/home/urbain/dotfiles/vim/vimrc
-dotmap[/home/urbain/.xinitrc]=/home/urbain/dotfiles/xinitrc
-dotmap[/home/urbain/.Xresources]=/home/urbain/dotfiles/Xresources
-dotmap[/home/urbain/.zgen]=/home/urbain/dotfiles/zsh/zgen
-dotmap[/home/urbain/.zsh]=/home/urbain/dotfiles/zsh
-dotmap[/home/urbain/.zshrc]=/home/urbain/dotfiles/zsh/zshrc
+dotmap[$HOME/.bashrc]=$HOME/dotfiles/bashrc
+dotmap[$HOME/bin]=$HOME/dotfiles/bin
+dotmap[$HOME/.config/dunst/dunstrc]=$HOME/dotfiles/dunstrc
+dotmap[$HOME/.config/i3/config]=$HOME/dotfiles/i3/config
+dotmap[$HOME/.config/i3status/config]=$HOME/dotfiles/i3/i3status.conf
+dotmap[$HOME/.config/newsbeuter]=$HOME/dotfiles/newsbeuter
+dotmap[$HOME/.config/nvim]=$HOME/dotfiles/vim
+dotmap[$HOME/.config/qutebrowser]=$HOME/dotfiles/qutebrowser
+dotmap[$HOME/.config/zathura/zathurarc]=$HOME/dotfiles/zathurarc
+dotmap[$HOME/.gitconfig]=$HOME/dotfiles/gitconfig
+dotmap[$HOME/.git_template]=$HOME/dotfiles/git_template
+dotmap[$HOME/.inputrc]=$HOME/dotfiles/inputrc
+dotmap[$HOME/.latexmkrc]=$HOME/dotfiles/latexmkrc
+dotmap[$HOME/.ledgerrc]=$HOME/dotfiles/ledgerrc
+dotmap[$HOME/.local/share/qutebrowser/userscripts]=$HOME/dotfiles/qutebrowser/userscripts
+dotmap[$HOME/.mbsyncrc]=$HOME/dotfiles/mbsyncrc
+dotmap[$HOME/.mrconfig]=$HOME/dotfiles/mr/mrconfig
+dotmap[$HOME/.mrtrust]=$HOME/dotfiles/mr/mrtrust
+dotmap[$HOME/.msmtprc]=$HOME/dotfiles/msmtprc
+dotmap[$HOME/.mutt]=$HOME/dotfiles/mutt
+dotmap[$HOME/.ncmpcpp]=$HOME/dotfiles/ncmpcpp
+dotmap[$HOME/.password-store]=$HOME/dotfiles/passwords
+dotmap[$HOME/.surfraw.bookmarks]=$HOME/dotfiles/surfraw.bookmarks
+dotmap[$HOME/.tmux.conf]=$HOME/dotfiles/tmux.conf
+dotmap[$HOME/.urxvt]=$HOME/dotfiles/urxvt
+dotmap[$HOME/.vifm]=$HOME/dotfiles/vifm
+dotmap[$HOME/.vim]=$HOME/dotfiles/vim
+dotmap[$HOME/.vimperatorrc]=$HOME/dotfiles/vimperatorrc
+dotmap[$HOME/.vimrc]=$HOME/dotfiles/vim/vimrc
+dotmap[$HOME/.xinitrc]=$HOME/dotfiles/xinitrc
+dotmap[$HOME/.Xresources]=$HOME/dotfiles/Xresources
+dotmap[$HOME/.zgen]=$HOME/dotfiles/zsh/zgen
+dotmap[$HOME/.zsh]=$HOME/dotfiles/zsh
+dotmap[$HOME/.zshrc]=$HOME/dotfiles/zsh/zshrc
diff --git a/Xresources/dark b/Xresources/dark
index 5f28203..1c51f21 100644
--- a/Xresources/dark
+++ b/Xresources/dark
@@ -1,4 +1,4 @@
-# include "/home/urbain/.Xresources/base"
+# include ".Xresources/base"
 
 URxvt.borderColor: #002b36
 
diff --git a/Xresources/light b/Xresources/light
index f1e1342..c4b962d 100644
--- a/Xresources/light
+++ b/Xresources/light
@@ -1,4 +1,4 @@
-# include "/home/urbain/.Xresources/base"
+# include ".Xresources/base"
 
 URxvt.borderColor: #fdf6e3
 
diff --git a/Xresources/seoul b/Xresources/seoul
index 4bbf978..344ec3c 100644
--- a/Xresources/seoul
+++ b/Xresources/seoul
@@ -1,4 +1,4 @@
-# include "/home/urbain/.Xresources/base"
+# include ".Xresources/base"
 
 ! Border color
 /* URxvt.borderColor: #3a3a3a */
diff --git a/Xresources/transparent b/Xresources/transparent
index 72c9684..b3c2d8e 100644
--- a/Xresources/transparent
+++ b/Xresources/transparent
@@ -1,4 +1,4 @@
-# include "/home/urbain/.Xresources/dark"
+# include "dark"
 
 ! True transparency
 URxvt.transparent: true
diff --git a/bin/.dotmap b/bin/.dotmap
new file mode 100644
index 0000000..f3a6946
--- /dev/null
+++ b/bin/.dotmap
@@ -0,0 +1,35 @@
+declare -A dotmap
+dotmap[$HOME/.bashrc]=$HOME/dotfiles/bashrc
+dotmap[$HOME/bin]=$HOME/dotfiles/bin
+dotmap[$HOME/.config/dunst/dunstrc]=$HOME/dotfiles/dunstrc
+dotmap[$HOME/.config/i3/config]=$HOME/dotfiles/i3/config
+dotmap[$HOME/.config/i3status/config]=$HOME/dotfiles/i3/i3status.conf
+dotmap[$HOME/.config/newsbeuter]=$HOME/dotfiles/newsbeuter
+dotmap[$HOME/.config/nvim]=$HOME/dotfiles/vim
+dotmap[$HOME/.config/qutebrowser]=$HOME/dotfiles/qutebrowser
+dotmap[$HOME/.config/zathura/zathurarc]=$HOME/dotfiles/zathurarc
+dotmap[$HOME/.gitconfig]=$HOME/dotfiles/gitconfig
+dotmap[$HOME/.git_template]=$HOME/dotfiles/git_template
+dotmap[$HOME/.inputrc]=$HOME/dotfiles/inputrc
+dotmap[$HOME/.latexmkrc]=$HOME/dotfiles/latexmkrc
+dotmap[$HOME/.ledgerrc]=$HOME/dotfiles/ledgerrc
+dotmap[$HOME/.local/share/qutebrowser/userscripts]=$HOME/dotfiles/qutebrowser/userscripts
+dotmap[$HOME/.mbsyncrc]=$HOME/dotfiles/mbsyncrc
+dotmap[$HOME/.mrconfig]=$HOME/dotfiles/mr/mrconfig
+dotmap[$HOME/.mrtrust]=$HOME/dotfiles/mr/mrtrust
+dotmap[$HOME/.msmtprc]=$HOME/dotfiles/msmtprc
+dotmap[$HOME/.mutt]=$HOME/dotfiles/mutt
+dotmap[$HOME/.ncmpcpp]=$HOME/dotfiles/ncmpcpp
+dotmap[$HOME/.password-store]=$HOME/dotfiles/passwords
+dotmap[$HOME/.surfraw.bookmarks]=$HOME/dotfiles/surfraw.bookmarks
+dotmap[$HOME/.tmux.conf]=$HOME/dotfiles/tmux.conf
+dotmap[$HOME/.urxvt]=$HOME/dotfiles/urxvt
+dotmap[$HOME/.vifm]=$HOME/dotfiles/vifm
+dotmap[$HOME/.vim]=$HOME/dotfiles/vim
+dotmap[$HOME/.vimperatorrc]=$HOME/dotfiles/vimperatorrc
+dotmap[$HOME/.vimrc]=$HOME/dotfiles/vim/vimrc
+dotmap[$HOME/.xinitrc]=$HOME/dotfiles/xinitrc
+dotmap[$HOME/.Xresources]=$HOME/dotfiles/Xresources
+dotmap[$HOME/.zgen]=$HOME/dotfiles/zsh/zgen
+dotmap[$HOME/.zsh]=$HOME/dotfiles/zsh
+dotmap[$HOME/.zshrc]=$HOME/dotfiles/zsh/zshrc
diff --git a/bin/dot b/bin/dot
index 0049e9c..acb0e64 100755
--- a/bin/dot
+++ b/bin/dot
@@ -40,7 +40,7 @@ save()
 {
     echo "declare -A dotmap" > .dotmap
     get_links | while read link; do
-        echo "dotmap[$link]=$(realpath -q $link)" >> .dotmap
+        echo "dotmap[$link]=$(readlink -f -q $link)" | sed "s#$HOME#"'$HOME#g' >> .dotmap
     done
     sort .dotmap -o .dotmap
 }
diff --git a/crontab b/crontab
index cc69c4c..6f1c80a 100644
--- a/crontab
+++ b/crontab
@@ -1 +1 @@
-*/5 * * * * /home/urbain/bin/email >> /home/urbain/.cron_email_log
+*/5 * * * * $HOME/bin/email >> $HOME/.cron_email_log
diff --git a/vifm/vifmrc b/vifm/vifmrc
index d6f8936..8a301db 100644
--- a/vifm/vifmrc
+++ b/vifm/vifmrc
@@ -185,6 +185,7 @@ filextype *.djvu
 
 " Audio
 filetype *.wav,*.mp3,*.flac,*.ogg,*.m4a,*.wma,*.ape,*.ac3
+       \ mpv %f,
        \ {Play using ffplay}
        \ ffplay -nodisp %c,
        \ {Play using MPlayer}
@@ -245,6 +246,11 @@ filetype *.asc
        \ {Check signature}
        \ !!gpg --verify %c,
 
+" GMSH file
+filetype *.geo, *.msh, *.pos
+       \ {Open in gmsh}
+       \ gmsh %d,
+
 " Torrent
 filetype *.torrent ktorrent %f &
 fileviewer *.torrent dumptorrent -v %c
diff --git a/vim/vimrc b/vim/vimrc
index 437b7d6..854f61c 100644
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -180,7 +180,7 @@ set foldlevel=0
 set noswapfile
 set nowritebackup
 set undofile
-set undodir=/home/urbain/.vim/vimundo/
+set undodir=$HOME/.vim/vimundo/
 
 " Layout window
 set nonumber
@@ -205,7 +205,7 @@ set nojoinspaces
 
 " Case and spell
 set nospell
-" set spellfile="/home/urbain/.vim/spell/en.utf-8.add"
+" set spellfile="$HOME/.vim/spell/en.utf-8.add"
 set smartcase
 set ignorecase
 
diff --git a/xinitrc b/xinitrc
index f267bfc..9118272 100755
--- a/xinitrc
+++ b/xinitrc
@@ -7,7 +7,7 @@ xset r rate 400 50
 $HOME/bin/keyboard
 
 # Load Xresources to light colorscheme
-xrdb $HOME/.Xresources/dark
+xrdb -I$HOME ~/.Xresources/dark
 
 # Background
 feh --bg-fill --randomize /usr/share/backgrounds
diff --git a/zsh/functions b/zsh/functions
index 2b43e1a..7c2b49a 100644
--- a/zsh/functions
+++ b/zsh/functions
@@ -6,7 +6,7 @@ function colo {
     $HOME/bin/recolor < ~/.Xresources/$1
 
     # Load Xresources file for future sessions
-    xrdb ~/.Xresources/$1
+    xrdb -I$HOME ~/.Xresources/$1
 
     # Change environment variable
     export COLORSCHEME=$1
@@ -14,12 +14,3 @@ function colo {
     # Change default environment variable for future sessions
     sed -i --follow-symlinks "s/^export COLORSCHEME=.*$/export COLORSCHEME=$1/g" ~/.zsh/tmp
 }
-
-fshow() {
-    git log --graph --color=always \
-        --format="%C(auto)%h%d %s %C(black)%C(bold)%cr" "$@" |
-    fzf --ansi --no-sort --reverse --tiebreak=index --toggle-sort=\` \
-        --bind 'ctrl-m:execute:
-    echo {} | grep -o "[a-f0-9]\{7\}" |
-    xargs -I % sh -c "git show --color=always % | less -R"'
-}
diff --git a/zsh/plugins b/zsh/plugins
index d1f5bad..43b2916 100644
--- a/zsh/plugins
+++ b/zsh/plugins
@@ -1,7 +1,7 @@
 #! /bin/zsh
 
 # Load zgen
-source "/home/urbain/.zgen/zgen.zsh"
+source "$HOME/.zgen/zgen.zsh"
 
 # Load plugins
 if ! zgen saved; then
diff --git a/zsh/zshrc b/zsh/zshrc
index ee46766..fe44e9e 100644
--- a/zsh/zshrc
+++ b/zsh/zshrc
@@ -14,7 +14,7 @@ bindkey '^P' history-beginning-search-backward
 bindkey '^N' history-beginning-search-forward
 
 # Paths of executables
-export PATH="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/usr/bin/core_perl:/home/urbain/bin"
+export PATH="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/usr/bin/core_perl:$HOME/bin"
 
 # Editor
 export EDITOR=/usr/bin/nvim
@@ -32,7 +32,7 @@ fi
 
 # Export GPG-agent related
 if [[ -f "${HOME}/.gpg-agent-info" ]]; then
-    source /home/urbain/.gpg-agent-info
+    source ${HOME}/.gpg-agent-info
     export GPG_AGENT_INFO
     export SSH_AUTH_SOCK
 fi