From b871fb9091f2c9445f5195dc32eef883296406f9 Mon Sep 17 00:00:00 2001 From: Marc Pohling Date: Sat, 1 Sep 2018 09:17:16 +0200 Subject: [PATCH] many changes, don't ask. --- config.org | 111 ++++++++++++++++++++++------------------ user-global/abbrev_defs | 60 +++++++++++++++++++--- 2 files changed, 115 insertions(+), 56 deletions(-) diff --git a/config.org b/config.org index 26ac075..6f67643 100644 --- a/config.org +++ b/config.org @@ -575,6 +575,8 @@ A file manager comparable to neotree. [[https://github.com/Alexander-Miller/treemacs][Github]] + 2018-09-01: Treemacs needs emacs 25.2, debian stretch runs 25.1. Sucks. + It has some requirements, which gets used here anyway: - ace-window - hydra @@ -585,7 +587,7 @@ No idea what this executable-find is about. TODO check it out! -#+BEGIN_SRC emacs-lisp +BEGIN_SRC emacs-lisp (use-package treemacs :ensure t :defer t @@ -621,18 +623,18 @@ (:map global-map ([f8] . treemacs)) ) -#+END_SRC +END_SRC Treemacs-Evil is necessary when using evil -#+BEGIN_SRC emacs-lisp +BEGIN_SRC emacs-lisp (use-package treemacs-evil :after treemacs evil :ensure t) -#+END_SRC +END_SRC Treemacs-projectile is useful for uhh.. TODO explain! -#+BEGIN_SRC emacs-lisp +BEGIN_SRC emacs-lisp (use-package treemacs-projectile :ensure t :after treemacs projectile @@ -640,7 +642,7 @@ :config (setq treemacs-header-function #'treemacs-projectile-create-header) ) -#+END_SRC +END_SRC TODO Hydrastuff or keybindings for functions: @@ -721,6 +723,41 @@ (save-place-mode)) #+END_SRC +* Company Mode +Complete Anything! + +Activate company and make it react nearly instantly + +#+BEGIN_SRC emacs-lisp + (use-package company + :ensure t + :config + (setq-default company-minimum-prefix-length 1 + company-tooltip-align-annotation t + company-tooltop-flip-when-above t + company-show-numbers t + company-idle-delay 0.1) +; (define-key company-active-map (kbd "RET") nil) + (company-tng-configure-default) + :bind + (:map company-active-map + ("TAB" . company-complete-selection) + ("" . company-complete-selection)) + ) +#+END_SRC + +For a nicer suggestion box: company-box ([[https://github.com/sebastiencs/company-box][Source]]) +It is only available for emacs 26 and higher. + +#+BEGIN_SRC emacs-lisp +(when (> emacs-major-version 25) + (use-package company-box + :ensure t + :init + (add-hook 'company-mode-hook 'company-box-mode))) +#+END_SRC + + * Org Mode ** Installation Although org mode ships with Emacs, the latest version can be installed externally. The configuration here follows the [[http://orgmode.org/elpa.html][Org mode ELPA Installation instructions.]] @@ -728,8 +765,8 @@ #+BEGIN_SRC emacs-lisp -(use-package org-plus-contrib - :ensure t +(use-package org + :ensure org-plus-contrib :init (add-hook 'org-mode-hook 'company/org-mode-hook) ) @@ -959,6 +996,8 @@ END_SRC :ensure t :init (add-hook 'ess-mode-hook 'company/ess-mode-hook) + :config + (setq ess-fancy-comments nil) ; don't indent comments! ) (add-hook 'org-babel-after-execute-hook 'org-display-inline-images) (add-hook 'org-mode-hook 'org-display-inline-images) @@ -1264,41 +1303,7 @@ _l_: last hunk set start _R_evision ) #+END_SRC -** Company Mode -Complete Anything! - -Activate company and make it react nearly instantly - -#+BEGIN_SRC emacs-lisp - (use-package company - :ensure t - :config - (setq-default company-minimum-prefix-length 1 - company-tooltip-align-annotation t - company-tooltop-flip-when-above t - company-show-numbers t - company-idle-delay 0.1) -; (define-key company-active-map (kbd "RET") nil) - (company-tng-configure-default) - :bind - (:map company-active-map - ("TAB" . company-complete-selection) - ("" . company-complete-selection)) - ) -#+END_SRC - -For a nicer suggestion box: company-box ([[https://github.com/sebastiencs/company-box][Source]]) -It is only available for emacs 26 and higher. - -#+BEGIN_SRC emacs-lisp -(when (> emacs-major-version 25) - (use-package company-box - :ensure t - :init - (add-hook 'company-mode-hook 'company-box-mode))) -#+END_SRC - -*** Company backend hooks +** Company backend hooks Backend configuration for python-mode @@ -1341,6 +1346,7 @@ It is only available for emacs 26 and higher. (message "company/ess-mode-hook activated") ; (set (make-local-variable 'company-backends) ; '((company-ess-backend company-R-args company-R-objects))) + (ess-indent-with-fancy-comments nil) (company-mode t)) #+END_SRC @@ -1381,7 +1387,7 @@ Backend configuration for beancount ) #+END_SRC -*** Misc Company packages +** Misc Company packages Addon to sort suggestions by usage @@ -1495,22 +1501,28 @@ Add some helpers to handle and understand macros #+BEGIN_SRC emacs-lisp (pcase my/whoami ("home" - (use-package ess-site + (use-package ess-r-mode ;ess-site lädt alle Sprachen (Julia, Stata, S, S+, SAS, BUGS/JAGS :ensure ess +; :load-path "/usr/share/emacs/site-lisp/ess/" +; :load-path "/home/marc/.emacs.d/elpa/ess-20180825.900/" :defer t - :mode (("\\.R\\'" . r-mode)) - :init (require 'ess-site) + :mode (("\\.R$" . R-mode) + ("\\.r$" . R-mode)) +; :init (require 'ess-site) + :commands + (R-mode) :config (use-package ess-R-data-view :ensure t) - (use-package ess-smart-equals :ensure t) +; (use-package ess-smart-equals :ensure t) ; requires julia-mode (use-package ess-smart-underscore :ensure t) - (use-package ess-view :ensure t) +; (use-package ess-view :ensure t) ; requires julia-mode (setq ess-use-flymake nil ess-use-ido nil ;;else ESS will use ido whenever possible ess-eval-visibly 'nowait ess-ask-for-ess-directory nil ess-local-process-name "R" ess-use-tracebug t + ess-indent-with-fancy-comments nil ; otherwise ess indents comments sometimes ess-describe-at-point-method 'tooltip))) ; 'tooltip or nil (buffer) ) #+END_SRC @@ -1664,6 +1676,7 @@ Add some helpers to handle and understand macros #+BEGIN_SRC emacs-lisp (use-package highlight-indentation + :ensure t :init (add-hook 'python-mode-hook 'highlight-indentation-current-column-mode) (add-hook 'python-mode-hook 'highlight-indentation-mode) diff --git a/user-global/abbrev_defs b/user-global/abbrev_defs index d298300..d7f1165 100644 --- a/user-global/abbrev_defs +++ b/user-global/abbrev_defs @@ -37,7 +37,9 @@ ("`va" "\\value" nil 0) )) -(define-abbrev-table 'beancount-mode-abbrev-table '()) +(define-abbrev-table 'awk-mode-abbrev-table + '( + )) (define-abbrev-table 'bibtex-mode-abbrev-table '()) @@ -45,6 +47,16 @@ (define-abbrev-table 'bookmark-edit-annotation-mode-abbrev-table '()) +(define-abbrev-table 'c++-mode-abbrev-table + '( + )) + +(define-abbrev-table 'c-mode-abbrev-table + '( + )) + +(define-abbrev-table 'calc-trail-mode-abbrev-table '()) + (define-abbrev-table 'calendar-mode-abbrev-table '()) (define-abbrev-table 'comint-mode-abbrev-table '()) @@ -53,24 +65,34 @@ (define-abbrev-table 'diff-mode-abbrev-table '()) +(define-abbrev-table 'dig-mode-abbrev-table '()) + +(define-abbrev-table 'edebug-eval-mode-abbrev-table '()) + (define-abbrev-table 'edit-abbrevs-mode-abbrev-table '()) (define-abbrev-table 'elisp-byte-code-mode-abbrev-table '()) (define-abbrev-table 'emacs-lisp-mode-abbrev-table '()) +(define-abbrev-table 'eshell-mode-abbrev-table '()) + (define-abbrev-table 'evil-command-window-mode-abbrev-table '()) (define-abbrev-table 'evil-list-view-mode-abbrev-table '()) -(define-abbrev-table 'flycheck-error-list-mode-abbrev-table '()) - (define-abbrev-table 'fundamental-mode-abbrev-table '()) (define-abbrev-table 'global-abbrev-table '()) +(define-abbrev-table 'gnus-article-edit-mode-abbrev-table '()) + +(define-abbrev-table 'gnus-article-mode-abbrev-table '()) + (define-abbrev-table 'gnus-group-mode-abbrev-table '()) +(define-abbrev-table 'gnus-sticky-article-mode-abbrev-table '()) + (define-abbrev-table 'grep-mode-abbrev-table '()) (define-abbrev-table 'helm-grep-mode-abbrev-table '()) @@ -83,27 +105,45 @@ (define-abbrev-table 'ibuffer-mode-abbrev-table '()) +(define-abbrev-table 'idl-mode-abbrev-table '()) + +(define-abbrev-table 'image-dired-display-image-mode-abbrev-table '()) + +(define-abbrev-table 'image-dired-thumbnail-mode-abbrev-table '()) + (define-abbrev-table 'ivy-occur-grep-mode-abbrev-table '()) (define-abbrev-table 'ivy-occur-mode-abbrev-table '()) +(define-abbrev-table 'java-mode-abbrev-table + '( + )) + (define-abbrev-table 'lisp-mode-abbrev-table '()) (define-abbrev-table 'message-mode-abbrev-table '()) (define-abbrev-table 'messages-buffer-mode-abbrev-table '()) +(define-abbrev-table 'objc-mode-abbrev-table + '( + )) + (define-abbrev-table 'occur-edit-mode-abbrev-table '()) (define-abbrev-table 'occur-mode-abbrev-table '()) +(define-abbrev-table 'org-export-stack-mode-abbrev-table '()) + (define-abbrev-table 'org-mode-abbrev-table '()) (define-abbrev-table 'outline-mode-abbrev-table '()) (define-abbrev-table 'package-menu-mode-abbrev-table '()) -(define-abbrev-table 'pandoc-@-mode-abbrev-table '()) +(define-abbrev-table 'pike-mode-abbrev-table + '( + )) (define-abbrev-table 'process-menu-mode-abbrev-table '()) @@ -111,18 +151,24 @@ (define-abbrev-table 'shell-mode-abbrev-table '()) -(define-abbrev-table 'snippet-mode-abbrev-table '()) +(define-abbrev-table 'smime-mode-abbrev-table '()) (define-abbrev-table 'special-mode-abbrev-table '()) +(define-abbrev-table 'speedbar-mode-abbrev-table '()) + (define-abbrev-table 'tabulated-list-mode-abbrev-table '()) -(define-abbrev-table 'text-mode-abbrev-table '()) +(define-abbrev-table 'tar-mode-abbrev-table '()) + +(define-abbrev-table 'term-mode-abbrev-table '()) -(define-abbrev-table 'treemacs-mode-abbrev-table '()) +(define-abbrev-table 'text-mode-abbrev-table '()) (define-abbrev-table 'url-cookie-mode-abbrev-table '()) +(define-abbrev-table 'use-package-statistics-mode-abbrev-table '()) + (define-abbrev-table 'vc-git-log-edit-mode-abbrev-table '()) (define-abbrev-table 'vc-git-log-view-mode-abbrev-table '())