From 4704bb881d173f30767cbeea171b73db3b62b52d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=93scar=20N=C3=A1jera?= Date: Mon, 19 Oct 2020 21:18:06 +0200 Subject: zshrc migrate --- .zshrc | 125 ------------------------------------------------------------ dot-zshrc | 125 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ install.scm | 1 + 3 files changed, 126 insertions(+), 125 deletions(-) delete mode 100644 .zshrc create mode 100644 dot-zshrc diff --git a/.zshrc b/.zshrc deleted file mode 100644 index d5b685e..0000000 --- a/.zshrc +++ /dev/null @@ -1,125 +0,0 @@ -# -*- mode: shell-script; -*- -# If emacs tramp or eshell, don't execute any of this -[[ $TERM == "dumb" ]] && unsetopt zle && PS1='$ ' && return - -# Path to your oh-my-zsh installation. -export ZSH=$HOME/.oh-my-zsh - -# Set name of the theme to load. -# Look in ~/.oh-my-zsh/themes/ -# Optionally, if you set this to "random", it'll load a random theme each -# time that oh-my-zsh is loaded. -ZSH_THEME="ys" -DEFAULT_USER=$USER - -# colorful terminal -export TERM="xterm-256color" - -# 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 change how often to auto-update (in days). -# export UPDATE_ZSH_DAYS=13 - -# 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. -# The optional three formats: "mm/dd/yyyy"|"dd.mm.yyyy"|"yyyy-mm-dd" -# 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? (plugins can be found in ~/.oh-my-zsh/plugins/*) -# Custom plugins may be added to ~/.oh-my-zsh/custom/plugins/ -# Example format: plugins=(rails git textmate ruby lighthouse) -# Add wisely, as too many plugins slow down shell startup. -export WORKON_HOME=$HOME/.virtualenvs -plugins=(git archlinux python virtualenvwrapper gpg-agent) - - -# User configuration - -# export PATH="/usr/bin:/bin:/usr/sbin:/sbin:$PATH" -# export MANPATH="/usr/local/man:$MANPATH" - -export PATH="$HOME/.local/bin:$PATH" -export PATH="$HOME/git/zeug_cmk/bin:$PATH" - -lruby() { - export PATH="$(ruby -e 'puts Gem.user_dir')/bin:$PATH" - export GEM_HOME=$(ruby -e 'print Gem.user_dir') -} - -source $ZSH/oh-my-zsh.sh -# npm -# NPM packages in homedir -NPM_PACKAGES="$HOME/.npm-packages" - -# Tell our environment about user-installed node tools -PATH="$NPM_PACKAGES/bin:$PATH" -# Tell Node about these packages -NODE_PATH="$NPM_PACKAGES/lib/node_modules:$NODE_PATH" - -# 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 -export EDITOR='emacsclient' - -# 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" - -alias ipyn='jupyter notebook --no-browser > jupyter_nb_log 2>&1 &' -alias sshipy='ssh -N -f ipyt' -alias opbs1='export OPENBLAS_NUM_THREADS=1' -alias isrun='ps -ae | grep' -alias qstatf='qstat -f -u "*" | grep theo-ox -A 10' -alias gdrives='rclone sync --drive-formats ods,odt gdrive: gdrive ' -alias lconda='export PATH=$HOME/miniconda3/bin:$PATH' -alias condup='conda update --all --yes' -alias vact='source activate' -alias gdimg='git difftool -t image_diff' - -alias -g G='| grep' -alias lar='ls -lahrt' -alias mykeys='setxkbmap -I~/.config/xkb/ oscar -option caps:escape -print | xkbcomp -I$HOME/.config/xkb/ - $DISPLAY' - -export PATH="$HOME/.cargo/bin:$PATH" diff --git a/dot-zshrc b/dot-zshrc new file mode 100644 index 0000000..d5b685e --- /dev/null +++ b/dot-zshrc @@ -0,0 +1,125 @@ +# -*- mode: shell-script; -*- +# If emacs tramp or eshell, don't execute any of this +[[ $TERM == "dumb" ]] && unsetopt zle && PS1='$ ' && return + +# Path to your oh-my-zsh installation. +export ZSH=$HOME/.oh-my-zsh + +# Set name of the theme to load. +# Look in ~/.oh-my-zsh/themes/ +# Optionally, if you set this to "random", it'll load a random theme each +# time that oh-my-zsh is loaded. +ZSH_THEME="ys" +DEFAULT_USER=$USER + +# colorful terminal +export TERM="xterm-256color" + +# 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 change how often to auto-update (in days). +# export UPDATE_ZSH_DAYS=13 + +# 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. +# The optional three formats: "mm/dd/yyyy"|"dd.mm.yyyy"|"yyyy-mm-dd" +# 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? (plugins can be found in ~/.oh-my-zsh/plugins/*) +# Custom plugins may be added to ~/.oh-my-zsh/custom/plugins/ +# Example format: plugins=(rails git textmate ruby lighthouse) +# Add wisely, as too many plugins slow down shell startup. +export WORKON_HOME=$HOME/.virtualenvs +plugins=(git archlinux python virtualenvwrapper gpg-agent) + + +# User configuration + +# export PATH="/usr/bin:/bin:/usr/sbin:/sbin:$PATH" +# export MANPATH="/usr/local/man:$MANPATH" + +export PATH="$HOME/.local/bin:$PATH" +export PATH="$HOME/git/zeug_cmk/bin:$PATH" + +lruby() { + export PATH="$(ruby -e 'puts Gem.user_dir')/bin:$PATH" + export GEM_HOME=$(ruby -e 'print Gem.user_dir') +} + +source $ZSH/oh-my-zsh.sh +# npm +# NPM packages in homedir +NPM_PACKAGES="$HOME/.npm-packages" + +# Tell our environment about user-installed node tools +PATH="$NPM_PACKAGES/bin:$PATH" +# Tell Node about these packages +NODE_PATH="$NPM_PACKAGES/lib/node_modules:$NODE_PATH" + +# 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 +export EDITOR='emacsclient' + +# 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" + +alias ipyn='jupyter notebook --no-browser > jupyter_nb_log 2>&1 &' +alias sshipy='ssh -N -f ipyt' +alias opbs1='export OPENBLAS_NUM_THREADS=1' +alias isrun='ps -ae | grep' +alias qstatf='qstat -f -u "*" | grep theo-ox -A 10' +alias gdrives='rclone sync --drive-formats ods,odt gdrive: gdrive ' +alias lconda='export PATH=$HOME/miniconda3/bin:$PATH' +alias condup='conda update --all --yes' +alias vact='source activate' +alias gdimg='git difftool -t image_diff' + +alias -g G='| grep' +alias lar='ls -lahrt' +alias mykeys='setxkbmap -I~/.config/xkb/ oscar -option caps:escape -print | xkbcomp -I$HOME/.config/xkb/ - $DISPLAY' + +export PATH="$HOME/.cargo/bin:$PATH" diff --git a/install.scm b/install.scm index 6fa4be8..5cdef9b 100755 --- a/install.scm +++ b/install.scm @@ -73,5 +73,6 @@ (git-config) (config-links " Symlink guile defaults" "dot-guile" "~/.guile") (config-links " Symlink rofi" "rofi" "~/.config/rofi") + (config-links " Symlink zshrc" "dot-zshrc" "~/.zshrc") (shutdown-logging)) -- cgit v1.2.3