Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

We’re showing branches in this repository, but you can also compare across forks.

base fork: bartvandendriessche/dotfiles-emacs
base: 2a63d9d53b
...
head fork: bartvandendriessche/dotfiles-emacs
compare: 17d9135c40
  • 5 commits
  • 6 files changed
  • 0 commit comments
  • 1 contributor
1  .gitignore
View
@@ -9,3 +9,4 @@ url
eshell
el-get*
/projectile-bookmarks.eld
+/projectile.cache
23 init.el
View
@@ -3,26 +3,3 @@
(require 'settings) ;; load default settings
(settings-el-get-sync)
-
-;; (defun pdb-django-test ()
-;; (interactive
-;; (pdb (concat gud-pdb-command-name " " virtualenv-default-directory "/manage.py test " default-directory))))
-
-;; (defadvice pdb (before gud-query-cmdline activate)
-;; "Fix command line with some Django knowledge"
-;; (interactive
-;; (list (gud-query-cmdline 'pdb (concat (or virtualenv-default-directory
-;; default-directory)
-;; "manage.py test")))))
-(custom-set-variables
- ;; custom-set-variables was added by Custom.
- ;; If you edit it by hand, you could mess it up, so be careful.
- ;; Your init file should contain only one such instance.
- ;; If there is more than one, they won't work right.
- '(safe-local-variable-values (quote ((virtualenv-workon . "caldai")))))
-(custom-set-faces
- ;; custom-set-faces was added by Custom.
- ;; If you edit it by hand, you could mess it up, so be careful.
- ;; Your init file should contain only one such instance.
- ;; If there is more than one, they won't work right.
- )
5 settings/settings-defaults.el
View
@@ -36,8 +36,9 @@
(setq reb-re-syntax 'string) ;; escape backslash hell in re-builder
(setq el-get-sources '((:name color-theme-solarized :after (load-theme 'solarized-dark t))
- (:name magit :type :elpa :after (progn
- (global-set-key (kbd "C-c g") 'magit-status)))
+ (:name magit :type :elpa
+ :after (progn
+ (global-set-key (kbd "C-c g") 'magit-status)))
(:name markdown-mode))))
(provide 'settings-defaults)
9 settings/settings-lisp.el
View
@@ -1,8 +1,11 @@
(progn
(setq el-get-sources (append el-get-sources
'((:name auto-complete-emacs-lisp)
- (:name elisp-slime-nav :after (progn
- (add-hook 'emacs-lisp-mode-hook 'elisp-slime-nav-mode)
- ))))))
+ (:name elisp-slime-nav
+ :after (progn
+ (add-hook 'emacs-lisp-mode-hook 'elisp-slime-nav-mode))))))
+ (when (require 'projectile nil 'noerror)
+ (add-hook 'lisp-mode-hook 'projectile-mode)
+ (add-hook 'emacs-lisp-mode-hook 'projectile-mode)))
(provide 'settings-lisp)
18 settings/settings-programming.el
View
@@ -4,14 +4,16 @@
(:name flycheck :type :elpa)
(:name markdown-mode)
(:name projectile)
- (:name git-gutter :after (progn
- (global-git-gutter-mode +1)
- (set-face-foreground 'git-gutter:modified "purple")
- (set-face-foreground 'git-gutter:added "green")
- (set-face-foreground 'git-gutter:deleted "red")))
- (:name web-mode :type :elpa :after (progn
- (setq web-mode-markup-indent-offset 4)
- (add-to-list 'auto-mode-alist '("\\.html?\\'" . web-mode)))))))
+ (:name git-gutter
+ :after (progn
+ (global-git-gutter-mode +1)
+ (set-face-foreground 'git-gutter:modified "purple")
+ (set-face-foreground 'git-gutter:added "green")
+ (set-face-foreground 'git-gutter:deleted "red")))
+ (:name web-mode :type :elpa
+ :after (progn
+ (setq web-mode-markup-indent-offset 4)
+ (add-to-list 'auto-mode-alist '("\\.html?\\'" . web-mode)))))))
;; ugh, screw yasnippet on windows
(if (not (eq system-type 'windows-nt))
(setq el-get-sources (append el-get-sources
30 settings/settings-python.el
View
@@ -1,25 +1,21 @@
(progn
(setq el-get-sources (append el-get-sources
- '((:name virtualenv :after (progn
- (put 'virtualenv-workon 'safe-local-variable 'stringp)
- (put 'virtualenv-default-directory 'safe-local-variable 'stringp)))
- (:name virtualenvwrapper :type :elpa :after (progn
- (put 'project-venv-name 'safe-local-variable 'stringp))))))
+ '((:name virtualenv
+ :after (progn
+ (put 'virtualenv-workon 'safe-local-variable 'stringp)
+ (put 'virtualenv-default-directory 'safe-local-variable 'stringp)))
+ (:name virtualenvwrapper :type :elpa
+ :after (progn
+ (put 'project-venv-name 'safe-local-variable 'stringp))))))
(if (not (eq system-type 'windows-nt))
(setq el-get-sources (append el-get-sources
- '((:name jedi :after (progn
- (add-hook 'python-mode-hook 'jedi:setup)
- (setq jedi:install-imenu)
- (setq jedi:use-shortcuts t)
- (setq jedi:complete-on-dot t)))))))
-
- (defun settings-pony-ac-setup ()
- "Make sure ac-source-yasnippet is added to `ac-sources`"
- (interactive)
- (add-to-list 'ac-sources 'ac-source-yasnippet)
- (unless auto-complete-mode
- (auto-complete-mode)))
+ '((:name jedi
+ :after (progn
+ (add-hook 'python-mode-hook 'jedi:setup)
+ (setq jedi:install-imenu)
+ (setq jedi:use-shortcuts t)
+ (setq jedi:complete-on-dot t)))))))
(add-hook 'python-mode-hook (lambda ()
(if project-venv-name

No commit comments for this range

Something went wrong with that request. Please try again.