about summary refs log tree commit diff
path: root/emacs.d
diff options
context:
space:
mode:
Diffstat (limited to 'emacs.d')
-rw-r--r--emacs.d/init-functions.el13
-rw-r--r--emacs.d/init-modes.el8
-rw-r--r--emacs.d/init-settings.el4
-rw-r--r--emacs.d/init.el1
4 files changed, 6 insertions, 20 deletions
diff --git a/emacs.d/init-functions.el b/emacs.d/init-functions.el
index b394b999fdcf..3a1c8c7e8e14 100644
--- a/emacs.d/init-functions.el
+++ b/emacs.d/init-functions.el
@@ -73,19 +73,6 @@
       (find-file (concat "/sudo:root@localhost:" (ido-read-file-name "File: ")))
     (find-alternate-file (concat "/sudo:root@localhost:" buffer-file-name))))
 
-(defun esk-suck-it (suckee)
-  "Insert a comment of appropriate length about what can suck it."
-  (interactive "MWhat can suck it? ")
-  (let ((prefix (concat ";; " suckee " can s"))
-        (postfix "ck it!")
-        (col (current-column)))
-    (insert prefix)
-    (dotimes (_ (- 80 col (length prefix) (length postfix))) (insert "u"))
-    (insert postfix)))
-
-(defun esk-turn-off-tool-bar ()
-  (if (functionp 'tool-bar-mode) (tool-bar-mode -1)))
-
 (defun speak (m &optional voice)
   (shell-command (if 'voice (concat "say -v " voice " \"" m "\"")
 		   (concat "say " m))))
diff --git a/emacs.d/init-modes.el b/emacs.d/init-modes.el
index 39dcfd74bc38..3e9cff999654 100644
--- a/emacs.d/init-modes.el
+++ b/emacs.d/init-modes.el
@@ -1,4 +1,4 @@
-(mapc 'require '(projectile))
+(mapc 'require '(projectile hi2))
 ;; Initializes modes I use.
 
 (add-hook 'prog-mode-hook 'esk-pretty-lambdas)
@@ -12,12 +12,6 @@
 (add-to-list 'auto-mode-alist '("\\.markdown\\'" . markdown-mode))
 (add-to-list 'auto-mode-alist '("\\.md\\'" . markdown-mode))
 
-;; Configure haskell-mode
-;; Enable semi-automatic indentation and font-locking
-(require 'hi2)
-;;(add-hook 'haskell-mode-hook 'turn-on-hi2)
-;;(add-hook 'haskell-mode-hook 'font-lock-mode)
-
 ;; Add keybindings to move nested blocks with C-, rsp. C-.
 (define-key haskell-mode-map (kbd "C-,") 'haskell-move-nested-left)
 (define-key haskell-mode-map (kbd "C-.") 'haskell-move-nested-right)
diff --git a/emacs.d/init-settings.el b/emacs.d/init-settings.el
index f8e87ef0ab21..02069a82f8c2 100644
--- a/emacs.d/init-settings.el
+++ b/emacs.d/init-settings.el
@@ -3,6 +3,10 @@
 (tool-bar-mode -1)
 (scroll-bar-mode -1)
 
+(flx-ido-mode 1)
+(setq ido-use-faces nil)
+(setq gc-cons-threshold 20000000)
+
 ;;; Code:
 
 (add-to-list 'exec-path "/usr/local/bin")
diff --git a/emacs.d/init.el b/emacs.d/init.el
index bd3ecc9f7090..d9bc8d874b96 100644
--- a/emacs.d/init.el
+++ b/emacs.d/init.el
@@ -18,6 +18,7 @@
     browse-kill-ring
     clojure-mode
     flycheck
+    flx-ido
     haskell-mode
     hi2
     idle-highlight-mode