From 25a2b675f778953799777fc0b13071995a5c14b4 Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Mon, 22 Sep 2014 12:02:33 -0400 Subject: [PATCH] Clean up --- init.el | 6 +++--- init/init-git.el | 6 +++--- init/init-ruby.el | 13 +++++-------- 3 files changed, 11 insertions(+), 14 deletions(-) diff --git a/init.el b/init.el index 711b89403..0639a661a 100644 --- a/init.el +++ b/init.el @@ -56,14 +56,14 @@ init-love ; Love.app gamedev init-cpp ; C++ gamedev init-eclim ; Integration into eclipse (for Java) - init-csharp ; Emacs as a Csharp/Unity IDE + ;; init-csharp ; Emacs as a Csharp/Unity IDE my-settings ; Any other custom settings my-commands ; Interactive defuns & evil operators/commands my-keymaps ; My keybindings )) -(require 'server) -(unless (server-running-p) (server-start)) +;; (require 'server) +;; (unless (server-running-p) (server-start)) ;; I've created a monster! diff --git a/init/init-git.el b/init/init-git.el index f6c81b26a..527565da1 100644 --- a/init/init-git.el +++ b/init/init-git.el @@ -21,7 +21,7 @@ ("/\\.git/info/exclude\\'" . gitignore-mode) ("/git/ignore\\'" . gitignore-mode))) -(use-package git-gutter+ - :diminish git-gutter+-mode +(use-package git-gutter + :diminish git-gutter-mode :init - (global-git-gutter+-mode 1)) + (global-git-gutter-mode 1)) diff --git a/init/init-ruby.el b/init/init-ruby.el index f5c4f791c..b531e7995 100644 --- a/init/init-ruby.el +++ b/init/init-ruby.el @@ -1,12 +1,5 @@ (provide 'init-ruby) -(defun enable-ruby-rsense () - (setq rsense-home "/usr/local/Cellar/rsense/0.3/libexec") - (when (file-directory-p rsense-home) - (add-to-list 'load-path (concat rsense-home "/etc")) - (require 'rsense) - (add-hook 'ruby-mode-hook 'ac-add-ruby-rsense))) - (defun ac-add-ruby-rsense () (setq ac-sources (append '(ac-source-rsense ac-source-yasnippet) ac-sources))) @@ -48,7 +41,11 @@ ;;; Auto-completion ;; Remember to install rsense w/ homebrew! - (enable-ruby-rsense) + (setq rsense-home "/usr/local/Cellar/rsense/0.3/libexec") + (when (file-directory-p rsense-home) + (add-to-list 'load-path (concat rsense-home "/etc")) + (require 'rsense) + (add-hook 'ruby-mode-hook 'ac-add-ruby-rsense)) (add-hook! 'ruby-mode-hook (setq my-switch-to-repl-func 'ruby-switch-to-inf