From d2afd070b462a8d14a59cea40c5ec7cca7efecba Mon Sep 17 00:00:00 2001 From: Fergal Moran Date: Mon, 21 Aug 2017 19:38:18 +0100 Subject: [PATCH 1/4] Added xresources --- Xresources | 9 +++++++++ bash_functions | 8 ++++++++ 2 files changed, 17 insertions(+) create mode 100644 Xresources diff --git a/Xresources b/Xresources new file mode 100644 index 0000000..a860e7f --- /dev/null +++ b/Xresources @@ -0,0 +1,9 @@ +XTerm*renderFont: true +XTerm*faceName: DejaVu Sans Mono +XTerm*faceSize: 10 +XTerm*maximized: true + +UXTerm*renderFont: true +UXTerm*faceName: DejaVu Sans Mono +UXTerm*faceSize: 10 +UXTerm*maximized: true diff --git a/bash_functions b/bash_functions index dd8c7a4..ef7af4c 100644 --- a/bash_functions +++ b/bash_functions @@ -2,6 +2,14 @@ function pips() { echo $'\n'$1 >> requirements.txt; pip install $1 } +function reset_webstorm(){ + cd ~/.WebStorm* + rm config/eval/WebStorm*evaluation.key + rm config/options/options.xml + cd ~/.java/.userPrefs/jetbrains + rm -rf webstorm +} + cb() { local _scs_col="\e[0;32m"; local _wrn_col='\e[1;31m'; local _trn_col='\e[0;33m' # Check that xclip is installed. From 4b710bcd99c3595bb085a4771df26e5360cf0c19 Mon Sep 17 00:00:00 2001 From: Fergal Moran Date: Mon, 21 Aug 2017 19:39:03 +0100 Subject: [PATCH 2/4] Revert "Fixed tpm installer" This reverts commit b72d64124cfeec292494cc5f2717168a45158284. --- install.sh | 3 +++ tmux.conf | 5 ++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/install.sh b/install.sh index 5aa9855..3fd3af1 100755 --- a/install.sh +++ b/install.sh @@ -43,6 +43,9 @@ if [ ! -f $OMF ]; then sh -c "$(curl -fsSL https://raw.githubusercontent.com/robbyrussell/oh-my-zsh/master/tools/install.sh)" fi +#install tmux plugin manager +git clone https://github.com/tmux-plugins/tpm ~/.tmux/plugins/tpm + #install git flow completion git clone https://github.com/bobthecow/git-flow-completion ~/.oh-my-zsh/custom/plugins/git-flow-completion diff --git a/tmux.conf b/tmux.conf index 5603740..2a866f7 100644 --- a/tmux.conf +++ b/tmux.conf @@ -136,7 +136,6 @@ set -g @plugin 'tmux-plugins/tpm' set -g @plugin 'tmux-plugins/tmux-sensible' set -g @plugin 'tmux-plugins/tmux-resurrect' -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' + + From ebd7779343b91a09935a368937929ca58e8801ce Mon Sep 17 00:00:00 2001 From: Fergal Moran Date: Mon, 21 Aug 2017 19:40:55 +0100 Subject: [PATCH 3/4] Revert ws cock up --- bash_functions | 3 +++ install.sh | 3 +++ tmux.conf | 7 +++++++ 3 files changed, 13 insertions(+) diff --git a/bash_functions b/bash_functions index ef7af4c..4ea0f9f 100644 --- a/bash_functions +++ b/bash_functions @@ -2,6 +2,7 @@ function pips() { echo $'\n'$1 >> requirements.txt; pip install $1 } +<<<<<<< HEAD function reset_webstorm(){ cd ~/.WebStorm* rm config/eval/WebStorm*evaluation.key @@ -10,6 +11,8 @@ function reset_webstorm(){ rm -rf webstorm } +======= +>>>>>>> parent of 02ed9ee... WS-2017.2 >>>>>> parent of 02ed9ee... WS-2017.2 >>>>>> parent of 02ed9ee... WS-2017.2 Date: Mon, 21 Aug 2017 19:47:01 +0100 Subject: [PATCH 4/4] Revert ws cock up --- bash_aliases | 2 +- install.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bash_aliases b/bash_aliases index e7a97e3..dedf2fb 100644 --- a/bash_aliases +++ b/bash_aliases @@ -1,6 +1,6 @@ IP=$(hostname -I | cut -d' ' -f1) HOSTNAME=`hostname -s` - +# ignore alias ls="ls -alh" #Django stuff diff --git a/install.sh b/install.sh index 5aa9855..2958996 100755 --- a/install.sh +++ b/install.sh @@ -1,6 +1,6 @@ # This script creates symlinks from the home directory to any desired dotfiles in ~/dotfiles ############################ - +#ignore ########## Variables dir=~/dotfiles # dotfiles directory