Merge branch 'master' of github.com:danijoo/dotfiles

This commit is contained in:
Daniel Bauer
2019-04-09 11:06:22 +02:00
3 changed files with 23 additions and 34 deletions

View File

@@ -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
@@ -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

View File

@@ -0,0 +1 @@
cmake .. -DGMX_BUILD_OWN_FFTW=ON -DREGRESSIONTEST_DOWNLOAD=ON -DGMX_GPU=ON -DCMAKE_INSTALL_PREFIX=/opt/gromacs-2019.1/ -DCMAKE_C_COMPILER=/usr/bin/gcc-4.9 -DCMAKE_CXX_COMPILER=/usr/bin/g++-4.9##gmx_compile

View File

@@ -5,11 +5,8 @@ set fetch_path, /tmp
log_open /tmp/pymol_log.pml
set retain_order
# interface
set overlay, 1
set internal_gui_control_size, 10
set display_scale_factor, 2
# performance
set async_builds, on
@@ -30,20 +27,6 @@ set_key F10, set depth_cue, off
set_key F11, ray 800,800
set_key F12, ray 1600,1600
#Extending colors with color-blindness friendly color palette
#References:
#http://jfly.iam.u-tokyo.ac.jp/html/color_cb/#pallet
#https://personal.sron.nl/~pault/colourschemes.pdf
set_color cb_blue, [51, 34, 136]
set_color cb_tan, [221, 204, 119]
set_color cb_lightblue, [136, 204, 238]
set_color cb_green, [17, 119, 51]
set_color cb_teal, [68, 170, 153]
set_color cb_gold, [153, 153, 51]
set_color cb_salmon, [204, 102, 119]
set_color cb_red, [136, 34, 85]
set_color cb_pink, [170, 68, 153]
# raytrace
set depth_cue, 0
set ray_opaque_background, false