From 787943df9ea7ec47937fa3a8bb371d96b1cc2b19 Mon Sep 17 00:00:00 2001
From: Maciej Szlosarczyk <maciej@sosek.net>
Date: Sun, 9 Sep 2018 09:50:42 +0300
Subject: [PATCH] Work on removing evil-leader key binding as they might be not
 needed

---
 01mac.el        |  4 ++++
 02evil.el       | 14 +++++++-------
 03ivy.el        |  9 +++++++++
 04magit.el      |  2 +-
 05prog-mode.el  |  9 +++++----
 07projectile.el |  4 ++--
 init.el         |  8 +++++---
 7 files changed, 33 insertions(+), 17 deletions(-)

diff --git a/01mac.el b/01mac.el
index 2991a45..23db9da 100644
--- a/01mac.el
+++ b/01mac.el
@@ -9,6 +9,10 @@
 (global-set-key (kbd "s-<up>") 'scroll-down) ; WTF is this reverse, I dunno
 (global-set-key (kbd "s-<down>") 'scroll-up)
 
+;;; Helpful key bindings
+(global-set-key (kbd "<f1> b") 'describe-bindings) ;; List all key bindings
+                                                   ;; there are.
+
 ;;; Window display
 (menu-bar-mode -1)
 (tool-bar-mode -1)
diff --git a/02evil.el b/02evil.el
index 83a92e7..9d1cc95 100644
--- a/02evil.el
+++ b/02evil.el
@@ -6,14 +6,14 @@
 (evil-leader/set-leader "<SPC>")
 
 (evil-leader/set-key
-  "w"  'delete-window
-  ","  'previous-buffer
-  "."  'next-buffer
-  "k"  'kill-buffer-and-window
-  "rb" 'revert-buffer) ; Reload current file from disk
+  "w"  'delete-window ;; C-x 0
+  ","  'previous-buffer ;; C-x left
+  "."  'next-buffer ;; C-x right
+  "k"  'kill-buffer-and-window ;; C-x 4 0
+  "rb" 'revert-buffer) ;; S-u Reload current file from disk
 
-(evil-leader/set-key "hs" 'split-window-below)
-(evil-leader/set-key "vs" 'split-window-right)
+(evil-leader/set-key "hs" 'split-window-below) ;; C-x 2
+(evil-leader/set-key "vs" 'split-window-right) ;; C-x 3
 
 (evil-leader/set-key
   "gk" 'windmove-up
diff --git a/03ivy.el b/03ivy.el
index 8021ca8..5c3ad43 100644
--- a/03ivy.el
+++ b/03ivy.el
@@ -7,3 +7,12 @@
 (evil-leader/set-key "b"  'ivy-switch-buffer)
 (evil-leader/set-key "/" 'swiper)
 (evil-leader/set-key "t" 'counsel-find-file)
+
+(global-set-key (kbd "C-s") 'swiper)
+(global-set-key (kbd "M-x") 'counsel-M-x)
+(global-set-key (kbd "C-x C-f") 'counsel-find-file)
+(global-set-key (kbd "<f1> f") 'counsel-describe-function)
+(global-set-key (kbd "<f1> v") 'counsel-describe-variable)
+(global-set-key (kbd "<f1> l") 'counsel-find-library)
+(global-set-key (kbd "<f2> i") 'counsel-info-lookup-symbol)
+(global-set-key (kbd "<f2> u") 'counsel-unicode-char)
diff --git a/04magit.el b/04magit.el
index 32560d6..6bd3ed5 100644
--- a/04magit.el
+++ b/04magit.el
@@ -6,4 +6,4 @@
   "gb" 'magit-blame
   "gq" 'magit-blame-quit)
 
-(require 'evil-magit)
+;; (require 'evil-magit)
diff --git a/05prog-mode.el b/05prog-mode.el
index f50f093..4ba4479 100644
--- a/05prog-mode.el
+++ b/05prog-mode.el
@@ -30,10 +30,11 @@
 (delete-selection-mode 1)
 
 ;; Key bindings
-(evil-leader/set-key "cl" 'evilnc-comment-or-uncomment-lines) ;; Comment lines
-(evil-leader/set-key "al" 'align-regexp)                      ;; Align code to some regexp
-(evil-leader/set-key "ir" 'indent-region)                     ;; Indent selected region
-(evil-leader/set-key "d" 'dash-at-point)                      ;; Jump to dash definition
+(evil-leader/set-key "cl" 'comment-line)  ;; Comment lines C-x C-;
+(evil-leader/set-key "al" 'align-regexp)  ;; Align code to some regexp NONE
+(evil-leader/set-key "ir" 'indent-region) ;; Indent selected region C-M-\
+(evil-leader/set-key "d" 'dash-at-point)  ;; Jump to dash definition NONE
+(define-key prog-mode-map (kbd "C-d") 'dash-at-point) ;; Jump to dash definition
 
 ;; When possible, show code documentation
 (global-eldoc-mode 1)
diff --git a/07projectile.el b/07projectile.el
index 8f0bcf6..6a93007 100644
--- a/07projectile.el
+++ b/07projectile.el
@@ -1,7 +1,7 @@
 (require 'projectile)
 
-
-(setq-default projectile-enable-caching t                        ;; Cache project files
+(setq-default projectile-completion-system 'ivy                  ;; Use ivy as completion system
+              projectile-enable-caching t                        ;; Cache project files
               projectile-file-exists-local-cache-expire (* 3 60) ;; keep cache for 3 minutes
               projectile-sort-order (quote recently-active)      ;; Order by recently active projects
               projectile-globally-ignored-directories
diff --git a/init.el b/init.el
index 7384e44..33460da 100644
--- a/init.el
+++ b/init.el
@@ -18,7 +18,6 @@
 
                      evil ;; Behave like VIM
 		                 evil-leader ;; Allow to set leader key (usually space)
-                     evil-nerd-commenter ;; Add comments to files
 
                      rainbow-delimiters ;; Colorize matching parens
 		                 rainbow-mode ;; Make color symbols like #FFF colorfull
@@ -66,10 +65,13 @@
                      web-mode
 
                      ;; Infrastructure files
-                     yaml-mode
                      dockerfile-mode
                      terraform-mode
                      ansible
+
+                     ;; Text files
+                     yaml-mode
+                     markdown-mode
                      )
       )
 
@@ -103,7 +105,7 @@
  ;; If there is more than one, they won't work right.
  '(package-selected-packages
    (quote
-    (solarized-theme company-ansible alchemist evil-magit window-purpose column-enforce-mode yaml-mode ansible dockerfile-mode evil-nerd-commenter ruby-end web-mode flymake-ruby rvm dash-at-point robe base16-theme exec-path-from-shell evil))))
+    (markdown-mode solarized-theme company-ansible alchemist evil-magit window-purpose column-enforce-mode yaml-mode ansible dockerfile-mode ruby-end web-mode flymake-ruby rvm dash-at-point robe base16-theme exec-path-from-shell evil))))
 (custom-set-faces
  ;; custom-set-faces was added by Custom.
  ;; If you edit it by hand, you could mess it up, so be careful.