fergalmoran/settings-webstorm
1
0
Fork 0
mirror of https://github.com/fergalmoran/settings-webstorm.git synced 2025-12-22 01:39:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert ws cock up

Browse Source
This commit is contained in:
Fergal Moran
2017-08-21 19:40:55 +01:00
parent 4b710bcd99
commit ebd7779343
3 changed files with 13 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
bash_functions
View File

@@ -2,6 +2,7 @@ function pips() {
echo $'\n'$1 >> requirements.txt; pip install $1 echo $'\n'$1 >> requirements.txt; pip install $1
} }
<<<<<<< HEAD
function reset_webstorm(){ function reset_webstorm(){
cd ~/.WebStorm* cd ~/.WebStorm*
rm config/eval/WebStorm*evaluation.key rm config/eval/WebStorm*evaluation.key
@@ -10,6 +11,8 @@ function reset_webstorm(){
rm -rf webstorm rm -rf webstorm
} }
=======
>>>>>>> parent of 02ed9ee... WS-2017.2 <fergalm@localhost Overwrite remote git@github.com:fergalmoran/dotfiles.git to local
cb() { cb() {
local _scs_col="\e[0;32m"; local _wrn_col='\e[1;31m'; local _trn_col='\e[0;33m' local _scs_col="\e[0;32m"; local _wrn_col='\e[1;31m'; local _trn_col='\e[0;33m'
# Check that xclip is installed. # Check that xclip is installed.

3
install.sh
View File

@@ -43,9 +43,12 @@ if [ ! -f $OMF ]; then
sh -c "$(curl -fsSL https://raw.githubusercontent.com/robbyrussell/oh-my-zsh/master/tools/install.sh)" sh -c "$(curl -fsSL https://raw.githubusercontent.com/robbyrussell/oh-my-zsh/master/tools/install.sh)"
fi fi
<<<<<<< HEAD
#install tmux plugin manager #install tmux plugin manager
git clone https://github.com/tmux-plugins/tpm ~/.tmux/plugins/tpm git clone https://github.com/tmux-plugins/tpm ~/.tmux/plugins/tpm
=======
>>>>>>> parent of 02ed9ee... WS-2017.2 <fergalm@localhost Overwrite remote git@github.com:fergalmoran/dotfiles.git to local
#install git flow completion #install git flow completion
git clone https://github.com/bobthecow/git-flow-completion ~/.oh-my-zsh/custom/plugins/git-flow-completion git clone https://github.com/bobthecow/git-flow-completion ~/.oh-my-zsh/custom/plugins/git-flow-completion

7
tmux.conf
View File

@@ -136,6 +136,13 @@ set -g @plugin 'tmux-plugins/tpm'
set -g @plugin 'tmux-plugins/tmux-sensible' set -g @plugin 'tmux-plugins/tmux-sensible'
set -g @plugin 'tmux-plugins/tmux-resurrect' set -g @plugin 'tmux-plugins/tmux-resurrect'
<<<<<<< HEAD
run '~/.tmux/plugins/tpm/tpm' run '~/.tmux/plugins/tpm/tpm'
=======
if "test ! -d ~/.tmux/plugins/tpm" \
"run 'git clone https://github.com/tmux-plugins/tpm ~/.tmux/plugins/tpm && ~/.tmux/plugins/tpm/bin/install_plugins'"
run '~/.tmux/plugins/tpm/tpm'
>>>>>>> parent of 02ed9ee... WS-2017.2 <fergalm@localhost Overwrite remote git@github.com:fergalmoran/dotfiles.git to local