Compare commits

..

No commits in common. "4bcc4d212ab1cbed6d773b68d3fcc9568a35cb6f" and "c6ddd95404ffb8950ed4810a819f20530f4d1124" have entirely different histories.

22
init.el
View file

@ -57,23 +57,19 @@
:width 'normal) :width 'normal)
;; evil config ;; evil config
(setq evil-want-keybinding nil)
(use-package evil :ensure t (use-package evil :ensure t
:init
(setq evil-want-integration t)
(setq evil-want-keybinding nil)
:config :config
(evil-mode 1) (evil-mode 1)
(global-undo-tree-mode) (global-undo-tree-mode)
(evil-set-undo-system 'undo-tree) (evil-set-undo-system 'undo-tree)
(global-display-line-numbers-mode)) (global-display-line-numbers-mode))
(use-package evil-collection :ensure t (use-package evil-collection
:after evil :ensure t
:config :config
(evil-collection-init) (evil-collection-init))
:custom (use-package evil-surround
(evil-collection-setup-minibuffer t)) :ensure t
(use-package evil-surround :ensure t
:after evil
:config :config
(global-evil-surround-mode 1) (global-evil-surround-mode 1)
(evil-define-key 'visual evil-surround-mode-map "s" 'evil-surround-region)) (evil-define-key 'visual evil-surround-mode-map "s" 'evil-surround-region))
@ -91,11 +87,11 @@
(setq ivy-re-builders-alist (setq ivy-re-builders-alist
'((swiper . ivy--regex-plus) '((swiper . ivy--regex-plus)
(t . ivy--regex-plus))) (t . ivy--regex-plus)))
(define-key ivy-minibuffer-map (kbd "C-h") (kbd "DEL"))
(define-key ivy-minibuffer-map (kbd "C-j") 'ivy-next-line) (define-key ivy-minibuffer-map (kbd "C-j") 'ivy-next-line)
(define-key ivy-minibuffer-map (kbd "C-k") 'ivy-previous-line) (define-key ivy-minibuffer-map (kbd "C-k") 'ivy-previous-line)
(define-key ivy-minibuffer-map (kbd "C-l") 'ivy-alt-done) (define-key ivy-minibuffer-map (kbd "C-h") (kbd "DEL"))
(define-key ivy-minibuffer-map (kbd "C-S-h") help-map) (define-key ivy-minibuffer-map (kbd "C-S-h") help-map)
(define-key ivy-minibuffer-map (kbd "C-l") 'ivy-alt-done)
(define-key ivy-minibuffer-map (kbd "<escape>") 'minibuffer-keyboard-quit)) (define-key ivy-minibuffer-map (kbd "<escape>") 'minibuffer-keyboard-quit))
(use-package ivy-xref :ensure t (use-package ivy-xref :ensure t
:init (setq xref-show-xrefs-function #'ivy-xref-show-xrefs)) :init (setq xref-show-xrefs-function #'ivy-xref-show-xrefs))