Browse Source

Numerous additions to emacs for better productivity

master
Taylor Bockman 9 years ago
parent
commit
c4d95c1644
  1. 19
      dotfiles/emacs.d/init.el
  2. 4
      dotfiles/emacs.d/package.el

19
dotfiles/emacs.d/init.el

@ -16,6 +16,12 @@
(setq vc-follow-symlinks t) (setq vc-follow-symlinks t)
;;------------------------------------------------------------------------------------- ;;-------------------------------------------------------------------------------------
;; Small fix for keyboard internationalization problems
;;-------------------------------------------------------------------------------------
(set-keyboard-coding-system nil)
;;-------------------------------------------------------------------------------------
;; Disable Splash Screen ;; Disable Splash Screen
;;------------------------------------------------------------------------------------- ;;-------------------------------------------------------------------------------------
@ -67,9 +73,14 @@
(setq linum-format "%4d \u2502 ") (setq linum-format "%4d \u2502 ")
;;------------------------------------------------------------------------------------- ;;-------------------------------------------------------------------------------------
;; Ido Mode ;; Hook framemove into windmove for seamless window to frame transitions
;;------------------------------------------------------------------------------------- ;;-------------------------------------------------------------------------------------
(setq framemove-hook-into-windmove t)
;;-------------------------------------------------------------------------------------
;; Ido Mode
;;-------------------------------------------------------------------------------------
(defvar ido-enable-flex-matching) (defvar ido-enable-flex-matching)
(defvar ido-everywhere) (defvar ido-everywhere)
@ -118,6 +129,7 @@
(global-set-key (kbd "C-t") nil) (global-set-key (kbd "C-t") nil)
(global-set-key (kbd "C-d") nil) (global-set-key (kbd "C-d") nil)
(global-set-key (kbd "C-m") nil)
;; Neotree binds are prefixed by C-t ;; Neotree binds are prefixed by C-t
@ -137,6 +149,11 @@
;; Delete surrounding ;; Delete surrounding
(global-set-key (kbd "C-d s") 'delete-pair) (global-set-key (kbd "C-d s") 'delete-pair)
;; 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)
;;------------------------------------------------------------------------------------- ;;-------------------------------------------------------------------------------------

4
dotfiles/emacs.d/package.el

@ -1,9 +1,9 @@
(require 'cl) (require 'cl)
(defvar my-packages '(ag clojure-mode coffee-mode css-mode flycheck (defvar my-packages '(ag auto-complete clojure-mode coffee-mode css-mode framemove flycheck
flycheck-clojure flycheck-haskell flycheck-rust flycheck-clojure flycheck-haskell flycheck-rust
flycheck-pos-tip flx-ido gitignore-mode haskell-mode js2-mode flycheck-pos-tip flx-ido gitignore-mode haskell-mode js2-mode
less-css-mode neotree paredit scss-mode powerline projectile less-css-mode magit neotree paredit scss-mode powerline projectile
rust-mode color-theme-solarized wrap-region) rust-mode color-theme-solarized wrap-region)
"Packages to make sure are installed") "Packages to make sure are installed")

Loading…
Cancel
Save