From aaa849a328344b20ad88a7e2be53e2d2a2b7fc0a Mon Sep 17 00:00:00 2001 From: saibotk Date: Sun, 25 Nov 2018 04:26:26 +0100 Subject: [PATCH 1/6] fix path in .zshrc to be at home directory --- .zshrc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.zshrc b/.zshrc index e8dcf94..721f680 100644 --- a/.zshrc +++ b/.zshrc @@ -1,7 +1,7 @@ # If you come from bash you might have to change your $PATH. # export PATH=$HOME/bin:/usr/local/bin:$PATH # Path to your oh-my-zsh installation. -export ZSH="/Users/jan/.oh-my-zsh" +export ZSH="$HOME/.oh-my-zsh" # Set name of the theme to load. Optionally, if you set this to "random" # it'll load a random theme each time that oh-my-zsh is loaded. From f1998312c4137e8b4ace7217c1ca16ee3d909df0 Mon Sep 17 00:00:00 2001 From: jan Date: Sun, 25 Nov 2018 11:32:52 +0100 Subject: [PATCH 2/6] change from static path --- .zshrc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.zshrc b/.zshrc index e8dcf94..721f680 100644 --- a/.zshrc +++ b/.zshrc @@ -1,7 +1,7 @@ # If you come from bash you might have to change your $PATH. # export PATH=$HOME/bin:/usr/local/bin:$PATH # Path to your oh-my-zsh installation. -export ZSH="/Users/jan/.oh-my-zsh" +export ZSH="$HOME/.oh-my-zsh" # Set name of the theme to load. Optionally, if you set this to "random" # it'll load a random theme each time that oh-my-zsh is loaded. From 1792958cfb4e477cdf46b5e3084490b04e014cb9 Mon Sep 17 00:00:00 2001 From: jan Date: Sun, 25 Nov 2018 11:35:49 +0100 Subject: [PATCH 3/6] add jedi-vim plugin --- .vimrc | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.vimrc b/.vimrc index 9a0393d..2ce4f17 100644 --- a/.vimrc +++ b/.vimrc @@ -29,6 +29,9 @@ Plugin 'vim-syntastic/syntastic' " pep8 checking Plugin 'nvie/vim-flake8' +" jedi-vim +Plugin 'davidhalter/jedi-vim' + " winresizer Plugin 'simeji/winresizer' From c56f20d6ae10fcabcd2db7f43af13b82278ec3aa Mon Sep 17 00:00:00 2001 From: Jidbo Date: Fri, 30 Nov 2018 13:36:35 +0100 Subject: [PATCH 4/6] add tmux dotfiles --- .vimrc | 1 + setup.sh | 2 ++ tmux.conf | 37 +++++++++++++++++++++++++++++++++++++ 3 files changed, 40 insertions(+) create mode 100644 tmux.conf diff --git a/.vimrc b/.vimrc index 2ce4f17..f85e8e6 100644 --- a/.vimrc +++ b/.vimrc @@ -83,6 +83,7 @@ set visualbell set virtualedit=block set scrolloff=1 set wildmenu +set term=screen-256color " tabs and line wrap set tabstop=4 diff --git a/setup.sh b/setup.sh index c678172..ad2cadb 100644 --- a/setup.sh +++ b/setup.sh @@ -4,11 +4,13 @@ rm -f ~/.zshrc rm -f ~/.vimrc rm -rf ~/.vim +rm -f ~/.tmux.conf # create symbolic links to dotfiles ln -s ~/.dotfiles/.vimrc ~/.vimrc ln -s ~/.dotfiles/.zshrc ~/.zshrc ln -s ~/.dotfiles/.vim ~/.vim +ln -s ~/.dotfiles/tmux.conf ~/.tmux.conf # install vundle git clone https://github.com/VundleVim/Vundle.vim.git ~/.vim/bundle/Vundle.vim diff --git a/tmux.conf b/tmux.conf new file mode 100644 index 0000000..29890dd --- /dev/null +++ b/tmux.conf @@ -0,0 +1,37 @@ +#### COLOUR (Solarized dark) + +# default statusbar colors +set-option -g status-bg black #base02 +set-option -g status-fg yellow #yellow +set-option -g status-attr default + +# default window title colors +set-window-option -g window-status-fg brightblue #base0 +set-window-option -g window-status-bg default +#set-window-option -g window-status-attr dim + +# active window title colors +set-window-option -g window-status-current-fg brightred #orange +set-window-option -g window-status-current-bg default +#set-window-option -g window-status-current-attr bright + +# pane border +set-option -g pane-border-fg black #base02 +set-option -g pane-active-border-fg brightgreen #base01 + +# message text +set-option -g message-bg black #base02 +set-option -g message-fg brightred #orange + +# pane number display +set-option -g display-panes-active-colour blue #blue +set-option -g display-panes-colour brightred #orange + +# clock +set-window-option -g clock-mode-colour green #green + +# bell +set-window-option -g window-status-bell-style fg=black,bg=red #base02, red + +# term color +set -g default-terminal "screen-256color" From 93af44641845247da60c6d829a9034db30296b06 Mon Sep 17 00:00:00 2001 From: Jidbo Date: Tue, 4 Dec 2018 21:55:01 +0100 Subject: [PATCH 5/6] change to vim keybindings for tmux --- tmux.conf | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tmux.conf b/tmux.conf index 29890dd..f14f680 100644 --- a/tmux.conf +++ b/tmux.conf @@ -1,5 +1,8 @@ #### COLOUR (Solarized dark) +# set vi keys +set-window-option -g mode-keys vi + # default statusbar colors set-option -g status-bg black #base02 set-option -g status-fg yellow #yellow From e5869f7c846f253c83dfa1d093518410361cf6bd Mon Sep 17 00:00:00 2001 From: Jidbo Date: Tue, 4 Dec 2018 21:55:25 +0100 Subject: [PATCH 6/6] add custom ctrlp ignore directories --- .vimrc | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.vimrc b/.vimrc index f85e8e6..fb29fdd 100644 --- a/.vimrc +++ b/.vimrc @@ -135,6 +135,11 @@ map n :NERDTreeToggle " ctrl-p setup let g:ctrlp_working_path_mode = 'ra' +let g:ctrlp_custom_ignore = { + \ 'dir': '\v[\/](\.(git|hg|svn))?(venv)?$', + \ 'file': '\v\.(exe|so|dll)$', + \ 'link': 'some_bad_symbolic_links', + \ } " see docstrings for folded code let g:SimpylFold_docstring_preview=1