diff options
| -rw-r--r-- | init.el | 1 | ||||
| -rw-r--r-- | init/bindings.el | 7 | ||||
| -rw-r--r-- | init/custom.el | 6 | ||||
| -rw-r--r-- | init/modes.el | 4 | ||||
| -rw-r--r-- | init/settings.el | 3 |
5 files changed, 15 insertions, 6 deletions
diff --git a/init.el b/init.el index 8928e284be4f..ef2fbeb53987 100644 --- a/init.el +++ b/init.el @@ -35,6 +35,7 @@ magit markdown-mode+ multiple-cursors + multi-term mvn nyan-mode paredit diff --git a/init/bindings.el b/init/bindings.el index 32579919b619..38540968db8b 100644 --- a/init/bindings.el +++ b/init/bindings.el @@ -17,6 +17,7 @@ ;; Ace-jump-mode (global-set-key (kbd "M-j") 'ace-jump-word-mode) +(global-set-key (kbd "M-p") 'ace-jump-mode-pop-mark) ;; Jump to next occurence of char (global-set-key (kbd "C-c f") 'iy-go-to-char) @@ -39,9 +40,6 @@ ;; So good! (global-set-key (kbd "C-c g") 'magit-status) -;; Open project drawer -(global-set-key (kbd "M-p") 'project-explorer-open) - ;; Replace standard goto-line with ace-jump-line-mode (global-set-key (kbd "M-g g") 'ace-jump-line-mode) (global-set-key (kbd "M-g M-g") 'goto-line-with-feedback) @@ -58,6 +56,9 @@ ;; Create new frame (define-key global-map (kbd "C-x C-n") 'make-frame-command) +;; Recompile easily +(define-key prog-mode-map (kbd "C-c r") 'recompile) + ;; Org-mode agenda keys (global-set-key (kbd "C-c a") 'org-agenda) diff --git a/init/custom.el b/init/custom.el index 18af68c890e0..99cb1352530f 100644 --- a/init/custom.el +++ b/init/custom.el @@ -5,14 +5,16 @@ ;; If there is more than one, they won't work right. '(ac-auto-show-menu 0.8) '(ac-delay 0.2) - '(custom-safe-themes (quote ("6a37be365d1d95fad2f4d185e51928c789ef7a4ccf17e7ca13ad63a8bf5b922f" "6e92ca53a22d9b0577ad0b16e07e2e020c8b621197e39fec454048e51b7954cb" default))) + '(custom-safe-themes + (quote + ("3c83b3676d796422704082049fc38b6966bcad960f896669dfc21a7a37a748fa" "72e42ba8f32bbf4a0b30c4c25f378289058efb1790dbd9a3e7c3d9666cc7fee4" "0e7da2c7c64fb5d4764250ffa4b8b33c0946577108d1d6444f1020d0dabba784" "6a37be365d1d95fad2f4d185e51928c789ef7a4ccf17e7ca13ad63a8bf5b922f" "6e92ca53a22d9b0577ad0b16e07e2e020c8b621197e39fec454048e51b7954cb" default))) '(frame-brackground-mode (quote dark)) '(global-auto-complete-mode t) '(magit-log-show-gpg-status t) '(ns-alternate-modifier (quote none)) '(ns-command-modifier (quote meta)) '(org-agenda-files (quote ("~/source/spotify-puppet/modules/jira/TODO.org"))) - '(require-final-newline (quote visit-save))) + '(require-final-newline (quote visit-save)) (custom-set-faces ;; custom-set-faces was added by Custom. ;; If you edit it by hand, you could mess it up, so be careful. diff --git a/init/modes.el b/init/modes.el index 6ed5c7ee3f49..400daffa4945 100644 --- a/init/modes.el +++ b/init/modes.el @@ -25,7 +25,9 @@ (interactive) ;; Don't indent after '>' while I'm writing (local-set-key ">" 'self-insert-command) - ;(local-set-key "RET" 'newline) + ;;(local-set-key "RET" 'newline) + (projectile-mode 1) + (rainbow-delimiters-mode 1) ) (add-hook 'erlang-mode-hook 'erlang-mode-init-setup) diff --git a/init/settings.el b/init/settings.el index 6c81536df1e4..72959026afc2 100644 --- a/init/settings.el +++ b/init/settings.el @@ -28,6 +28,9 @@ ;; Give me column numbers (column-number-mode t) +;; Bash is the reliable one here +(setq multi-term-program "/bin/bash") + ;;; Code: (add-to-list 'exec-path "/usr/local/bin") |