Some small improvements to the setup

loader.org

@@ -187,43 +187,54 @@ Bookmarks are very useful for quickly jumping around files.
 
 
 #+BEGIN_SRC emacs-lisp
-  (use-package counsel :ensure t)
-
-  (use-package swiper
+  (use-package counsel
+    :ensure t
+    :bind
+    (("M-x" . counsel-M-x)
+     ("M-y" . counsel-yank-pop)
+     :map ivy-minibuffer-map
+     ("M-y" . ivy-next-line)))
+
+   (use-package swiper
+     :pin melpa-stable
+     :ensure t
+     :bind*
+     (("C-s" . swiper)
+      ("C-c C-r" . ivy-resume)
+      ("C-x C-f" . counsel-find-file)
+      ("C-c h f" . counsel-describe-function)
+      ("C-c h v" . counsel-describe-variable)
+      ("C-c i u" . counsel-unicode-char)
+      ("M-i" . counsel-imenu)
+      ("C-c g" . counsel-git)
+      ("C-c j" . counsel-git-grep)
+      ("C-c k" . counsel-ag)
+      ("C-c l" . scounsel-locate))
+     :config
+     (progn
+       (ivy-mode 1)
+       (setq ivy-use-virtual-buffers t)
+       (define-key read-expression-map (kbd "C-r") #'counsel-expression-history)
+       (ivy-set-actions
+	'counsel-find-file
+	'(("d" (lambda (x) (delete-file (expand-file-name x)))
+           "delete"
+           )))
+       (ivy-set-actions
+	'ivy-switch-buffer
+	'(("k"
+           (lambda (x)
+             (kill-buffer x)
+             (ivy--reset-state ivy-last))
+           "kill")
+          ("j"
+           ivy--switch-buffer-other-window-action
+           "other window")))))
+
+  (use-package counsel-projectile
     :ensure t
-    :bind*
-    (("C-s" . swiper)
-     ("C-c C-r" . ivy-resume)
-     ("M-x" . counsel-M-x)
-     ("C-x C-f" . counsel-find-file)
-     ("C-c h f" . counsel-describe-function)
-     ("C-c h v" . counsel-describe-variable)
-     ("C-c i u" . counsel-unicode-char)
-     ("M-i" . counsel-imenu)
-     ("C-c g" . counsel-git)
-     ("C-c j" . counsel-git-grep)
-     ("C-c k" . counsel-ag)
-     ("C-c l" . scounsel-locate))
     :config
-    (progn
-      (ivy-mode 1)
-      (setq ivy-use-virtual-buffers t)
-      (define-key read-expression-map (kbd "C-r") #'counsel-expression-history)
-      (ivy-set-actions
-       'counsel-find-file
-       '(("d" (lambda (x) (delete-file (expand-file-name x)))
-          "delete"
-          )))
-      (ivy-set-actions
-       'ivy-switch-buffer
-       '(("k"
-          (lambda (x)
-            (kill-buffer x)
-            (ivy--reset-state ivy-last))
-          "kill")
-         ("j"
-          ivy--switch-buffer-other-window-action
-          "other window")))))
+    (counsel-projectile-on))
 
   (use-package ivy-hydra :ensure t)
 #+END_SRC
@@ -358,7 +369,7 @@ Install dictionaries from the [[https://addons.mozilla.org/en-us/firefox/languag
   (use-package ace-window
     :ensure t
     :config
-    (global-set-key (kbd "C-c w") 'ace-window))
+    (global-set-key (kbd "C-x o") 'ace-window))
 
   (use-package ace-jump-mode
     :ensure t
@@ -751,6 +762,7 @@ sign.
     (add-hook 'lisp-mode-hook             #'enable-paredit-mode)
     (add-hook 'lisp-interaction-mode-hook #'enable-paredit-mode)
     (add-hook 'scheme-mode-hook           #'enable-paredit-mode)
+    :bind (("C-c d" . paredit-forward-down))
     )
 
   ;; Ensure paredit is used EVERYWHERE!
@@ -818,6 +830,11 @@ Magit is the only thing you need when it comes to Version Control (Git)
   (use-package magit
     :ensure t
     :bind (("C-c m" . magit-status)))
+
+  (use-package magit-gitflow
+    :ensure t
+    :config
+    (add-hook 'magit-mode-hook 'turn-on-magit-gitflow))
 #+END_SRC
 
 Display the buffer state in the fringe.
@@ -878,7 +895,7 @@ supporting modules.
                                    ;; insert keybinding setup here
                                    ))
     (cljr-add-keybindings-with-prefix "C-c C-m")
-    (setq cljr-warn-on-evaql nil)
+    (setq cljr-warn-on-eval nil)
     :bind ("C-c '" . hydra-cljr-help-menu/body)
   )
 #+end_src
@@ -947,6 +964,8 @@ The web-mode is particularily good for editing HTML and JS files.
 
     (defun my-web-mode-hook ()
       "Hooks for Web mode."
+      (setq web-mode-enable-auto-closing t)
+      (setq web-mode-enable-auto-quoting t) 
       (setq web-mode-markup-indent-offset 2))
 
     (add-hook 'web-mode-hook  'my-web-mode-hook))
@@ -1001,6 +1020,14 @@ The following are snippets, functions or other temporary code that I have found
   (setq shr-color-visible-luminance-min 80)
 #+END_SRC
 
+#+BEGIN_SRC emacs-lisp
+  (use-package html-to-hiccup
+    :ensure t
+    :config
+    ;;(define-key clojure-mode-map (kbd "H-h") 'html-to-hiccup-convert-region)
+    )
+#+END_SRC
+
 ;; Experiments
 
 ** Mode line