ndwarshuis
/
emacs-config
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

keybindings and ess cleanup

This commit is contained in:
petrucci4prez 2018-07-18 12:06:51 -04:00
parent 58d528e39b
commit 680a9e3f31
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
conf.org
View File

@ -325,6 +325,7 @@ event of an error or nonlocal exit."
(add-hook 'emacs-lisp-mode-hook 'company-mode) (add-hook 'emacs-lisp-mode-hook 'company-mode)
#+END_SRC #+END_SRC
** ess ** ess
NOTE: ess is not considered part of prog-mode for some reason
#+begin_src emacs-lisp #+begin_src emacs-lisp
(defun nd/init-ess-company () (defun nd/init-ess-company ()
"Set the company modes for ess modes." "Set the company modes for ess modes."
@ -335,10 +336,12 @@ event of an error or nonlocal exit."
:init :init
(load "ess-site") (load "ess-site")
:hook :hook
((ess-mode . company-mode) ((ess-mode . flycheck-mode)
(ess-mode . company-mode)
(ess-mode . nd/init-ess-company) (ess-mode . nd/init-ess-company)
(ess-mode . prettify-symbols-mode) (ess-mode . prettify-symbols-mode)
(inferior-ess-mode . flycheck-mode)
(inferior-ess-mode . company-mode) (inferior-ess-mode . company-mode)
(inferior-ess-mode . nd/init-ess-company) (inferior-ess-mode . nd/init-ess-company)
(inferior-ess-mode . prettify-symbols-mode)) (inferior-ess-mode . prettify-symbols-mode))
@ -1640,7 +1643,7 @@ I like being evil. All package and custom bindings go here.
:ensure t :ensure t
:after evil :after evil
:init :init
(setq evil-collection-modes-list '(which-key helm minibuffer mu4e ediff)) (setq evil-collection-modes-list '(company which-key helm minibuffer mu4e ediff))
:custom :custom
(evil-collection-setup-minibuffer t) (evil-collection-setup-minibuffer t)
:config :config
@ -1658,6 +1661,11 @@ I like being evil. All package and custom bindings go here.
(lambda () (lambda ()
(local-set-key (kbd "C-c C-c") 'org-agenda-set-tags))) (local-set-key (kbd "C-c C-c") 'org-agenda-set-tags)))
#+END_SRC #+END_SRC
*** helm
#+BEGIN_SRC emacs-lisp
(define-key helm-map (kbd "<tab>") 'helm-execute-persistent-action)
(define-key helm-map (kbd "C-<tab>") 'helm-select-action)
#+END_SRC
** global ** global
#+BEGIN_SRC emacs-lisp #+BEGIN_SRC emacs-lisp
(global-set-key (kbd "<f1>") 'org-agenda) (global-set-key (kbd "<f1>") 'org-agenda)
@ -1673,6 +1681,7 @@ I like being evil. All package and custom bindings go here.
(global-set-key (kbd "C-x 2") 'nd/split-and-follow-horizontally) (global-set-key (kbd "C-x 2") 'nd/split-and-follow-horizontally)
(global-set-key (kbd "C-x 3") 'nd/split-and-follow-vertically) (global-set-key (kbd "C-x 3") 'nd/split-and-follow-vertically)
(global-unset-key (kbd "C-x c"))
(global-set-key (kbd "C-x k") 'nd/kill-current-buffer) (global-set-key (kbd "C-x k") 'nd/kill-current-buffer)
(global-set-key (kbd "C-x C-f") 'helm-find-files) (global-set-key (kbd "C-x C-f") 'helm-find-files)
(global-set-key (kbd "C-x C-b") 'helm-buffers-list) (global-set-key (kbd "C-x C-b") 'helm-buffers-list)