diff options
| author | Charles Cabergs <charles.cabergs@colruytgroup.com> | 2022-09-06 09:13:24 +0200 |
|---|---|---|
| committer | Charles Cabergs <charles.cabergs@colruytgroup.com> | 2022-09-06 09:13:24 +0200 |
| commit | 92bbb2fb27c2726bc1c72c4e50adc88144dee4b1 (patch) | |
| tree | 66e9d25e7aa33e211c7aa48071a258cf1704f540 /config/zsh | |
| parent | 6525757c2aff704550ca46991ca1d11e09f11f01 (diff) | |
| parent | d54e8f15d776e59b2f8b70bb94c5041509b391f0 (diff) | |
| download | dotfiles-92bbb2fb27c2726bc1c72c4e50adc88144dee4b1.tar.gz dotfiles-92bbb2fb27c2726bc1c72c4e50adc88144dee4b1.tar.bz2 dotfiles-92bbb2fb27c2726bc1c72c4e50adc88144dee4b1.zip | |
Merge branch 'master' of https://github.com/cacharle/dotfiles
Diffstat (limited to 'config/zsh')
| -rw-r--r-- | config/zsh/.zshrc | 32 | ||||
| -rw-r--r-- | config/zsh/aliases.zsh | 7 | ||||
| -rwxr-xr-x | config/zsh/zprofile | 5 |
3 files changed, 11 insertions, 33 deletions
diff --git a/config/zsh/.zshrc b/config/zsh/.zshrc index e7dac3d..dbaaa90 100644 --- a/config/zsh/.zshrc +++ b/config/zsh/.zshrc @@ -9,7 +9,7 @@ case $(tty) in /dev/tty[1-9]) # %~ path ('~' if $HOME) # %B/%b start/stop bold - # %B/%b start/stop color + # %F/%f start/stop color # shellcheck disable=SC2039,SC3003 NEWLINE=$'\n' export PROMPT="${NEWLINE}%B%F{blue}%~%f${NEWLINE}%F{red}> %f%b" @@ -109,31 +109,5 @@ then . /usr/share/doc/pkgfile/command-not-found.zsh fi -# upload-config() { -# scp -qr "$HOME/.vim" cce424r@ds-train: -# scp -q "$HOME/.config/vim/vimrc" cce424r@ds-train:.vimrc -# -# scp -qr "$HOME/.vim" cce424r@ds-attic: -# scp -q "$HOME/.config/vim/vimrc" cce424r@ds-attic:.vimrc -# } - -# >>> conda initialize >>> -# !! Contents within this block are managed by 'conda init' !! -__conda_setup="$('/usr/local/anaconda3/bin/conda' 'shell.zsh' 'hook' 2> /dev/null)" -if [ $? -eq 0 ]; then - eval "$__conda_setup" -else - if [ -f "/usr/local/anaconda3/etc/profile.d/conda.sh" ]; then - . "/usr/local/anaconda3/etc/profile.d/conda.sh" - else - export PATH="/usr/local/anaconda3/bin:$PATH" - fi -fi -unset __conda_setup - -if [ -f "/usr/local/anaconda3/etc/profile.d/mamba.sh" ]; then - . "/usr/local/anaconda3/etc/profile.d/mamba.sh" -fi -# <<< conda initialize <<< - -eval "$(opam env)" +export ROS_DOMAIN_ID=42 +. /opt/ros2/galactic/setup.zsh diff --git a/config/zsh/aliases.zsh b/config/zsh/aliases.zsh index 54c9f99..d386ac6 100644 --- a/config/zsh/aliases.zsh +++ b/config/zsh/aliases.zsh @@ -35,7 +35,7 @@ alias ta='tree -a' alias t1='tree -L 1' alias t2='tree -L 2' alias t3='tree -L 3' -alias ti="tree --matchdirs -I __pycache__ -I node_modules -I '*.o'" +alias ti="tree --matchdirs -I __pycache__ -I node_modules -I '*.o' -I build" # man alias ma="man" @@ -70,8 +70,9 @@ alias gss='git status --short' alias gco='git checkout' alias gsta='git stash push' alias gstp='git stash pop' -alias grv="git remote -v" -alias gra="git remote add" +alias grv='git remote -v' +alias gra='git remote add' +alias gb='git branch' gpa() { branch="$1" [ -z "$branch" ] && branch=$(git branch | grep '^\* .*$' | cut -d ' ' -f 2) diff --git a/config/zsh/zprofile b/config/zsh/zprofile index ecf3ca7..f05d43e 100755 --- a/config/zsh/zprofile +++ b/config/zsh/zprofile @@ -83,6 +83,9 @@ export CLOUT_SYNC_PATH="${XDG_DATA_HOME:-$HOME/.sync}/$CLOUT_SYNC_DIR" if [ "$(uname)" = 'Linux' ] && [ "$(tty)" = '/dev/tty1' ] then - startx "$XDG_CONFIG_HOME/x11/xinitrc" + # https://wiki.archlinux.org/title/Xorg/Keyboard_configuration + # setting the keyrepeat delay and interval here as the default ones + # since some applications reset the those if we use xset r rate 200 30 instead + startx "$XDG_CONFIG_HOME/x11/xinitrc" -- -ardelay 200 -arinterval 30 poweroff fi |