Some updates

5 files changed, 23 insertions, 11 deletions

diff --git a/init-bindings.el b/init-bindings.el
index f44a3d3ed3c3..3876f85c5e91 100644
--- a/init-bindings.el
+++ b/init-bindings.el
@@ -59,8 +59,8 @@
 
 ;; Cider/nrepl stuff
 ;; I want history up/down without modifiers
-(define-key cider-repl-mode-map (kbd "<up>") 'cider-backward-input)
-(define-key cider-repl-mode-map (kbd "<down>") 'cider-forward-input)
+(define-key cider-repl-mode-map (kbd "<up>") 'cider-repl-backward-input)
+(define-key cider-repl-mode-map (kbd "<down>") 'cider-repl-forward-input)
 (define-key cider-repl-mode-map (kbd "C-<up>") 'previous-line)
 (define-key cider-repl-mode-map (kbd "C-<down>") 'next-line)
 
diff --git a/init-eshell.el b/init-eshell.el
index 912f8ee82bd9..e2191dd4ecf5 100644
--- a/init-eshell.el
+++ b/init-eshell.el
@@ -54,7 +54,7 @@
   "My EShell prompt displaying VC info and such"
   (concat
    (with-face (concat (clean-pwd (eshell/pwd)) " ") :foreground  "#96a6c8")
-   (with-face (vcprompt " -f \"(%s:%b%a%m) \"") :foreground "#5f627f")
+   ;(with-face (vcprompt " -f \"(%s:%b%a%m) \"") :foreground "#5f627f")
    (if (= 0 (user-uid))
        (with-face "#" :foreground "#f43841")
      (with-face "$" :foreground "#73c936"))
diff --git a/init-modes.el b/init-modes.el
index b04b2333fca8..0f28b48d176f 100644
--- a/init-modes.el
+++ b/init-modes.el
@@ -53,6 +53,10 @@
 ;; Enable Paredit in Emacs Lisp mode
 (add-hook 'emacs-lisp-mode-hook 'paredit-mode)
 
+;; Configure Haskell mode
+;; Indentation ...
+(add-hook 'haskell-mode-hook 'hi2-mode)
+
 ;; Always highlight matching brackets
 (show-paren-mode 1)
 
diff --git a/init-settings.el b/init-settings.el
index 4aaaa622f220..97103a298f11 100644
--- a/init-settings.el
+++ b/init-settings.el
@@ -4,8 +4,11 @@
 ; ## Generic settings ##
 
 ; Hide those ugly tool bars
-(tool-bar-mode -1)
-(scroll-bar-mode -1)
+(tool-bar-mode 0)
+(scroll-bar-mode 0)
+
+;; Go away go away
+(setq initial-scratch-message "")
 
 (flx-ido-mode 1)
 (setq ido-use-faces nil)
@@ -45,6 +48,11 @@
       backup-directory-alist `(("." . ,(concat user-emacs-directory "backups")))
       diff-switches "-u")
 
+;; Fix keys on Linux
+(if is-linux
+    (setq x-super-keysym 'meta
+          x-alt-keysym 'alt))
+
 ;; Fix mode line
 (if after-init-time (sml/setup)
   (add-hook 'after-init-hook 'sml/setup))
@@ -103,7 +111,7 @@
 
 (global-hl-line-mode -1)
 
-(set-face-attribute 'default nil :font "Source Code Pro 13")
+(set-face-attribute 'default nil :font "Source Code Pro 12")
 (set-default-font "Source Code Pro 13")
 
 (add-to-list 'after-make-frame-functions 'set-font)
diff --git a/init.el b/init.el
index e0a77094541d..ddf5c50bf167 100644
--- a/init.el
+++ b/init.el
@@ -13,12 +13,13 @@
 (add-to-list 'package-archives '("melpa" . "http://melpa.milkbox.net/packages/"))
 
 ;; And load things!
-(package-refresh-contents)
+;; (package-refresh-contents)
 (package-initialize)
 
 (defvar my-pkgs
   '(; Basic functionality
     ace-jump-mode
+    ack-and-a-half
     browse-kill-ring
     dash
     flx-ido
@@ -65,6 +66,9 @@
 ;; Are we on a mac?
 (setq is-mac (equal system-type 'darwin))
 
+;; Or on Linux?
+(setq is-linux (equal system-type 'gnu/linux))
+
 ;; Is this being used by a vim user?
 (setq is-vim-mode nil)
 
@@ -89,10 +93,6 @@
 (setq custom-file "~/.emacs.d/init-custom.el")
 (load custom-file)
 
-(custom-download-script
- "https://gist.github.com/gongo/1789605/raw/526e3f21dc7d6cef20951cf0ce5d51b90b7821ff/json-reformat.el"
- "json-reformat.el")
-
 ;; A file with machine specific settings.
 (load-file-if-exists "~/.emacs.d/init-local.el")