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

profiles/base/.aliases

@@ -5,5 +5,12 @@ fi
 alias clip='xsel --clipboard'
 alias groclean='rm \#*'
 alias sm='snakemake'
-alias ls='ls -lh'
+alias ls='ls --color=auto -lh'
 alias workon='source activate' # enable anaconda environ
+alias cwl="cwl-runner"
+
+# lhr
+alias squeue="ssh lcluster11 squeue"
+alias csum="ssh lcluster11 csum"
+alias csreport="ssh lcluster11 csreport"
+alias scancel="ssh lcluster11 scancel"

profiles/base/.condarc

@@ -0,0 +1,7 @@
+channel_priority: strict
+channels:
+  - spyder-ide
+  - conda-forge
+  - bioconda
+  - defaults
+  - salilab

profiles/base/.config/matplotlib/matplotlibrc

@@ -397,7 +397,7 @@ legend.fontsize      : 10
 #figure.titlesize : large      # size of the figure title (Figure.suptitle())
 #figure.titleweight : normal   # weight of the figure title
 figure.figsize   : 11,4.5   # figure size in inches
-figure.dpi       : 100      # figure dots per inch
+figure.dpi       : 300      # figure dots per inch
 #figure.facecolor : white   # figure facecolor; 0.75 is scalar gray
 # figure.edgecolor : white   # figure edgecolor
 figure.autolayout : True  # When True, automatically adjust subplot

profiles/base/.tmux.conf

@@ -1,5 +1,13 @@
+<<<<<<< HEAD
 set-window-option -g xterm-keys on
 set -s escape-time 10 # faster command timeout
 set -g history-limit 10000 
 
 set -g status-interval 10
+=======
+set-option -g mouse on
+
+# make scrolling with wheels work
+bind -n WheelUpPane if-shell -F -t = "#{mouse_any_flag}" "send-keys -M" "if -Ft= '#{pane_in_mode}' 'send-keys -M' 'select-pane -t=; copy-mode -e; send-keys -M'"
+bind -n WheelDownPane select-pane -t= \; send-keys -M
+>>>>>>> 1f76fd836f0ef1b53fc69ba45322da6824c50465

profiles/base/.vimrc

@@ -32,7 +32,7 @@ Plugin 'morhetz/gruvbox'
 let g:vim_markdown_folding_disabled = 1
 
 let g:pymode_python = "python3"
-let g:pymode_virtualenv_path = "conda"
+let g:pymode_virtualenv_path = "/home/bauer/conda"
 let g:pymode = 1
 let g:pymode_options = 1
 " All of your Plugins must be added before the following line

profiles/base/.zshrc

@@ -1,6 +1,5 @@
 export ZIM_HOME=${ZDOTDIR:-${HOME}}/.zim
 [[ -s ${ZIM_HOME}/init.zsh ]] && source ${ZIM_HOME}/init.zsh 
-
 # source $HOME/bin/antigen.zsh
 # antigen init $HOME/.antigenrc