Functionnal changes

8 files changed, 75 insertions, 82 deletions

diff --git a/.config/env b/.config/env
new file mode 100644
index 0000000..12e6ae7
--- /dev/null
+++ b/.config/env
@@ -0,0 +1,58 @@
+# PATH
+export PATH="$HOME"/.local/bin:"$PATH"
+
+# Apps
+export EDITOR='nvim'
+export VISUAL='nvim'
+export PAGER='less'
+export TERMINAL='alacritty'
+export BROWSER='firefox'
+export READER='zathura'
+export FILE='vifm'
+
+# UTF-8
+export CHARSET='UTF-8'
+export LANG='en_US.UTF-8'
+export LC_COLLATE='C'
+
+# xdg
+export XDG_DATA_HOME="$HOME"/.local/share
+export XDG_CONFIG_HOME="$HOME"/.config
+export XDG_CACHE_HOME="$HOME"/.cache
+export XDG_RUNTIME_DIR=/tmp
+export XDG_MUSIC_DIR="$HOME"/mu
+
+# Cleanup
+export ANDROID_SDK_HOME="$XDG_CONFIG_HOME"/android
+export ANDROID_AVD_HOME="$XDG_DATA_HOME"/android/
+export ANDROID_EMULATOR_HOME="$XDG_DATA_HOME"/android/
+export ADB_VENDOR_KEY="$XDG_CONFIG_HOME"/android
+export CARGO_HOME="$XDG_DATA_HOME"/cargo
+export CCACHE_CONFIGPATH="$XDG_CONFIG_HOME"/ccache.conf
+export CCACHE_DIR="$XDG_CACHE_HOME"/ccache
+export DOCKER_CONFIG="$XDG_CONFIG_HOME"/docker
+export GNUPGHOME="$XDG_DATA_HOME"/gnupg
+export MACHINE_STORAGE_PATH="$XDG_DATA_HOME"/docker-machine
+export NODE_REPL_HISTORY="$XDG_DATA_HOME"/node_repl_history
+export NOTMUCH_CONFIG="$XDG_CONFIG_HOME"/notmuch/notmuchrc
+export NMBGIT="$XDG_DATA_HOME"/notmuch/nmbug
+export NPM_CONFIG_USERCONFIG=$XDG_CONFIG_HOME/npm/npmrc
+export SCREENRC="$XDG_CONFIG_HOME"/screen/screenrc
+export STACK_ROOT="$XDG_DATA_HOME"/stack
+export PASSWORD_STORE_DIR="$XDG_DATA_HOME"/pass
+export XINITRC="$XDG_CONFIG_HOME"/x11/xinitrc
+export XSERVERRC="$XDG_CONFIG_HOME"/x11/xserverrc
+
+# ccache
+export CCACHE_PATH='/usr/bin:/usr/local/bin:/usr/local/llvm11/bin'
+export CCACHE_DIR='/var/cache/ccache-jozan'
+export CCACHE_LOGFILE='/var/log/ccache.log'
+
+# Apps config
+export FZF_DEFAULT_COMMAND='ag -g "" --ignore dotfiles-bsd'
+export FZF_DEFAULT_OPTS='--height 40% --layout=reverse --border'
+export LESS="-R"
+export LESSHISTFILE='-'
+export MANPAGER="less -R -M +Gg"
+export MPD_HOST="$HOME"/.local/share/mpd/socket
+export RUSTFLAGS="-L /usr/local/lib"
diff --git a/.config/fish/alias.fish b/.config/fish/alias.fish
index a262b50..af216e3 100644
--- a/.config/fish/alias.fish
+++ b/.config/fish/alias.fish
@@ -1,10 +1,3 @@
-# alias.fish
-#      _
-#     | | ___   ___
-#  _  | |/ _ \ / _ \
-# | |_| | (_) |  __/
-#  \___/ \___/ \___|
-
 alias ls='exa -l'
 alias c='clear'
 alias less='less --tabs 4'
@@ -28,7 +21,7 @@ alias diff='colordiff'
 alias tree='tree -C'
 alias yt='straw-viewer --api=auto'
 alias gyt='gtk-straw-viewer'
-alias dgit='git --git-dir=$HOME/Documents/dotfiles-bsd --work-tree=$HOME'
+alias dgit="git --git-dir=$HOME/docs/dotfiles-bsd --work-tree=$HOME"
 alias vim='nvim'
 alias gst='git status'
 alias ga='git add'
@@ -58,5 +51,6 @@ alias rsox='sox -t oss default'
 alias calcurse="calcurse -C $XDG_CONFIG_HOME/calcurse -D $XDG_DATA_HOME/calcurse"
 alias abook="abook -C $XDG_CONFIG_HOME/abook/abookrc --datafile $XDG_DATA_HOME/abook/addressbook"
 alias dosbox="dosbox -conf $XDG_CONFIG_HOME/dosbox/dosbox.conf"
-alias svn="svn --config-dir "$XDG_CONFIG_HOME"/subversion"
-alias gpg2="gpg2 --homedir "$XDG_DATA_HOME"/gnupg"
+alias svn="svn --config-dir $XDG_CONFIG_HOME/subversion"
+alias gpg2="gpg2 --homedir $XDG_DATA_HOME/gnupg"
+alias yarn="yarn --use-yarnrc $XDG_CONFIG_HOME/yarn/config"
diff --git a/.config/fish/config.fish b/.config/fish/config.fish
index f653708..87d0dae 100644
--- a/.config/fish/config.fish
+++ b/.config/fish/config.fish
@@ -5,6 +5,8 @@
 # | |_| | (_) |  __/
 #  \___/ \___/ \___|
 
+source $HOME/.config/env
+
 export LESS_TERMCAP_mb=(printf '\e[1;31m')
 export LESS_TERMCAP_md=(printf '\e[1;31m')
 export LESS_TERMCAP_me=(printf '\e[0m')
diff --git a/.config/x11/xinitrc b/.config/x11/xinitrc
index f411a66..c81a51a 100644
--- a/.config/x11/xinitrc
+++ b/.config/x11/xinitrc
@@ -1,3 +1,3 @@
-xrdb ~/.config/x11/xresources
-source ~/.profile
+cd /home/jozan
+xrdb /home/jozan/.config/x11/xresources
 dbus-launch bspwm
diff --git a/.local/bin/kb b/.local/bin/kb
new file mode 100755
index 0000000..778d2d6
--- /dev/null
+++ b/.local/bin/kb
@@ -0,0 +1,4 @@
+#!/usr/local/bin/dash
+
+xset r rate 200 150
+setxkbmap -layout us,fr -option grp:alt_shift_toggle
diff --git a/.local/bin/setwp b/.local/bin/setwp
index 97d7aa9..a2689ff 100755
--- a/.local/bin/setwp
+++ b/.local/bin/setwp
@@ -5,8 +5,8 @@ use warnings;
 use File::Copy;
 
 use constant {
-	WP_FILE	=> '/usr/home/jozan/Pictures/wallpaper.jpg',
-	WP_POOL	=> '/usr/home/jozan/Pictures/wallpapers/'
+	WP_FILE	=> '/usr/home/jozan/pics/wallpaper.jpg',
+	WP_POOL	=> '/usr/home/jozan/pics/wallpapers/'
 };
 use constant FEH_PATH	=> '/usr/local/bin/feh';
 
@@ -41,6 +41,7 @@ sub set_wp
 {
 	system(
 		FEH_PATH,
+		'--no-fehbg',
 		'--bg-fill',
 		WP_FILE,
 		'--bg-fill',
diff --git a/.local/bin/webview.sh b/.local/bin/webview.sh
index 62cec30..bbf114a 100755
--- a/.local/bin/webview.sh
+++ b/.local/bin/webview.sh
@@ -5,7 +5,7 @@ mpvFiles="mkv mp4 gif"
 sxivFiles="png jpg jpeg jpe xpm"
 wgetFiles="flac mp3 mp3?source=feed opus pdf doc docx"
 
-cd ~/Downloads || exit
+cd ~/dl || exit
 
 if echo "$sxivFiles" | grep -w "$ext" > /dev/null; then
 	nohup sxiv "$1" > /dev/null &
diff --git a/.profile b/.profile
index d091318..246cc10 100644
--- a/.profile
+++ b/.profile
@@ -1,10 +1,3 @@
-# .profile
-#      _
-#     | | ___   ___
-#  _  | |/ _ \ / _ \
-# | |_| | (_) |  __/
-#  \___/ \___/ \___|
-
 # $FreeBSD: releng/12.1/share/skel/dot.profile 337497 2018-08-08 19:24:20Z asomers $
 #
 # .profile - Bourne Shell startup script for login shells
@@ -24,66 +17,7 @@
 # TERM=xterm; 	export TERM
 
 # set ENV to a file invoked each time sh is started for interactive use.
-ENV=$HOME/.shrc; export ENV
-
-# PATH
-export PATH="${HOME}/.local/bin:${PATH}"
-
-# Apps
-export EDITOR='nvim'
-export VISUAL='nvim'
-export PAGER='less'
-export TERMINAL='alacritty'
-export BROWSER='firefox'
-export READER='zathura'
-export FILE='vifm'
-
-# UTF-8
-export CHARSET='UTF-8'
-export LANG='en_US.UTF-8'
-export LC_COLLATE='C'
-
-# xdg
-export XDG_DATA_HOME="$HOME"/.local/share
-export XDG_CONFIG_HOME="$HOME"/.config
-export XDG_CACHE_HOME="$HOME"/.cache
-export XDG_RUNTIME_DIR=/tmp
-export XDG_MUSIC_DIR="$HOME"/mu
-
-# Cleanup
-export ANDROID_SDK_HOME="$XDG_CONFIG_HOME"/android
-export ANDROID_AVD_HOME="$XDG_DATA_HOME"/android/
-export ANDROID_EMULATOR_HOME="$XDG_DATA_HOME"/android/
-export ADB_VENDOR_KEY="$XDG_CONFIG_HOME"/android
-export CARGO_HOME="$XDG_DATA_HOME"/cargo
-export DOCKER_CONFIG="$XDG_CONFIG_HOME"/docker
-export GNUPGHOME="$XDG_DATA_HOME"/gnupg
-export MACHINE_STORAGE_PATH="$XDG_DATA_HOME"/docker-machine
-export NODE_REPL_HISTORY="$XDG_DATA_HOME"/node_repl_history
-export NOTMUCH_CONFIG="$XDG_CONFIG_HOME"/notmuch/notmuchrc
-export NMBGIT="$XDG_DATA_HOME"/notmuch/nmbug
-export NPM_CONFIG_USERCONFIG=$XDG_CONFIG_HOME/npm/npmrc
-export SCREENRC="$XDG_CONFIG_HOME"/screen/screenrc
-export STACK_ROOT="$XDG_DATA_HOME"/stack
-export PASSWORD_STORE_DIR="$XDG_DATA_HOME"/pass
-export VIMINIT='if !has('nvim') | source "$XDG_CONFIG_HOME/vim/vimrc" | endif'
-export XAUTHORITY="$XDG_RUNTIME_DIR"/Xauthority
-export XINITRC="$XDG_CONFIG_HOME"/x11/xinitrc
-export XSERVERRC="$XDG_CONFIG_HOME"/x11/xserverrc
-
-# ccache
-export CCACHE_PATH='/usr/bin:/usr/local/bin:/usr/local/llvm11/bin'
-export CCACHE_DIR='/var/cache/ccache-jozan'
-export CCACHE_LOGFILE='/var/log/ccache.log'
-
-# Apps config
-export FZF_DEFAULT_COMMAND='ag -g "" --ignore dotfiles-bsd'
-export FZF_DEFAULT_OPTS='--height 40% --layout=reverse --border'
-export LESS="-R"
-export LESSHISTFILE='-'
-export MANPAGER="less -R -M +Gg"
-export MPD_HOST="${HOME}/.config/mpd/socket"
-export RUSTFLAGS="-L /usr/local/lib"
+export ENV=$HOME/.config/env
 
 # Query terminal size; useful for serial lines.
 # if [ -x /usr/bin/resizewin ] ; then /usr/bin/resizewin -z ; fi