rodolphe/dotfiles
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Rationalize the use of custom config files

Browse source
This commit is contained in:
Rodolphe Bréard 2021-09-12 12:24:06 +02:00
parent 5bc0b45cdc
commit 2425fdca43
9 changed files with 9 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
.bashrc
View file

@ -11,12 +11,14 @@ export HISTCONTROL=ignoredups
export CLICOLOR=1 export CLICOLOR=1
export EDITOR='vim' export EDITOR='vim'
export PAGER='less' export PAGER='less'
export MY_CONFIG="$HOME/.config/rodolphe"
export USER_NICKNAME="Rodolphe Bréard" export USER_NICKNAME="Rodolphe Bréard"
export DEBEMAIL="packages+deb@what.tf" export DEBEMAIL="packages+deb@what.tf"
export DEBFULLNAME="$USER_NICKNAME" export DEBFULLNAME="$USER_NICKNAME"
# Path # 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 # Colors
[ "$CLICOLOR" -ne 0 ] && hash dircolors 2>/dev/null && eval $(dircolors -b) [ "$CLICOLOR" -ne 0 ] && hash dircolors 2>/dev/null && eval $(dircolors -b)

0
.set_compose_key.sh → .config/rodolphe/.set_compose_key.sh
View file

0
.setpath.sh → .config/rodolphe/.setpath.sh
View file

0
.xdg_set_env.sh → .config/rodolphe/.xdg_set_env.sh
View file

3
.config/zsh/.zshrc
View file

@ -35,9 +35,6 @@ fi
# Proxy settings # Proxy settings
[ -f "$HOME/.proxy" ] && . "$HOME/.proxy" [ -f "$HOME/.proxy" ] && . "$HOME/.proxy"
# Compose key
[ -f ~/.set_compose_key.sh ] && . ~/.set_compose_key.sh
# skim # skim
[ -f "/usr/share/skim/key-bindings.zsh" ] && . /usr/share/skim/key-bindings.zsh [ -f "/usr/share/skim/key-bindings.zsh" ] && . /usr/share/skim/key-bindings.zsh
[ -f "/usr/share/skim/completion.zsh" ] && . /usr/share/skim/completion.zsh [ -f "/usr/share/skim/completion.zsh" ] && . /usr/share/skim/completion.zsh

1
.xinitrc
View file

@ -1,5 +1,4 @@
[ -f ~/.xprofile ] && . ~/.xprofile [ -f ~/.xprofile ] && . ~/.xprofile
[ -f ~/.setpath.sh ] && . ~/.setpath.sh
AUTHORISED_WM="qtile i3" AUTHORISED_WM="qtile i3"
AVAILABLE_WM="" AVAILABLE_WM=""

4
.xprofile
View file

@ -1,8 +1,6 @@
[ -f /etc/xprofile ] && . /etc/xprofile [ -f /etc/xprofile ] && . /etc/xprofile
[ -f ~/.Xresources ] && xrdb -merge ~/.Xresources [ -f ~/.Xresources ] && xrdb -merge ~/.Xresources
[ -f ~/.setpath.sh ] && . ~/.setpath.sh [ -f "$MY_CONFIG/.set_compose_key.sh" ] && . "$MY_CONFIG/.set_compose_key.sh"
[ -f ~/.set_compose_key.sh ] && . ~/.set_compose_key.sh
[ -f ~/.xdg_set_env.sh ] && . ~/.xdg_set_env.sh
hash xcompmgr 2>/dev/null && xcompmgr & hash xcompmgr 2>/dev/null && xcompmgr &
hash xscreensaver 2>/dev/null && xscreensaver -no-splash & hash xscreensaver 2>/dev/null && xscreensaver -no-splash &

7
.zshenv
View file

@ -1,6 +1,9 @@
# ZSH configuration # ZSH configuration
export ZDOTDIR="$HOME/.config/zsh" export ZDOTDIR="$HOME/.config/zsh"
# Custom configuration
export MY_CONFIG="$HOME/.config/rodolphe"
# History # History
export HISTFILE_DIR="$HOME/.local/share/zsh" export HISTFILE_DIR="$HOME/.local/share/zsh"
export HISTFILE="$HISTFILE_DIR/.zsh_history" export HISTFILE="$HISTFILE_DIR/.zsh_history"
@ -19,5 +22,5 @@ export DEBEMAIL="packages+deb@what.tf"
export DEBFULLNAME="$USER_NICKNAME" export DEBFULLNAME="$USER_NICKNAME"
# Path # Path
[ -f ~/.setpath.sh ] && . ~/.setpath.sh [ -f "$MY_CONFIG/.setpath.sh" ] && . "$MY_CONFIG/.setpath.sh"
[ -f ~/.xdg_set_env.sh ] && . ~/.xdg_set_env.sh [ -f "$MY_CONFIG/.xdg_set_env.sh" ] && . "$MY_CONFIG/.xdg_set_env.sh"

1
bin/sway
View file

@ -9,6 +9,5 @@ if [ -f "$COMPOSE_KEY_FILE" ]; then
COMPOSE_KEY=$(cat "$COMPOSE_KEY_FILE") COMPOSE_KEY=$(cat "$COMPOSE_KEY_FILE")
export XKB_DEFAULT_OPTIONS="compose:$COMPOSE_KEY" export XKB_DEFAULT_OPTIONS="compose:$COMPOSE_KEY"
fi fi
[ -f "$HOME/.xdg_set_env.sh" ] && . "$HOME/.xdg_set_env.sh"
/usr/bin/sway "$@" /usr/bin/sway "$@"