diff --git a/.bashrc b/.bashrc index b63617c..8052503 100644 --- a/.bashrc +++ b/.bashrc @@ -11,12 +11,14 @@ export HISTCONTROL=ignoredups export CLICOLOR=1 export EDITOR='vim' export PAGER='less' +export MY_CONFIG="$HOME/.config/rodolphe" export USER_NICKNAME="Rodolphe Bréard" export DEBEMAIL="packages+deb@what.tf" export DEBFULLNAME="$USER_NICKNAME" # Path -[ -f ~/.setpath.sh ] && . ~/.setpath.sh +[ -f "$MY_CONFIG/.setpath.sh" ] && . "$MY_CONFIG/.setpath.sh" +[ -f "$MY_CONFIG/.xdg_set_env.sh" ] && . "$MY_CONFIG/.xdg_set_env.sh" # Colors [ "$CLICOLOR" -ne 0 ] && hash dircolors 2>/dev/null && eval $(dircolors -b) diff --git a/.set_compose_key.sh b/.config/rodolphe/.set_compose_key.sh similarity index 100% rename from .set_compose_key.sh rename to .config/rodolphe/.set_compose_key.sh diff --git a/.setpath.sh b/.config/rodolphe/.setpath.sh similarity index 100% rename from .setpath.sh rename to .config/rodolphe/.setpath.sh diff --git a/.xdg_set_env.sh b/.config/rodolphe/.xdg_set_env.sh similarity index 100% rename from .xdg_set_env.sh rename to .config/rodolphe/.xdg_set_env.sh diff --git a/.config/zsh/.zshrc b/.config/zsh/.zshrc index 7ace671..cd58b33 100644 --- a/.config/zsh/.zshrc +++ b/.config/zsh/.zshrc @@ -35,9 +35,6 @@ fi # Proxy settings [ -f "$HOME/.proxy" ] && . "$HOME/.proxy" -# Compose key -[ -f ~/.set_compose_key.sh ] && . ~/.set_compose_key.sh - # skim [ -f "/usr/share/skim/key-bindings.zsh" ] && . /usr/share/skim/key-bindings.zsh [ -f "/usr/share/skim/completion.zsh" ] && . /usr/share/skim/completion.zsh diff --git a/.xinitrc b/.xinitrc index 2828351..bdeeaa0 100755 --- a/.xinitrc +++ b/.xinitrc @@ -1,5 +1,4 @@ [ -f ~/.xprofile ] && . ~/.xprofile -[ -f ~/.setpath.sh ] && . ~/.setpath.sh AUTHORISED_WM="qtile i3" AVAILABLE_WM="" diff --git a/.xprofile b/.xprofile index a8591dd..54cd048 100644 --- a/.xprofile +++ b/.xprofile @@ -1,8 +1,6 @@ [ -f /etc/xprofile ] && . /etc/xprofile [ -f ~/.Xresources ] && xrdb -merge ~/.Xresources -[ -f ~/.setpath.sh ] && . ~/.setpath.sh -[ -f ~/.set_compose_key.sh ] && . ~/.set_compose_key.sh -[ -f ~/.xdg_set_env.sh ] && . ~/.xdg_set_env.sh +[ -f "$MY_CONFIG/.set_compose_key.sh" ] && . "$MY_CONFIG/.set_compose_key.sh" hash xcompmgr 2>/dev/null && xcompmgr & hash xscreensaver 2>/dev/null && xscreensaver -no-splash & diff --git a/.zshenv b/.zshenv index ca60d44..cbbbde1 100644 --- a/.zshenv +++ b/.zshenv @@ -1,6 +1,9 @@ # ZSH configuration export ZDOTDIR="$HOME/.config/zsh" +# Custom configuration +export MY_CONFIG="$HOME/.config/rodolphe" + # History export HISTFILE_DIR="$HOME/.local/share/zsh" export HISTFILE="$HISTFILE_DIR/.zsh_history" @@ -19,5 +22,5 @@ export DEBEMAIL="packages+deb@what.tf" export DEBFULLNAME="$USER_NICKNAME" # Path -[ -f ~/.setpath.sh ] && . ~/.setpath.sh -[ -f ~/.xdg_set_env.sh ] && . ~/.xdg_set_env.sh +[ -f "$MY_CONFIG/.setpath.sh" ] && . "$MY_CONFIG/.setpath.sh" +[ -f "$MY_CONFIG/.xdg_set_env.sh" ] && . "$MY_CONFIG/.xdg_set_env.sh" diff --git a/bin/sway b/bin/sway index ede4dfe..9c69c48 100755 --- a/bin/sway +++ b/bin/sway @@ -9,6 +9,5 @@ if [ -f "$COMPOSE_KEY_FILE" ]; then COMPOSE_KEY=$(cat "$COMPOSE_KEY_FILE") export XKB_DEFAULT_OPTIONS="compose:$COMPOSE_KEY" fi -[ -f "$HOME/.xdg_set_env.sh" ] && . "$HOME/.xdg_set_env.sh" /usr/bin/sway "$@"