Minor changes
This commit is contained in:
		
							parent
							
								
									ee070585df
								
							
						
					
					
						commit
						90f4e2811d
					
				
					 5 changed files with 15 additions and 6 deletions
				
			
		
							
								
								
									
										1
									
								
								init.el
									
										
									
									
									
								
							
							
						
						
									
										1
									
								
								init.el
									
										
									
									
									
								
							| 
						 | 
					@ -35,6 +35,7 @@
 | 
				
			||||||
    magit
 | 
					    magit
 | 
				
			||||||
    markdown-mode+
 | 
					    markdown-mode+
 | 
				
			||||||
    multiple-cursors
 | 
					    multiple-cursors
 | 
				
			||||||
 | 
					    multi-term
 | 
				
			||||||
    mvn
 | 
					    mvn
 | 
				
			||||||
    nyan-mode
 | 
					    nyan-mode
 | 
				
			||||||
    paredit
 | 
					    paredit
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -17,6 +17,7 @@
 | 
				
			||||||
 | 
					
 | 
				
			||||||
;; Ace-jump-mode
 | 
					;; Ace-jump-mode
 | 
				
			||||||
(global-set-key (kbd "M-j") 'ace-jump-word-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
 | 
					;; Jump to next occurence of char
 | 
				
			||||||
(global-set-key (kbd "C-c f") 'iy-go-to-char)
 | 
					(global-set-key (kbd "C-c f") 'iy-go-to-char)
 | 
				
			||||||
| 
						 | 
					@ -39,9 +40,6 @@
 | 
				
			||||||
;; So good!
 | 
					;; So good!
 | 
				
			||||||
(global-set-key (kbd "C-c g") 'magit-status)
 | 
					(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
 | 
					;; 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 g") 'ace-jump-line-mode)
 | 
				
			||||||
(global-set-key (kbd "M-g M-g") 'goto-line-with-feedback)
 | 
					(global-set-key (kbd "M-g M-g") 'goto-line-with-feedback)
 | 
				
			||||||
| 
						 | 
					@ -58,6 +56,9 @@
 | 
				
			||||||
;; Create new frame
 | 
					;; Create new frame
 | 
				
			||||||
(define-key global-map (kbd "C-x C-n") 'make-frame-command)
 | 
					(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
 | 
					;; Org-mode agenda keys
 | 
				
			||||||
(global-set-key (kbd "C-c a") 'org-agenda)
 | 
					(global-set-key (kbd "C-c a") 'org-agenda)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -5,14 +5,16 @@
 | 
				
			||||||
 ;; If there is more than one, they won't work right.
 | 
					 ;; If there is more than one, they won't work right.
 | 
				
			||||||
 '(ac-auto-show-menu 0.8)
 | 
					 '(ac-auto-show-menu 0.8)
 | 
				
			||||||
 '(ac-delay 0.2)
 | 
					 '(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))
 | 
					 '(frame-brackground-mode (quote dark))
 | 
				
			||||||
 '(global-auto-complete-mode t)
 | 
					 '(global-auto-complete-mode t)
 | 
				
			||||||
 '(magit-log-show-gpg-status t)
 | 
					 '(magit-log-show-gpg-status t)
 | 
				
			||||||
 '(ns-alternate-modifier (quote none))
 | 
					 '(ns-alternate-modifier (quote none))
 | 
				
			||||||
 '(ns-command-modifier (quote meta))
 | 
					 '(ns-command-modifier (quote meta))
 | 
				
			||||||
 '(org-agenda-files (quote ("~/source/spotify-puppet/modules/jira/TODO.org")))
 | 
					 '(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
 | 
				
			||||||
 ;; custom-set-faces was added by Custom.
 | 
					 ;; custom-set-faces was added by Custom.
 | 
				
			||||||
 ;; If you edit it by hand, you could mess it up, so be careful.
 | 
					 ;; If you edit it by hand, you could mess it up, so be careful.
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -25,7 +25,9 @@
 | 
				
			||||||
  (interactive)
 | 
					  (interactive)
 | 
				
			||||||
  ;; Don't indent after '>' while I'm writing
 | 
					  ;; Don't indent after '>' while I'm writing
 | 
				
			||||||
  (local-set-key ">" 'self-insert-command)
 | 
					  (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)
 | 
					(add-hook 'erlang-mode-hook 'erlang-mode-init-setup)
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -28,6 +28,9 @@
 | 
				
			||||||
;; Give me column numbers
 | 
					;; Give me column numbers
 | 
				
			||||||
(column-number-mode t)
 | 
					(column-number-mode t)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					;; Bash is the reliable one here
 | 
				
			||||||
 | 
					(setq multi-term-program "/bin/bash")
 | 
				
			||||||
 | 
					
 | 
				
			||||||
;;; Code:
 | 
					;;; Code:
 | 
				
			||||||
 | 
					
 | 
				
			||||||
(add-to-list 'exec-path "/usr/local/bin")
 | 
					(add-to-list 'exec-path "/usr/local/bin")
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue