diff --git a/.zshrc b/.zshrc index 99d7b78..a9ee124 100644 --- a/.zshrc +++ b/.zshrc @@ -5,9 +5,6 @@ if [[ -r "${XDG_CACHE_HOME:-$HOME/.cache}/p10k-instant-prompt-${(%):-%n}.zsh" ]] source "${XDG_CACHE_HOME:-$HOME/.cache}/p10k-instant-prompt-${(%):-%n}.zsh" fi -# If you come from bash you might have to change your $PATH. -# export PATH=$HOME/bin:/usr/local/bin:$PATH - # Path to your oh-my-zsh installation. export ZSH="/home/tanguy/.oh-my-zsh" @@ -17,59 +14,6 @@ export ZSH="/home/tanguy/.oh-my-zsh" # See https://github.com/ohmyzsh/ohmyzsh/wiki/Themes ZSH_THEME="powerlevel10k/powerlevel10k" -# Set list of themes to pick from when loading at random -# Setting this variable when ZSH_THEME=random will cause zsh to load -# a theme from this variable instead of looking in ~/.oh-my-zsh/themes/ -# If set to an empty array, this variable will have no effect. -# ZSH_THEME_RANDOM_CANDIDATES=( "robbyrussell" "agnoster" ) - -# Uncomment the following line to use case-sensitive completion. -# CASE_SENSITIVE="true" - -# Uncomment the following line to use hyphen-insensitive completion. -# Case-sensitive completion must be off. _ and - will be interchangeable. -# HYPHEN_INSENSITIVE="true" - -# Uncomment the following line to disable bi-weekly auto-update checks. -# DISABLE_AUTO_UPDATE="true" - -# Uncomment the following line to automatically update without prompting. -# DISABLE_UPDATE_PROMPT="true" - -# Uncomment the following line to change how often to auto-update (in days). -# export UPDATE_ZSH_DAYS=13 - -# Uncomment the following line if pasting URLs and other text is messed up. -# DISABLE_MAGIC_FUNCTIONS=true - -# Uncomment the following line to disable colors in ls. -# DISABLE_LS_COLORS="true" - -# Uncomment the following line to disable auto-setting terminal title. -# DISABLE_AUTO_TITLE="true" - -# Uncomment the following line to enable command auto-correction. -# ENABLE_CORRECTION="true" - -# Uncomment the following line to display red dots whilst waiting for completion. -# COMPLETION_WAITING_DOTS="true" - -# Uncomment the following line if you want to disable marking untracked files -# under VCS as dirty. This makes repository status check for large repositories -# much, much faster. -# DISABLE_UNTRACKED_FILES_DIRTY="true" - -# Uncomment the following line if you want to change the command execution time -# stamp shown in the history command output. -# You can set one of the optional three formats: -# "mm/dd/yyyy"|"dd.mm.yyyy"|"yyyy-mm-dd" -# or set a custom format using the strftime function format specifications, -# see 'man strftime' for details. -# HIST_STAMPS="mm/dd/yyyy" - -# Would you like to use another custom folder than $ZSH/custom? -# ZSH_CUSTOM=/path/to/new-custom-folder - # Which plugins would you like to load? # Standard plugins can be found in ~/.oh-my-zsh/plugins/* # Custom plugins may be added to ~/.oh-my-zsh/custom/plugins/ @@ -81,47 +25,9 @@ source $ZSH/oh-my-zsh.sh # User configuration -# export MANPATH="/usr/local/man:$MANPATH" - # You may need to manually set your language environment export LANG=en_US.UTF-8 -# Preferred editor for local and remote sessions -# if [[ -n $SSH_CONNECTION ]]; then -# export EDITOR='vim' -# else -# export EDITOR='mvim' -# fi - -# Compilation flags -# export ARCHFLAGS="-arch x86_64" - -# Set personal aliases, overriding those provided by oh-my-zsh libs, -# plugins, and themes. Aliases can be placed here, though oh-my-zsh -# users are encouraged to define aliases within the ZSH_CUSTOM folder. -# For a full list of active aliases, run `alias`. -# -# Example aliases -# alias zshconfig="mate ~/.zshrc" -# alias ohmyzsh="mate ~/.oh-my-zsh" - -# >>> conda initialize >>> -[ -f /opt/miniconda3/etc/profile.d/conda.sh ] && source /opt/miniconda3/etc/profile.d/conda.sh -# !! Contents within this block are managed by 'conda init' !! -# __conda_setup="$('/usr/bin/conda' 'shell.zsh' 'hook' 2> /dev/null)" -# if [ $? -eq 0 ]; then -# eval "$__conda_setup" -# else -# if [ -f "/usr/etc/profile.d/conda.sh" ]; then -# . "/usr/etc/profile.d/conda.sh" -# else -# export PATH="/usr/bin:$PATH" -# fi -# fi -# unset __conda_setup -# <<< conda initialize <<< -# - # Add w3m to the path to allow image preview in the terminal export PATH="$PATH:/usr/lib/w3m" @@ -132,6 +38,29 @@ export PATH="$PATH:$HOME/.almond/" PATH="$HOME/.node_modules/bin:$PATH" export npm_config_prefix=~/.node_modules +# Add libvips environment variable for pyvips +export LD_LIBRARY_PATH=/usr/local/lib/ + +# The next line updates PATH for the Google Cloud SDK. +if [ -f '/home/tanguy/Downloads/tmp/google-cloud-sdk/path.zsh.inc' ]; then . '/home/tanguy/Downloads/tmp/google-cloud-sdk/path.zsh.inc'; fi + +# The next line enables shell command completion for gcloud. +if [ -f '/home/tanguy/Downloads/tmp/google-cloud-sdk/completion.zsh.inc' ]; then . '/home/tanguy/Downloads/tmp/google-cloud-sdk/completion.zsh.inc'; fi + +# Preferred editor for local and remote sessions +# if [[ -n $SSH_CONNECTION ]]; then +# export EDITOR='vim' +# else +# export EDITOR='mvim' +# fi + +# >>> conda initialize >>> +[ -f /opt/miniconda3/etc/profile.d/conda.sh ] && source /opt/miniconda3/etc/profile.d/conda.sh +# <<< conda initialize <<< + +# Update dir_colors according to the specified dotfile +eval $(dircolors -b ~/.config/dir_colors) + # Enable vim controls in the terminal set -o vi @@ -140,9 +69,6 @@ bindkey "^?" backward-delete-char # Enable backward incremental search bindkey '^R' history-incremental-search-backward -# Add libvips environment variable for pyvips -export LD_LIBRARY_PATH=/usr/local/lib/ - # To customize prompt, run `p10k configure` or edit ~/.p10k.zsh. [[ ! -f ~/.p10k.zsh ]] || source ~/.p10k.zsh @@ -177,12 +103,3 @@ alias gitcommiiiiiiiiiiiiiit='cz' alias havpn='~/.config/halia-switch.sh' alias clip='xclip -selection primary' - -# The next line updates PATH for the Google Cloud SDK. -if [ -f '/home/tanguy/Downloads/tmp/google-cloud-sdk/path.zsh.inc' ]; then . '/home/tanguy/Downloads/tmp/google-cloud-sdk/path.zsh.inc'; fi - -# The next line enables shell command completion for gcloud. -if [ -f '/home/tanguy/Downloads/tmp/google-cloud-sdk/completion.zsh.inc' ]; then . '/home/tanguy/Downloads/tmp/google-cloud-sdk/completion.zsh.inc'; fi - -# Update dir_colors according to the specified dotfile -eval $(dircolors -b ~/.config/dir_colors)