From a931425b048325cd8358d41e5e7713701dc33125 Mon Sep 17 00:00:00 2001
From: Valentin Gehrke <madmaurice@zom.bi>
Date: Thu, 18 May 2017 00:49:00 +0200
Subject: [PATCH] Mehr emacs gebastel. ivy und avy.

---
 emacs/.emacs | 33 +++++++++++++++++++++++++++++----
 1 file changed, 29 insertions(+), 4 deletions(-)

diff --git a/emacs/.emacs b/emacs/.emacs
index 46d6d64..2e7abec 100644
--- a/emacs/.emacs
+++ b/emacs/.emacs
@@ -1,7 +1,10 @@
 (package-initialize)
 (require 'package)
 
-(push '("marmalade" . "http://marmalade-repo.org/packages/") package-archives)
+;; Quote
+(setq initial-scratch-message ";; Simplicity and elegance are unpopular because\n;; they require hard work and discipline to achieve\n;; and education to be appreciated.\n;;\n;; - Dijkstra")
+
+;(push '("marmalade" . "http://marmalade-repo.org/packages/") package-archives)
 (push '("melpa" . "http://melpa.milkbox.net/packages/") package-archives)
 
 (custom-set-variables
@@ -17,13 +20,13 @@
  '(custom-enabled-themes (quote (heroku)))
  '(custom-safe-themes
    (quote
-    ("4f2ede02b3324c2f788f4e0bad77f7ebc1874eff7971d2a2c9b9724a50fb3f65" default)))
+	("4f2ede02b3324c2f788f4e0bad77f7ebc1874eff7971d2a2c9b9724a50fb3f65" default)))
  '(global-evil-surround-mode t)
  '(inhibit-startup-screen t)
  '(menu-bar-mode nil)
  '(package-selected-packages
    (quote
-    (yasnippet evil-surround org evil-magit magit makefile-runner evil)))
+	(ivy avy heroku-theme auto-complete use-package yasnippet evil-surround org evil-magit magit makefile-runner evil)))
  '(scroll-bar-mode nil)
  '(tool-bar-mode nil))
 (custom-set-faces
@@ -31,7 +34,7 @@
  ;; If you edit it by hand, you could mess it up, so be careful.
  ;; Your init file should contain only one such instance.
  ;; If there is more than one, they won't work right.
- '(default ((t (:inherit nil :stipple nil :inverse-video nil :box nil :strike-through nil :overline nil :underline nil :slant normal :weight normal :height 113 :width normal :foundry "PfEd" :family "Inconsolata")))))
+ )
 
 ;; ensure repo cache is up1date
 (or (file-exists-p package-user-dir)
@@ -48,6 +51,11 @@
 
 (ensure-package-installed 'use-package)
 
+
+;; theme
+(use-package heroku-theme
+  :ensure t)
+
 ;; Org-mode
 (use-package org
   :ensure t)
@@ -66,13 +74,30 @@
 			(require 'auto-complete-config)
 			(ac-config-default)))
 
+(use-package ivy
+  :ensure t
+  :demand t
+  :config (progn
+			(ivy-mode 1)
+			(setq ivy-use-virtual-buffers t)
+			(setq ivy-count-format "(%d/%d) ")))
+
 ;; Yasnippet
 (use-package yasnippet
   :demand t
   :config (yas-global-mode 1))
 
+;; avy
+(use-package avy
+  :ensure t
+  :demand t
+  :bind ("C-s" . avy-goto-word-0)
+  :config (progn
+			(setq avy-keys '(?a ?s ?d ?f ?g ?q ?w ?e ?r ?t ?y ?x ?c ?v ?z ?u ?i ?o ?p ?h ?j ?k ?l ?b ?n ?m))))
+
 ;; Magit
 (use-package magit
+  :ensure t
   :bind ("C-x g" . magit-status))
 
 ;; Easy terminal