From a57831725b6a919eba428d3d9791e3c7b215d99f Mon Sep 17 00:00:00 2001 From: Daniel Bauer Date: Tue, 26 Mar 2019 17:04:34 +0100 Subject: [PATCH 1/7] update --- profiles/base/.zshrc | 7 ------- profiles/pymol/.pymolrc | 6 +++--- 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/profiles/base/.zshrc b/profiles/base/.zshrc index ba04bc4..897b88e 100644 --- a/profiles/base/.zshrc +++ b/profiles/base/.zshrc @@ -1,10 +1,3 @@ -if [ -f `which powerline-daemon` ]; then - powerline-daemon -q - POWERLINE_BASH_CONTINUATION=1 - POWERLINE_BASH_SELECT=1 - . /usr/local/lib/python2.7/dist-packages/powerline/bindings/zsh/powerline.zsh -fi - # Change default zim location export ZIM_HOME=${ZDOTDIR:-${HOME}}/.zim diff --git a/profiles/pymol/.pymolrc b/profiles/pymol/.pymolrc index 242a07e..924ca5f 100644 --- a/profiles/pymol/.pymolrc +++ b/profiles/pymol/.pymolrc @@ -1,6 +1,6 @@ # general environment bg_color white -space cmyk +#space cmyk set fetch_path, /tmp log_open /tmp/pymol_log.pml set retain_order @@ -49,8 +49,8 @@ set depth_cue, 0 set ray_opaque_background, false set orthoscopic, 0 set ray_shadow, false -set spec_reflect, 0 -set antialias, 0 +#set spec_reflect, 0 +set antialias, 1 set surface_quality, 1 set ray_trace_mode, 0 From bdbc23b4818646067a5135beffbbb7a3d5cf96cf Mon Sep 17 00:00:00 2001 From: Daniel Bauer Date: Wed, 27 Mar 2019 11:36:42 +0100 Subject: [PATCH 2/7] antigen --- profiles/base/.antigenrc | 28 ++++++++++++++++++++++++++++ profiles/base/.zshrc | 20 +++++++++----------- 2 files changed, 37 insertions(+), 11 deletions(-) create mode 100644 profiles/base/.antigenrc diff --git a/profiles/base/.antigenrc b/profiles/base/.antigenrc new file mode 100644 index 0000000..c9dc794 --- /dev/null +++ b/profiles/base/.antigenrc @@ -0,0 +1,28 @@ +source $HOME/bin/antigen.zsh +antigen use oh-my-zsh + +# bundles +antigen bundle git +antigen bundle zsh-users/zsh-completions +antigen bundle pip +antigen bundle zsh-users/zsh-syntax-highlighting +antigen bundle zsh-users/zsh-history-substring-search + +antigen bundle command-not-found + +# theme +export TERM="xterm-256color" +DEFAULT_USER=bauer +POWERLEVEL9K_LEFT_PROMPT_ELEMENTS=(ssh context dir vcs anaconda) +POWERLEVEL9K_RIGHT_PROMPT_ELEMENTS=(background_jobs status time) + +# Anaconda +POWERLEVEL9K_ANACONDA_RIGHT_DELIMITER='>' +POWERLEVEL9K_ANACONDA_LEFT_DELIMITER='<' +POWERLEVEL9K_ANACONDA_BACKGROUND='24' +POWERLEVEL9K_ANACONDA_FOREGROUND='111' + +POWERLEVEL9K_PROMPT_ON_NEWLINE=true +antigen theme bhilburn/powerlevel9k powerlevel9k + +antigen apply diff --git a/profiles/base/.zshrc b/profiles/base/.zshrc index 897b88e..1732b72 100644 --- a/profiles/base/.zshrc +++ b/profiles/base/.zshrc @@ -1,23 +1,15 @@ -# Change default zim location -export ZIM_HOME=${ZDOTDIR:-${HOME}}/.zim +# export ZIM_HOME=${ZDOTDIR:-${HOME}}/.zim +# # [[ -s ${ZIM_HOME}/init.zsh ]] && source ${ZIM_HOME}/init.zsh -# Start zim -[[ -s ${ZIM_HOME}/init.zsh ]] && source ${ZIM_HOME}/init.zsh +source $HOME/.antigenrc # source other dotfiles source $HOME/.environment if [ -f "$HOME/.environment.local" ]; then source $HOME/.environment.local fi - source $HOME/.aliases source $HOME/.functions - -if [ -z "$GMXRC" ]; then - GMXRC="/opt/gromacs-2018/bin/GMXRC" -fi -source $GMXRC - # config specific to this machine if [ -f $HOME/.zshrc_local ]; then source $HOME/.zshrc_local @@ -28,3 +20,9 @@ eval "$(fasd --init auto)" # marker [[ -s "$HOME/.local/share/marker/marker.sh" ]] && source "$HOME/.local/share/marker/marker.sh" + +# gromacs +if [ -z "$GMXRC" ]; then + GMXRC="/opt/gromacs-2018/bin/GMXRC" +fi +source $GMXRC \ No newline at end of file From 5ec446db2b12a8cf963640aa7481d70ab581fbf4 Mon Sep 17 00:00:00 2001 From: Daniel Bauer Date: Wed, 27 Mar 2019 11:36:48 +0100 Subject: [PATCH 3/7] fasd --- install.sh | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/install.sh b/install.sh index 64b4041..c1f2ae1 100755 --- a/install.sh +++ b/install.sh @@ -43,6 +43,17 @@ if [ ! -d "$HOME/.marker" ]; then $HOME/.marker/install.py fi +# fasd +if [ ! -d "$HOME/bin" ]; then + mkdir -p $HOME/bin +fi +if [ ! -f "$HOME/bin/fasd" ]; then + echo "Installing fasd" + wget https://raw.githubusercontent.com/clvv/fasd/master/fasd + mv fasd $HOME/bin/fasd + chmod +x $HOME/bin/fasd +fi + # linking dotfiles $HOME/.dotfiles/dotfiles.sh link base From 15df14d183f03bf7d7b94d090345306b869ac2ba Mon Sep 17 00:00:00 2001 From: Daniel Bauer Date: Wed, 27 Mar 2019 11:37:55 +0100 Subject: [PATCH 4/7] no zim --- install.sh | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/install.sh b/install.sh index c1f2ae1..b9c69aa 100755 --- a/install.sh +++ b/install.sh @@ -6,24 +6,24 @@ if [ `cat /etc/passwd | grep $USER | awk -F ':' '{print $7}'` != "/bin/zsh" ]; t chsh -s $(which zsh) fi -# ZIM Installation -if [ ! -d "$HOME/.zim" ]; then - echo "Installing ZIM" - git clone --recursive --depth=1 https://github.com/zimfw/zimfw.git \ - ${ZDOTDIR:-${HOME}}/.zim -else - echo "ZIM already exists." -fi +# # ZIM Installation +# if [ ! -d "$HOME/.zim" ]; then +# echo "Installing ZIM" +# git clone --recursive --depth=1 https://github.com/zimfw/zimfw.git \ +# ${ZDOTDIR:-${HOME}}/.zim +# else +# echo "ZIM already exists." +# fi -# Powerlevel9k Theme -if [ ! -d "$HOME/.zim/modules/prompt/external-themes/powerlevel9k" ]; then - echo "Installing Powerlevel9k theme" - git clone --depth=1 https://github.com/bhilburn/powerlevel9k.git \ - ~/.zim/modules/prompt/external-themes/powerlevel9k - ln -s ~/.zim/modules/prompt/external-themes/powerlevel9k/powerlevel9k.zsh-theme ~/.zim/modules/prompt/functions/prompt_powerlevel9k_setup -else - echo "Powerlevel9k already exists." -fi +# # Powerlevel9k Theme +# if [ ! -d "$HOME/.zim/modules/prompt/external-themes/powerlevel9k" ]; then +# echo "Installing Powerlevel9k theme" +# git clone --depth=1 https://github.com/bhilburn/powerlevel9k.git \ +# ~/.zim/modules/prompt/external-themes/powerlevel9k +# ln -s ~/.zim/modules/prompt/external-themes/powerlevel9k/powerlevel9k.zsh-theme ~/.zim/modules/prompt/functions/prompt_powerlevel9k_setup +# else +# echo "Powerlevel9k already exists." +# fi # Conda and pip if [ ! -d "$HOME/conda" ]; then From 7fd50f3361f637d054c3e0467b8e858de7b184bc Mon Sep 17 00:00:00 2001 From: Daniel Bauer Date: Wed, 27 Mar 2019 12:48:08 +0100 Subject: [PATCH 5/7] back to zim --- profiles/base/.antigenrc | 3 +-- profiles/base/.zshrc | 17 +++++++++-------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/profiles/base/.antigenrc b/profiles/base/.antigenrc index c9dc794..18e7b36 100644 --- a/profiles/base/.antigenrc +++ b/profiles/base/.antigenrc @@ -1,5 +1,4 @@ -source $HOME/bin/antigen.zsh -antigen use oh-my-zsh +antigen use oh-my-zsh --debug # bundles antigen bundle git diff --git a/profiles/base/.zshrc b/profiles/base/.zshrc index 1732b72..6527884 100644 --- a/profiles/base/.zshrc +++ b/profiles/base/.zshrc @@ -1,7 +1,13 @@ -# export ZIM_HOME=${ZDOTDIR:-${HOME}}/.zim -# # [[ -s ${ZIM_HOME}/init.zsh ]] && source ${ZIM_HOME}/init.zsh +export ZIM_HOME=${ZDOTDIR:-${HOME}}/.zim +[[ -s ${ZIM_HOME}/init.zsh ]] && source ${ZIM_HOME}/init.zsh -source $HOME/.antigenrc +if [ -z "$GMXRC" ]; then + GMXRC="/opt/gromacs-2018/bin/GMXRC.bash" +fi +source $GMXRC + +# source $HOME/bin/antigen.zsh +# antigen init $HOME/.antigenrc # source other dotfiles source $HOME/.environment @@ -21,8 +27,3 @@ eval "$(fasd --init auto)" # marker [[ -s "$HOME/.local/share/marker/marker.sh" ]] && source "$HOME/.local/share/marker/marker.sh" -# gromacs -if [ -z "$GMXRC" ]; then - GMXRC="/opt/gromacs-2018/bin/GMXRC" -fi -source $GMXRC \ No newline at end of file From f39aead6f0496f7332fa8e354dd0418ea4fd5dff Mon Sep 17 00:00:00 2001 From: Daniel Bauer Date: Tue, 2 Apr 2019 19:10:35 +0200 Subject: [PATCH 6/7] uncommented zim installation --- install.sh | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/install.sh b/install.sh index b9c69aa..c1f2ae1 100755 --- a/install.sh +++ b/install.sh @@ -6,24 +6,24 @@ if [ `cat /etc/passwd | grep $USER | awk -F ':' '{print $7}'` != "/bin/zsh" ]; t chsh -s $(which zsh) fi -# # ZIM Installation -# if [ ! -d "$HOME/.zim" ]; then -# echo "Installing ZIM" -# git clone --recursive --depth=1 https://github.com/zimfw/zimfw.git \ -# ${ZDOTDIR:-${HOME}}/.zim -# else -# echo "ZIM already exists." -# fi +# ZIM Installation +if [ ! -d "$HOME/.zim" ]; then + echo "Installing ZIM" + git clone --recursive --depth=1 https://github.com/zimfw/zimfw.git \ + ${ZDOTDIR:-${HOME}}/.zim +else + echo "ZIM already exists." +fi -# # Powerlevel9k Theme -# if [ ! -d "$HOME/.zim/modules/prompt/external-themes/powerlevel9k" ]; then -# echo "Installing Powerlevel9k theme" -# git clone --depth=1 https://github.com/bhilburn/powerlevel9k.git \ -# ~/.zim/modules/prompt/external-themes/powerlevel9k -# ln -s ~/.zim/modules/prompt/external-themes/powerlevel9k/powerlevel9k.zsh-theme ~/.zim/modules/prompt/functions/prompt_powerlevel9k_setup -# else -# echo "Powerlevel9k already exists." -# fi +# Powerlevel9k Theme +if [ ! -d "$HOME/.zim/modules/prompt/external-themes/powerlevel9k" ]; then + echo "Installing Powerlevel9k theme" + git clone --depth=1 https://github.com/bhilburn/powerlevel9k.git \ + ~/.zim/modules/prompt/external-themes/powerlevel9k + ln -s ~/.zim/modules/prompt/external-themes/powerlevel9k/powerlevel9k.zsh-theme ~/.zim/modules/prompt/functions/prompt_powerlevel9k_setup +else + echo "Powerlevel9k already exists." +fi # Conda and pip if [ ! -d "$HOME/conda" ]; then From e5e965f3082ccce08685e4d4b0d4b9bcd29b85a4 Mon Sep 17 00:00:00 2001 From: Daniel Bauer Date: Tue, 2 Apr 2019 19:31:55 +0200 Subject: [PATCH 7/7] install vundle --- install.sh | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/install.sh b/install.sh index c1f2ae1..cd2cbc3 100755 --- a/install.sh +++ b/install.sh @@ -54,6 +54,11 @@ if [ ! -f "$HOME/bin/fasd" ]; then chmod +x $HOME/bin/fasd fi +# vundle +if [ ! -d "$HOME/.vim/bundle" ]; then + git clone https://github.com/VundleVim/Vundle.vim.git ~/.vim/bundle/Vundle.vim +fi + # linking dotfiles $HOME/.dotfiles/dotfiles.sh link base