From 4fa321479e32f8c27a320edc1e0001bd2680c496 Mon Sep 17 00:00:00 2001 From: Marc Pohling Date: Thu, 19 Dec 2019 11:34:15 +0100 Subject: [PATCH] temporary added file paths for org stuff --- init.org | 230 ++++++++++++++++++++++++++++--------------------------- 1 file changed, 116 insertions(+), 114 deletions(-) diff --git a/init.org b/init.org index 2662525..65b39b8 100644 --- a/init.org +++ b/init.org @@ -1,4 +1,4 @@ -#+TITLE: Emacs configuration file +#+TITLE: Emacs configuration file #+AUTHOR: Marc #+BABEL: :cache yes #+PROPERTY: header-args :tangle yes @@ -115,6 +115,8 @@ ("work_remote" (progn (defvar MY--PATH_ORG_FILES "p:/Eigene Dateien/Notizen/") + (defvar MY--PATH_ORG_FILES_MOBILE "p:/Eigene Dateien/Notizen/") + (defvar MY--PATH_ORG_JOURNAL "p:/Eigene Dateien/Notizen/") (defvar MY--PATH_START "p:/Eigene Dateien/Notizen/")))) (setq bookmark-default-file (concat MY--PATH_USER_LOCAL "bookmarks")) @@ -298,6 +300,115 @@ Some windows specific stuff "d" '(imenu-list-display-entry :which-key "show") "q" '(imenu-list-quit-window :which-key "quit")) #+END_SRC +* ivy / counsel / swiper + :PROPERTIES: + :ID: c2146a70-03f4-4f60-9bce-094eec28cefe + :END: + +#+BEGIN_SRC emacs-lisp +; (require 'ivy) + (use-package ivy + :ensure t + :diminish + (ivy-mode . "") + :init + (ivy-mode 1) + :bind + ("C-r" . ivy-resume) ;; overrides isearch-backwards binding + :config + (setq ivy-use-virtual-buffers t ;; recent files and bookmarks in ivy-switch-buffer + ivy-height 20 ;; height of ivy window + ivy-count-format "%d/%d" ;; current and total number + ivy-re-builders-alist ;; regex replaces spaces with * + '((t . ivy--regex-plus)))) + + (use-package counsel + :ensure t + :bind* + (("M-x" . counsel-M-x) + ("C-x C-f" . counsel-find-file) + ("C-x C-r" . counsel-recentf) + ("C-c C-f" . counsel-git) + ("C-c h f" . counsel-describe-function) + ("C-c h v" . counsel-describe-variable) + ("M-i" . counsel-imenu))) + + (use-package swiper + :ensure t + :bind + ("C-s" . swiper)) + +(use-package ivy-hydra +:ensure t) +#+END_SRC + +* company + :PROPERTIES: + :ID: 1630ac5e-7467-458c-940c-4f724e283813 + :END: + +#+BEGIN_SRC emacs-lisp +; (require 'company) + (use-package company + :defer 1 + :bind + (:map company-active-map + ("RET" . nil) + ([return] . nil) + ("TAB" . company-complete-selection) + ([tab] . company-complete-selection) + ("" . company-complete-common)) + :config + (global-company-mode 1) + (setq-default + company-idle-delay .2 + company-minimum-prefix-length 1 + company-require-match nil + company-show-numbers t + company-tooltip-align-annotations t)) + +; (require 'company-statistics) + (use-package company-statistics + :ensure t + :after company + :init + (setq company-statistics-file (concat MY--PATH_USER_LOCAL "company-statistics-cache.el"));~/.emacs.d/user-dir/company-statistics-cache.el") + :config + (company-statistics-mode 1)) + + (use-package company-dabbrev + :ensure nil + :after company + :config + (setq-default company-dabbrev-downcase nil)) + + (use-package company-box + :ensure t + :init + (add-hook 'company-mode-hook 'company-box-mode)) +#+END_SRC + +** company backends + :PROPERTIES: + :ID: 6ac59f9d-54e3-422d-883f-128fb172468d + :END: + +#+BEGIN_SRC emacs-lisp + (defun company/org-mode-hook() + (set (make-local-variable 'company-backends) + '(company-capf company-files)) + (add-hook 'completion-at-point-functions 'pcomplete-completions-at-point nil t) + (message "company/org-mode-hook")) + + (defun company/elisp-mode-hook() + (set (make-local-variable 'company-backends) + '((company-elisp company-dabbrev) company-capf company-files)) + (message "company/elisp-mode-hook")) + + (defun company/beancount-mode-hook() + (set (make-local-variable 'company-backends) + '(company-beancount))) +#+END_SRC * orgmode ** org :PROPERTIES: @@ -379,10 +490,10 @@ Some windows specific stuff :ID: 017ef411-8239-4bfe-bbef-66b98a2971a9 :END: #+BEGIN_SRC emacs-lisp - (use-package org-id - :config - (setq org-id-link-to-org-use-id t) - (org-id-update-id-locations)) ;; update id file .org-id-locations on startup +;; (use-package org-id +;; :config +;; (setq org-id-link-to-org-use-id t) +;; (org-id-update-id-locations)) ;; update id file .org-id-locations on startup #+END_SRC ** org-agenda @@ -474,115 +585,6 @@ Vorerst deaktiviert, Nutzen evtl. nicht vorhanden (setq org-journal-dir MY--PATH_ORG_JOURNAL org-journal-enable-agenda-integration t))) #+END_SRC -* ivy / counsel / swiper - :PROPERTIES: - :ID: c2146a70-03f4-4f60-9bce-094eec28cefe - :END: - -#+BEGIN_SRC emacs-lisp -; (require 'ivy) - (use-package ivy - :ensure t - :diminish - (ivy-mode . "") - :init - (ivy-mode 1) - :bind - ("C-r" . ivy-resume) ;; overrides isearch-backwards binding - :config - (setq ivy-use-virtual-buffers t ;; recent files and bookmarks in ivy-switch-buffer - ivy-height 20 ;; height of ivy window - ivy-count-format "%d/%d" ;; current and total number - ivy-re-builders-alist ;; regex replaces spaces with * - '((t . ivy--regex-plus)))) - - (use-package counsel - :ensure t - :bind* - (("M-x" . counsel-M-x) - ("C-x C-f" . counsel-find-file) - ("C-x C-r" . counsel-recentf) - ("C-c C-f" . counsel-git) - ("C-c h f" . counsel-describe-function) - ("C-c h v" . counsel-describe-variable) - ("M-i" . counsel-imenu))) - - (use-package swiper - :ensure t - :bind - ("C-s" . swiper)) - -(use-package ivy-hydra -:ensure t) -#+END_SRC - -* company - :PROPERTIES: - :ID: 1630ac5e-7467-458c-940c-4f724e283813 - :END: - -#+BEGIN_SRC emacs-lisp -; (require 'company) - (use-package company - :defer 1 - :bind - (:map company-active-map - ("RET" . nil) - ([return] . nil) - ("TAB" . company-complete-selection) - ([tab] . company-complete-selection) - ("" . company-complete-common)) - :config - (global-company-mode 1) - (setq-default - company-idle-delay .2 - company-minimum-prefix-length 1 - company-require-match nil - company-show-numbers t - company-tooltip-align-annotations t)) - -; (require 'company-statistics) - (use-package company-statistics - :ensure t - :after company - :init - (setq company-statistics-file (concat MY--PATH_USER_LOCAL "company-statistics-cache.el"));~/.emacs.d/user-dir/company-statistics-cache.el") - :config - (company-statistics-mode 1)) - - (use-package company-dabbrev - :ensure nil - :after company - :config - (setq-default company-dabbrev-downcase nil)) - - (use-package company-box - :ensure t - :init - (add-hook 'company-mode-hook 'company-box-mode)) -#+END_SRC - -** company backends - :PROPERTIES: - :ID: 6ac59f9d-54e3-422d-883f-128fb172468d - :END: - -#+BEGIN_SRC emacs-lisp - (defun company/org-mode-hook() - (set (make-local-variable 'company-backends) - '(company-capf company-files)) - (add-hook 'completion-at-point-functions 'pcomplete-completions-at-point nil t) - (message "company/org-mode-hook")) - - (defun company/elisp-mode-hook() - (set (make-local-variable 'company-backends) - '((company-elisp company-dabbrev) company-capf company-files)) - (message "company/elisp-mode-hook")) - - (defun company/beancount-mode-hook() - (set (make-local-variable 'company-backends) - '(company-beancount))) -#+END_SRC * Programming ** Magit / Git