diff --git a/emacs.d/init.el b/emacs.d/init.el index 522859c..b32e91e 100644 --- a/emacs.d/init.el +++ b/emacs.d/init.el @@ -47,6 +47,7 @@ helm helm-ag helm-projectile + helm-pydoc jedi magit markdown-mode @@ -86,9 +87,6 @@ (add-hook 'shell-mode-hook 'ansi-color-for-comint-mode-on) -(add-hook 'python-mode-hook 'auto-complete-mode) -(add-hook 'python-mode-hook '(lambda () (require 'nose))) -(add-hook 'python-mode-hook 'jedi:ac-setup) (add-hook 'after-init-hook #'global-flycheck-mode) (require 'ido) @@ -157,6 +155,7 @@ ;; No tabs, only 4 spaces, as default (setq-default indent-tabs-mode nil) (setq tab-width 4) +(setq default-tab-width 4); ;; Disable splash screen diff --git a/gitignore_global b/gitignore_global index b136070..3f224cd 100644 --- a/gitignore_global +++ b/gitignore_global @@ -25,6 +25,7 @@ *.log *.sql *.sqlite +*.db # OS generated files # ###################### @@ -44,6 +45,7 @@ Thumbs.db # Python ###### *.pyc +*.egg-info # VIM ###### diff --git a/noserc b/noserc new file mode 100644 index 0000000..2275480 --- /dev/null +++ b/noserc @@ -0,0 +1,3 @@ +[nosetests] +verbosity=3 +detailed-errors=1