maurice/snix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Some updates

Browse source
This commit is contained in:
Vincent Ambo 2014-01-30 14:26:52 +01:00
parent 490ea14fad
commit 8a5115d5b5
5 changed files with 23 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

4
init-bindings.el
View file

@ -59,8 +59,8 @@
;; Cider/nrepl stuff ;; Cider/nrepl stuff
;; I want history up/down without modifiers ;; 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 "<up>") 'cider-repl-backward-input)
(define-key cider-repl-mode-map (kbd "<down>") 'cider-forward-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-<up>") 'previous-line)
(define-key cider-repl-mode-map (kbd "C-<down>") 'next-line) (define-key cider-repl-mode-map (kbd "C-<down>") 'next-line)

2
init-eshell.el
View file

@ -54,7 +54,7 @@
"My EShell prompt displaying VC info and such" "My EShell prompt displaying VC info and such"
(concat (concat
(with-face (concat (clean-pwd (eshell/pwd)) " ") :foreground "#96a6c8") (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)) (if (= 0 (user-uid))
(with-face "#" :foreground "#f43841") (with-face "#" :foreground "#f43841")
(with-face "$" :foreground "#73c936")) (with-face "$" :foreground "#73c936"))

4
init-modes.el
View file

@ -53,6 +53,10 @@
;; Enable Paredit in Emacs Lisp mode ;; Enable Paredit in Emacs Lisp mode
(add-hook 'emacs-lisp-mode-hook 'paredit-mode) (add-hook 'emacs-lisp-mode-hook 'paredit-mode)
;; Configure Haskell mode
;; Indentation ...
(add-hook 'haskell-mode-hook 'hi2-mode)
;; Always highlight matching brackets ;; Always highlight matching brackets
(show-paren-mode 1) (show-paren-mode 1)

14
init-settings.el
View file

@ -4,8 +4,11 @@
; ## Generic settings ## ; ## Generic settings ##
; Hide those ugly tool bars ; Hide those ugly tool bars
(tool-bar-mode -1) (tool-bar-mode 0)
(scroll-bar-mode -1) (scroll-bar-mode 0)
;; Go away go away
(setq initial-scratch-message "")
(flx-ido-mode 1) (flx-ido-mode 1)
(setq ido-use-faces nil) (setq ido-use-faces nil)
@ -45,6 +48,11 @@
backup-directory-alist `(("." . ,(concat user-emacs-directory "backups"))) backup-directory-alist `(("." . ,(concat user-emacs-directory "backups")))
diff-switches "-u") diff-switches "-u")
;; Fix keys on Linux
(if is-linux
(setq x-super-keysym 'meta
x-alt-keysym 'alt))
;; Fix mode line ;; Fix mode line
(if after-init-time (sml/setup) (if after-init-time (sml/setup)
(add-hook 'after-init-hook 'sml/setup)) (add-hook 'after-init-hook 'sml/setup))
@ -103,7 +111,7 @@
(global-hl-line-mode -1) (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") (set-default-font "Source Code Pro 13")
(add-to-list 'after-make-frame-functions 'set-font) (add-to-list 'after-make-frame-functions 'set-font)

10
init.el
View file

@ -13,12 +13,13 @@
(add-to-list 'package-archives '("melpa" . "http://melpa.milkbox.net/packages/")) (add-to-list 'package-archives '("melpa" . "http://melpa.milkbox.net/packages/"))
;; And load things! ;; And load things!
(package-refresh-contents) ;; (package-refresh-contents)
(package-initialize) (package-initialize)
(defvar my-pkgs (defvar my-pkgs
'(; Basic functionality '(; Basic functionality
ace-jump-mode ace-jump-mode
ack-and-a-half
browse-kill-ring browse-kill-ring
dash dash
flx-ido flx-ido
@ -65,6 +66,9 @@
;; Are we on a mac? ;; Are we on a mac?
(setq is-mac (equal system-type 'darwin)) (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? ;; Is this being used by a vim user?
(setq is-vim-mode nil) (setq is-vim-mode nil)
@ -89,10 +93,6 @@
(setq custom-file "~/.emacs.d/init-custom.el") (setq custom-file "~/.emacs.d/init-custom.el")
(load custom-file) (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. ;; A file with machine specific settings.
(load-file-if-exists "~/.emacs.d/init-local.el") (load-file-if-exists "~/.emacs.d/init-local.el")