diff --git a/runcoms/zlogin b/runcoms/zlogin index 30549f33..75fd2c6a 100644 --- a/runcoms/zlogin +++ b/runcoms/zlogin @@ -1,23 +1,36 @@ +# /etc/zsh/zlogin: system-wide .zlogin file for zsh(1). # -# Executes commands at login post-zshrc. +# This file is sourced only for login shells. It +# should contain commands that should be executed only +# in login shells. It should be used to set the terminal +# type and run a series of external commands (fortune, +# msgs, from, etc.) +# Executes commands at login post-zshrc # -# Authors: -# Sorin Ionescu +# Global Order: zshenv, zprofile, zshrc, zlogin # # Execute code that does not affect the current session in the background. { - # Compile the completion dump to increase startup speed. - zcompdump="${ZDOTDIR:-$HOME}/.zcompdump" - if [[ -s "$zcompdump" && (! -s "${zcompdump}.zwc" || "$zcompdump" -nt "${zcompdump}.zwc") ]]; then +# Compile the completion dump to increase startup speed. +zcompdump="${ZDOTDIR:-$HOME}/.zcompdump" +if [[ -s "$zcompdump" && (! -s "${zcompdump}.zwc" || "$zcompdump" -nt "${zcompdump}.zwc") ]]; then zcompile "$zcompdump" - fi +fi } &! +# Ajouter ceci dans ~/.zlogin ou ~/.zprofile pour lancer startx au demarrage de la session +#[[ -z $DISPLAY && $XDG_VTNR -eq 1 ]] && exec startx # Pour lancer 1 seul VM +#[[ -z $DISPLAY && $XDG_VTNR -le 2 ]] && exec startx # Autre variante pour lancer plusieurs VM avec la config par defaut de .xinitrc sur les tty1,2et3. +[[ -z $DISPLAY && $XDG_VTNR -eq 3 ]] && exec startx ~/.xinitrc xmonad # Pour lancer kde sur le tty3 + # Print a random, hopefully interesting, adage. if (( $+commands[fortune] )); then - if [[ -t 0 || -t 1 ]]; then - fortune -s - print - fi + if [[ -t 0 || -t 1 ]]; then + fortune -s + print + fi fi + +#[[ -s "$HOME/.rvm/scripts/rvm" ]] && source "$HOME/.rvm/scripts/rvm" + diff --git a/runcoms/zlogout b/runcoms/zlogout index 4fced999..1492786a 100644 --- a/runcoms/zlogout +++ b/runcoms/zlogout @@ -1,13 +1,9 @@ +# /etc/zsh/zlogout: system-wide .zlogout file for zsh(1). # -# Executes commands at logout. -# -# Authors: -# Sorin Ionescu -# - # Print the message. cat <<-EOF Thank you. Come again! -- $USER EOF +# diff --git a/runcoms/zprofile b/runcoms/zprofile index 3b5978da..b535df4a 100644 --- a/runcoms/zprofile +++ b/runcoms/zprofile @@ -1,8 +1,12 @@ +# /etc/zsh/zprofile: system-wide .zprofile file for zsh(1). # -# Executes commands at login pre-zshrc. +# This file is sourced only for login shells (i.e. shells +# invoked with "-" as the first character of argv[0], and +# shells invoked with the -l flag.) +# +# Global Order: zshenv, zprofile, zshrc, zlogin # -# Authors: -# Sorin Ionescu +# Executes commands at login pre-zshrc. # # @@ -17,8 +21,8 @@ fi # Editors # -export EDITOR='nano' -export VISUAL='nano' +export EDITOR='vim' +export VISUAL='vim' export PAGER='less' # @@ -26,7 +30,7 @@ export PAGER='less' # if [[ -z "$LANG" ]]; then - export LANG='en_US.UTF-8' + export LANG='fr_FR.UTF-8' fi # @@ -43,10 +47,18 @@ typeset -gU cdpath fpath mailpath path # Set the list of directories that Zsh searches for programs. path=( + $HOME/git/linux-config/dotfiles/bin + "$(ruby -e 'print Gem.user_dir')/bin" /usr/local/{bin,sbin} + $HOME/.cabal/bin + $HOME/.xmonad/bin + $HOME/bin + $HOME/.gem/ruby/2.2.0/bin + $HOME/miniconda3/bin $path ) + # # Less # @@ -57,6 +69,9 @@ path=( export LESS='-F -g -i -M -R -S -w -X -z-4' # Set the Less input preprocessor. +#if (( $+commands[lesspipe.sh] )); then +# export LESSOPEN='| /usr/bin/env lesspipe.sh %s 2>&-'i +#fi # Try both `lesspipe` and `lesspipe.sh` as either might exist on a system. if (( $#commands[(i)lesspipe(|.sh)] )); then export LESSOPEN="| /usr/bin/env $commands[(i)lesspipe(|.sh)] %s 2>&-" @@ -67,7 +82,7 @@ fi # if [[ ! -d "$TMPDIR" ]]; then - export TMPDIR="/tmp/$LOGNAME" + export TMPDIR="/tmp/$USER" mkdir -p -m 700 "$TMPDIR" fi @@ -76,4 +91,18 @@ TMPPREFIX="${TMPDIR%/}/zsh" # Setting PATH for Python 3.6 # The original version is saved in .zprofile.pysave PATH="/Library/Frameworks/Python.framework/Versions/3.6/bin:${PATH}" + export PATH +if [[ ! -d "$TMPPREFIX" ]]; then + mkdir -p "$TMPPREFIX" +fi + +# Configuration GnuPG +eval $(gpg-agent --daemon --enable-ssh-support --enable-putty-support) +eval $(ssh-agent -s) +# +export PATH=/usr/lib/jvm/java-8-openjdk/jre/bin/:$PATH +[[ -s "$HOME/.rvm/scripts/rvm" ]] && source "$HOME/.rvm/scripts/rvm" + +#Token +export KEY_TOKEN='' diff --git a/runcoms/zshenv b/runcoms/zshenv index 2d972031..959e2a55 100644 --- a/runcoms/zshenv +++ b/runcoms/zshenv @@ -1,11 +1,25 @@ +# /etc/zsh/zshenv: system-wide .zshenv file for zsh(1). # +# This file is sourced on all invocations of the shell. +# If the -f flag is present or if the NO_RCS option is +# set within this file, all other initialization files +# are skipped. # Defines environment variables. # -# Authors: -# Sorin Ionescu +# This file should contain commands to set the command +# search path, plus other important environment variables. +# This file should not contain commands that produce +# output or assume the shell is attached to a tty. # +# Global Order: zshenv, zprofile, zshrc, zlogin -# Ensure that a non-login, non-interactive shell has a defined environment. -if [[ "$SHLVL" -eq 1 && ! -o LOGIN && -s "${ZDOTDIR:-$HOME}/.zprofile" ]]; then - source "${ZDOTDIR:-$HOME}/.zprofile" +if [[ -z "$PATH" || "$PATH" == "/bin:/usr/bin" ]] +then + export PATH="$HOME/git/linux-config/dotfiles/bin:/usr/local/bin:/usr/bin:/bin:/usr/games" fi + +# Ensure that a non-login, non-interactive shell has a defined environment. +#if [[ "$SHLVL" -eq 1 && ! -o LOGIN && -s "${ZDOTDIR:-$HOME}/.zprofile" ]]; then +# source "${ZDOTDIR:-$HOME}/.zprofile" +#fi +#