From c4d95c164453942100d53c8ff0fd3b8008df1d35 Mon Sep 17 00:00:00 2001 From: Taylor Bockman Date: Fri, 13 Nov 2015 17:06:22 -0800 Subject: [PATCH] Numerous additions to emacs for better productivity --- dotfiles/emacs.d/init.el | 19 ++++++++++++++++++- dotfiles/emacs.d/package.el | 4 ++-- 2 files changed, 20 insertions(+), 3 deletions(-) diff --git a/dotfiles/emacs.d/init.el b/dotfiles/emacs.d/init.el index acf5435..1f843d1 100644 --- a/dotfiles/emacs.d/init.el +++ b/dotfiles/emacs.d/init.el @@ -16,6 +16,12 @@ (setq vc-follow-symlinks t) ;;------------------------------------------------------------------------------------- +;; Small fix for keyboard internationalization problems +;;------------------------------------------------------------------------------------- + +(set-keyboard-coding-system nil) + +;;------------------------------------------------------------------------------------- ;; Disable Splash Screen ;;------------------------------------------------------------------------------------- @@ -67,9 +73,14 @@ (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-everywhere) @@ -118,6 +129,7 @@ (global-set-key (kbd "C-t") nil) (global-set-key (kbd "C-d") nil) +(global-set-key (kbd "C-m") nil) ;; Neotree binds are prefixed by C-t @@ -137,6 +149,11 @@ ;; Delete surrounding (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) ;;------------------------------------------------------------------------------------- diff --git a/dotfiles/emacs.d/package.el b/dotfiles/emacs.d/package.el index de53521..a5b3f7e 100644 --- a/dotfiles/emacs.d/package.el +++ b/dotfiles/emacs.d/package.el @@ -1,9 +1,9 @@ (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-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) "Packages to make sure are installed")