Trying spacemacs

2017-09-29 16:32:34 +02:00
parent ae3e2e45b6
commit e471aad8d4
3 changed files with 417 additions and 14 deletions
--- a/emacs/.emacs.d/custom.el
+++ b/emacs/.emacs.d/custom.el
@@ -9,11 +9,11 @@
   [unspecified "#101010" "#7c7c7c" "#8e8e8e" "#a0a0a0" "#686868" "#747474" "#686868" "#b9b9b9"])
 '(custom-safe-themes
   (quote
-    ("3380a2766cf0590d50d6366c5a91e976bdc3c413df963a0ab9952314b4577299" "100eeb65d336e3d8f419c0f09170f9fd30f688849c5e60a801a1e6addd8216cb" "3f67aee8f8d8eedad7f547a346803be4cc47c420602e19d88bdcccc66dba033b" "c968804189e0fc963c641f5c9ad64bca431d41af2fb7e1d01a2a6666376f819c" "50d07ab55e2b5322b2a8b13bc15ddf76d7f5985268833762c500a90e2a09e7aa" "4feee83c4fbbe8b827650d0f9af4ba7da903a5d117d849a3ccee88262805f40d" "fee4e306d9070a55dce4d8e9d92d28bd9efe92625d2ba9d4d654fc9cd8113b7f" "6daa09c8c2c68de3ff1b83694115231faa7e650fdbb668bc76275f0f2ce2a437" "1263771faf6967879c3ab8b577c6c31020222ac6d3bac31f331a74275385a452" "ec13410d459f1b67158c500d13d290560fc4dad2edaaa22e33a4d1df08e8f887" "34ed3e2fa4a1cb2ce7400c7f1a6c8f12931d8021435bad841fdc1192bd1cc7da" "8cf1002c7f805360115700144c0031b9cfa4d03edc6a0f38718cef7b7cabe382" "12670281275ea7c1b42d0a548a584e23b9c4e1d2dabb747fd5e2d692bcd0d39b" "21e380db38e92e8c0e56e0a2446f7ac8f6851061b57ffbcadb284ffe4c102478" "91fba9a99f7b64390e1f56319c3dbbaed22de1b9676b3c73d935bf62277b799c" "b1bcb837df0455af8e91114b7a3bddfa084cde32ceb16b1b468d5e5e8605a835" "e24679edfdea016519c0e2d4a5e57157a11f928b7ef4361d00c23a7fe54b8e01" "9f6750057fefba39c184783c7b80ddd9c63bc6e8064846b423b4362c9e930404" "d43120398682953ef18fd7e11e69c94e44d39bb2ab450c4e64815311542acbff" "b4ec581daad15aa7020b722523dc6bcea850bfbdbe31bfeb11c45ea51899bd75" "3a3917dbcc6571ef3942c2bf4c4240f70b5c4bc0b28192be6d3f9acd83607a24" "b6db49cec08652adf1ff2341ce32c7303be313b0de38c621676122f255ee46db" "b6d649c9f972b491686e7fa634535653e6222c1faca1ab71b3117854470a79ae" "0ae52e74c576120c6863403922ee00340a3bf3051615674c4b937f9c99b24535" "b2028956188cf668e27a130c027e7f240c24c705c1517108b98a9645644711d9" "03e3e79fb2b344e41a7df897818b7969ca51a15a67dc0c30ebbdeb9ea2cd4492" "232f715279fc131ed4facf6a517b84d23dca145fcc0e09c5e0f90eb534e1680f" "aed73c6d0afcf2232bb25ed2d872c7a1c4f1bda6759f84afc24de6a1aec93da8" "0b6645497e51d80eda1d337d6cabe31814d6c381e69491931a688836c16137ed" "cdfb22711f64d0e665f40b2607879fcf2607764b2b70d672ddaa26d2da13049f" "196cc00960232cfc7e74f4e95a94a5977cb16fd28ba7282195338f68c84058ec" default)))
+    ("aea30125ef2e48831f46695418677b9d676c3babf43959c8e978c0ad672a7329" "cea3ec09c821b7eaf235882e6555c3ffa2fd23de92459751e18f26ad035d2142" "3380a2766cf0590d50d6366c5a91e976bdc3c413df963a0ab9952314b4577299" "100eeb65d336e3d8f419c0f09170f9fd30f688849c5e60a801a1e6addd8216cb" "3f67aee8f8d8eedad7f547a346803be4cc47c420602e19d88bdcccc66dba033b" "c968804189e0fc963c641f5c9ad64bca431d41af2fb7e1d01a2a6666376f819c" "50d07ab55e2b5322b2a8b13bc15ddf76d7f5985268833762c500a90e2a09e7aa" "4feee83c4fbbe8b827650d0f9af4ba7da903a5d117d849a3ccee88262805f40d" "fee4e306d9070a55dce4d8e9d92d28bd9efe92625d2ba9d4d654fc9cd8113b7f" "6daa09c8c2c68de3ff1b83694115231faa7e650fdbb668bc76275f0f2ce2a437" "1263771faf6967879c3ab8b577c6c31020222ac6d3bac31f331a74275385a452" "ec13410d459f1b67158c500d13d290560fc4dad2edaaa22e33a4d1df08e8f887" "34ed3e2fa4a1cb2ce7400c7f1a6c8f12931d8021435bad841fdc1192bd1cc7da" "8cf1002c7f805360115700144c0031b9cfa4d03edc6a0f38718cef7b7cabe382" "12670281275ea7c1b42d0a548a584e23b9c4e1d2dabb747fd5e2d692bcd0d39b" "21e380db38e92e8c0e56e0a2446f7ac8f6851061b57ffbcadb284ffe4c102478" "91fba9a99f7b64390e1f56319c3dbbaed22de1b9676b3c73d935bf62277b799c" "b1bcb837df0455af8e91114b7a3bddfa084cde32ceb16b1b468d5e5e8605a835" "e24679edfdea016519c0e2d4a5e57157a11f928b7ef4361d00c23a7fe54b8e01" "9f6750057fefba39c184783c7b80ddd9c63bc6e8064846b423b4362c9e930404" "d43120398682953ef18fd7e11e69c94e44d39bb2ab450c4e64815311542acbff" "b4ec581daad15aa7020b722523dc6bcea850bfbdbe31bfeb11c45ea51899bd75" "3a3917dbcc6571ef3942c2bf4c4240f70b5c4bc0b28192be6d3f9acd83607a24" "b6db49cec08652adf1ff2341ce32c7303be313b0de38c621676122f255ee46db" "b6d649c9f972b491686e7fa634535653e6222c1faca1ab71b3117854470a79ae" "0ae52e74c576120c6863403922ee00340a3bf3051615674c4b937f9c99b24535" "b2028956188cf668e27a130c027e7f240c24c705c1517108b98a9645644711d9" "03e3e79fb2b344e41a7df897818b7969ca51a15a67dc0c30ebbdeb9ea2cd4492" "232f715279fc131ed4facf6a517b84d23dca145fcc0e09c5e0f90eb534e1680f" "aed73c6d0afcf2232bb25ed2d872c7a1c4f1bda6759f84afc24de6a1aec93da8" "0b6645497e51d80eda1d337d6cabe31814d6c381e69491931a688836c16137ed" "cdfb22711f64d0e665f40b2607879fcf2607764b2b70d672ddaa26d2da13049f" "196cc00960232cfc7e74f4e95a94a5977cb16fd28ba7282195338f68c84058ec" default)))
 '(global-hl-line-mode t)
 '(package-selected-packages
   (quote
-    (github-theme base16-theme hlinum glab neotree evil-magit docker password-store gitlab flycheck-cask ensime scala-mode yasnippet yaml-mode slime quelpa-use-package ob-ipython nose n3-mode monokai-theme markdown-mode magit jedi helm-swoop helm-projectile helm-descbinds helm-ag guide-key go-mode go-autocomplete gist flymake-go flycheck exec-path-from-shell evil-surround evil-smartparens evil-paredit evil-org evil-nerd-commenter evil-mu4e evil-matchit evil-leader evil-jumper ein clojure-mode auctex ace-jump-mode)))
+    (yafolding origami-mode highlight-indent-guides indent-guide go-dlv quelpa avy avy-mode github-theme base16-theme hlinum glab neotree evil-magit docker password-store gitlab flycheck-cask ensime scala-mode yasnippet yaml-mode slime quelpa-use-package ob-ipython nose n3-mode monokai-theme markdown-mode magit jedi helm-swoop helm-projectile helm-descbinds helm-ag guide-key go-mode go-autocomplete gist flymake-go flycheck exec-path-from-shell evil-surround evil-smartparens evil-paredit evil-org evil-nerd-commenter evil-mu4e evil-matchit evil-leader evil-jumper ein clojure-mode auctex ace-jump-mode)))
 '(safe-local-variable-values (quote ((TeX-command-extra-options . "-shell-escape")))))
 (custom-set-faces
 ;; custom-set-faces was added by Custom.
--- a/emacs/.emacs.d/init.el
+++ b/emacs/.emacs.d/init.el
@@ -11,10 +11,12 @@
 (add-to-list 'package-archives '("melpa-stable" . "http://stable.melpa.org/packages/") t)
 (add-to-list 'package-archives '("org" . "http://orgmode.org/elpa/") t)

+(setq quelpa-checkout-melpa-p nil)
+
 (unless (require 'quelpa nil t)
  (with-temp-buffer
    (url-insert-file-contents "https://raw.github.com/quelpa/quelpa/master/bootstrap.el")
-    (eval-buffer)))
+	    (eval-buffer)))

 (quelpa 'use-package)
                                        ;'(use-package
@@ -27,6 +29,8 @@
   :repo "quelpa/quelpa-use-package"))
 (require 'quelpa-use-package)

+(eval-when-compile (require 'cl))
+
 (use-package evil
  :ensure
  :init (progn
@@ -45,12 +49,7 @@
                        )
              )
            (use-package evil-surround :ensure)
-            (use-package ace-jump-mode :ensure
-              :config (progn
-                        (eval-after-load "ace-jump-mode"
-                          '(ace-jump-mode-enable-mark-sync))
-                        (define-key global-map (kbd "C-x SPC") 'ace-jump-mode-pop-mark)
-                        ))
+            (use-package avy :ensure)

            ;; Evil global modes config
            (evilnc-default-hotkeys)
@@ -129,8 +128,8 @@ or the current buffer directory."
            (define-key evil-normal-state-map (kbd "]q") 'next-error)
            (define-key evil-normal-state-map (kbd "[b") 'previous-code-buffer)
            (define-key evil-normal-state-map (kbd "]b") 'next-code-buffer)
-            (define-key evil-normal-state-map (kbd "s") 'evil-ace-jump-char-mode)
-            (define-key evil-normal-state-map (kbd "S") 'evil-ace-jump-word-mode)
+            (define-key evil-normal-state-map (kbd "s") 'avy-goto-char-timer)
+            (define-key evil-normal-state-map (kbd "S") 'avy-goto-word-0)
            (define-key evil-normal-state-map (kbd ",d") 'neotree-project-dir-toggle)
            (define-key evil-normal-state-map (kbd ",u") 'undo-tree-visualize)

@@ -191,6 +190,13 @@ or the current buffer directory."
                  (helm-projectile)
                (helm-for-files)))

+            (defun smart-for-buffers ()
+              "Call `helm-projectile' if `projectile-project-p', otherwise fallback to `helm-for-files'."
+              (interactive)
+              (if (projectile-project-p)
+                  (helm-projectile-switch-to-buffer)
+                (switch-to-buffer)))
+
        ;;; Save current position to mark ring
            (add-hook 'helm-goto-line-before-hook 'helm-save-current-pos-to-mark-ring)

@@ -230,6 +236,7 @@ or the current buffer directory."
        ;;; Evil helm
            ;; (define-key evil-normal-state-map (kbd "C-p") 'helm-mini)
            (evil-leader/set-key "p" 'smart-for-files)
+            (evil-leader/set-key "b" 'smart-for-buffers)
            (evil-leader/set-key "<SPC>" 'helm-M-x)
            (define-key evil-normal-state-map (kbd ",s") 'helm-swoop)
            (define-key evil-normal-state-map (kbd ",a") 'helm-ag)
@@ -361,6 +368,8 @@ or the current buffer directory."
                      (ac-config-default)
                      )
            )
+          (use-package go-dlv :ensure
+	    )
          (defun my-go-mode-hook ()
                                        ; Use goimports instead of go-fmt
            ;; You need to do: go get golang.org/x/tools/cmd/goimports
@@ -680,13 +689,13 @@ or the current buffer directory."

 (defun set-hl-line-color-based-on-theme ()
 "Set the hl-line face to have no foregorund and a background that is 10% darker than the default face's background."
-(let ((background-color (color-darken-name (face-background 'default) 20)))
+(let ((background-color (color-lighten-name (face-background 'default) 10)))
  (set-face-attribute 'hl-line nil
                      :foreground nil
                      :background background-color)
  (set-face-attribute 'linum-highlight-face nil
-                      :foreground nil
-                      :background background-color)))
+                      :background (face-foreground 'default)
+                      :foreground (face-background 'default))))

 (add-hook 'global-hl-line-mode-hook 'set-hl-line-color-based-on-theme)
                                        ;; (set-face-background 'hl-line 'highlight-color)
@@ -758,7 +767,13 @@ or the current buffer directory."
  )

 (use-package docker
+  :ensure
  :config (progn
+            (use-package docker-tramp
+              :ensure
+              :config (progn
+                        )
+              )
            )
  )

@@ -769,6 +784,29 @@ or the current buffer directory."
            )
  )

+(use-package highlight-indent-guides 
+  :ensure
+  :config (progn
+            (setq highlight-indent-guides-method 'character)
+            (add-hook 'prog-mode-hook 'highlight-indent-guides-mode)
+            )
+  )
+
+
+(add-hook 'prog-mode-hook 'hs-minor-mode)
+;;
+;; LATEX
+;;
+
+(add-hook 'LaTeX-mode-hook (lambda ()
+  (push
+    '("latexmk" "latexmk -pdf %s" TeX-run-TeX nil t
+      :help "Run latexmk on file")
+    TeX-command-list)))
+(add-hook 'TeX-mode-hook '(lambda () (setq TeX-command-default "latexmk")))
+
+;; ENDLATEX
+
 (setq PREVSHELL (getenv "SHELL")) ;; Workaround for tramp
 (eval-after-load 'tramp '(setenv "SHELL" "/bin/bash"))
 (setq tramp-default-method "ssh")