madmaurice/configfiles
1
1
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge branch 'master' of https://git.zom.bi/madmaurice/configfiles

Browse source
This commit is contained in:
Valentin Gehrke 2017-10-06 08:37:24 +02:00
commit 9951eaf188
1 changed files with 20 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
emacs/.emacs
View file

@ -57,7 +57,7 @@
'(menu-bar-mode nil) '(menu-bar-mode nil)
'(package-selected-packages '(package-selected-packages
(quote (quote
(powerline-evil powerline origami projectile terminal-here shell-pop swiper neotree centered-cursor-mode ivy avy heroku-theme auto-complete use-package yasnippet evil-surround org evil-magit magit makefile-runner evil))) (counsel powerline-evil powerline origami projectile terminal-here shell-pop swiper neotree centered-cursor-mode ivy avy heroku-theme auto-complete use-package yasnippet evil-surround org evil-magit magit makefile-runner evil)))
'(scroll-bar-mode nil) '(scroll-bar-mode nil)
'(shell-pop-shell-type '(shell-pop-shell-type
(quote (quote
@ -66,10 +66,8 @@
(ansi-term shell-pop-term-shell))))) (ansi-term shell-pop-term-shell)))))
'(shell-pop-window-position "top") '(shell-pop-window-position "top")
'(shell-pop-window-size 20) '(shell-pop-window-size 20)
'(tool-bar-mode nil) '(show-trailing-whitespace t)
'(dired-listing-switches "-lh") '(tool-bar-mode nil))
'(ac-ignore-case nil)
'(show-trailing-whitespace t))
(custom-set-faces (custom-set-faces
;; custom-set-faces was added by Custom. ;; custom-set-faces was added by Custom.
;; If you edit it by hand, you could mess it up, so be careful. ;; If you edit it by hand, you could mess it up, so be careful.
@ -145,6 +143,14 @@
:ensure t) :ensure t)
;; Evil-mode ;; Evil-mode
(defun my/evil-go-back ()
(interactive)
(evil--jump-backward 1))
(defun my/evil-go-forward ()
(interactive)
(evil--jump-forward 1))
(use-package evil (use-package evil
:ensure t :ensure t
:demand t :demand t
@ -153,6 +159,8 @@
(setq evil-ex-substitute-global t) (setq evil-ex-substitute-global t)
(define-key evil-normal-state-map "/" 'swiper) (define-key evil-normal-state-map "/" 'swiper)
(evil-ex-define-cmd "q" 'kill-buffer) (evil-ex-define-cmd "q" 'kill-buffer)
(define-key evil-normal-state-map "gb" 'my/evil-go-back)
(define-key evil-normal-state-map "gn" 'my/evil-go-forward)
(define-key evil-motion-state-map [down-mouse-1] 'silence) (define-key evil-motion-state-map [down-mouse-1] 'silence)
(define-key evil-motion-state-map [mouse-1] 'silence) (define-key evil-motion-state-map [mouse-1] 'silence)
(setq-default evil-cross-lines t)) (setq-default evil-cross-lines t))
@ -190,6 +198,10 @@
(global-origami-mode))) (global-origami-mode)))
;; ivy ;; ivy
(defun my/save-imenu-jump (item)
"WIP: Tells evil-jump to save position before jumping via imenu (or counsel-imenu)"
(evil--jumps-push))
(use-package ivy (use-package ivy
:ensure t :ensure t
:demand t :demand t
@ -197,6 +209,7 @@
(ivy-mode 1) (ivy-mode 1)
(setq ivy-use-virtual-buffers t) (setq ivy-use-virtual-buffers t)
(setq ivy-count-format "(%d/%d) ") (setq ivy-count-format "(%d/%d) ")
(advice-add 'imenu :before 'my/save-imenu-jump)
(define-key ivy-minibuffer-map (kbd "<C-return>") 'ivy-immediate-done))) (define-key ivy-minibuffer-map (kbd "<C-return>") 'ivy-immediate-done)))
(use-package counsel (use-package counsel
@ -385,6 +398,8 @@
'("*Apropos*" display-buffer-same-window)) '("*Apropos*" display-buffer-same-window))
(add-to-list 'display-buffer-alist (add-to-list 'display-buffer-alist
'("*Help*" display-buffer-in-side-window)) '("*Help*" display-buffer-in-side-window))
(add-to-list 'display-buffer-alist
'("*evil-jumps*" display-buffer-in-side-window))
(add-to-list 'display-buffer-alist (add-to-list 'display-buffer-alist
'("*compilation*" (display-buffer-reuse-window display-buffer-in-side-window) (side . bottom) (size . 0.2))) '("*compilation*" (display-buffer-reuse-window display-buffer-in-side-window) (side . bottom) (size . 0.2)))