Commit 7dac7a79 authored by Dom Sekotill's avatar Dom Sekotill
Browse files

Merge branch 'master' into feature/mail-imapsync

parents 65538b04 87586b2f

.config/git/ignore

+2 −1
Original line number Diff line number Diff line
@@ -11,5 +11,6 @@ a.out 
# python virtualenv[wrapper]

.venv



# Vim CtrlSpace files

# vim files

.vim.add*

.cs_*

.gitignore

+0 −1
Original line number Diff line number Diff line
@@ -27,7 +27,6 @@ 
/.npm

/.cpan

/.bundler

/.oh-my-zsh



# logs, databases

*.log

.gitmodules

+6 −0
Original line number Diff line number Diff line
@@ -19,3 +19,9 @@ 
[submodule "/home/dom/.vim/bundle/vim-ctrlspace"]

	path = .vim/bundle/vim-ctrlspace

	url = https://github.com/vim-ctrlspace/vim-ctrlspace.git

[submodule ".oh-my-zsh"]

	path = .oh-my-zsh

	url = git://github.com/robbyrussell/oh-my-zsh.git

[submodule ".vim/bundle/simply-fold"]

	path = .vim/bundle/simply-fold

	url = https://github.com/tmhedberg/SimpylFold.git

.ipython/profile_default/ipython_config.py

+9 −0
Original line number Diff line number Diff line 
import six

import logging

from os.path import join, dirname

python_exe = 'python3' if six.PY3 else 'python2'
@@ -22,3 +23,11 @@ c.AliasManager.user_aliases = [ 
	('python3', 'python3'),

	('pip', '{0} -m pip'.format(python_exe)),

]



c.InteractiveShellApp.exec_lines = [

	'from importlib import reload',

]



c.InteractiveShellApp.log_level = logging.DEBUG

c.TerminalInteractiveShell.confirm_exit = False

c.TerminalInteractiveShell.editing_mode = 'vi'

.oh-my-zsh @ 31afbc76

Original line number Diff line number Diff line 
Subproject commit 31afbc760e5f3b1bceeddf87882c77c7fa640e1d