Rebind magic, add column rule at 120:

dotfiles/emacs.d/init.el

@@ -29,6 +29,13 @@
 (setq inhibit-splash-screen t)
 
 ;;--------------------------------------------------------------------------------------
+;; Enable auto-refresh to keep buffers up to date when git or another program
+;; modifies them
+;;--------------------------------------------------------------------------------------
+
+(global-auto-revert-mode t)
+
+;;--------------------------------------------------------------------------------------
 ;; Handy editor stuff
 ;;--------------------------------------------------------------------------------------
 
@@ -86,6 +93,17 @@
 (powerline-center-theme)
 
 ;;--------------------------------------------------------------------------------------
+;; Fill column indicator (currently set to 120 characters)
+;;--------------------------------------------------------------------------------------
+
+(require 'fill-column-indicator)
+
+(setq fci-rule-width 1)
+(setq fci-rule-color "black")
+(setq fci-rule-column 120)
+(add-hook 'after-change-major-mode-hook 'fci-mode)
+
+;;--------------------------------------------------------------------------------------
 ;; Line Numbering - Note: Might not look good with files with 10,000 or more lines
 ;;--------------------------------------------------------------------------------------
 
@@ -197,10 +215,10 @@
 
 ;; Git utility
 
-(global-set-key (kbd "C-m s") 'magit-status)
-(global-set-key (kbd "C-m b") 'magit-blame-popup)
-(global-set-key (kbd "C-m p") 'magit-dispatch-popup)
-(global-set-key (kbd "C-m f") 'magit-file-popup)
+(global-set-key (kbd "C-x g s") 'magit-status)
+(global-set-key (kbd "C-x g b") 'magit-blame-popup)
+(global-set-key (kbd "C-x g p") 'magit-dispatch-popup)
+(global-set-key (kbd "C-x g f") 'magit-file-popup)
 
 ;; Fix RET
 

dotfiles/emacs.d/package.el

@@ -1,17 +1,17 @@
 (require 'cl)
- 
+
 (defvar my-packages '(ag auto-complete clojure-mode coffee-mode css-mode framemove flycheck
-                         flycheck-clojure flycheck-haskell flycheck-rust
-                         flycheck-pos-tip gitignore-mode haskell-mode helm  helm-projectile
+                         fill-column-indicator flycheck-clojure flycheck-haskell flycheck-rust
+                         flycheck-pos-tip gitignore-mode haskell-mode helm helm-ag helm-projectile
                          js2-mode less-css-mode magit neotree paredit scss-mode powerline projectile
                          rust-mode color-theme-solarized wrap-region)
   "Packages to make sure are installed")
- 
+
 (defun my-packages-installed-p ()
   (loop for p in my-packages
         when (not (package-installed-p p)) do (return nil)
         finally (return t)))
- 
+
 (unless (my-packages-installed-p)
   ;; check for new packages (package versions)
   (package-refresh-contents)