diff options
Diffstat (limited to '.config')
| -rw-r--r-- | .config/emacs/init.el | 2 | ||||
| -rw-r--r-- | .config/emacs/org/config.org | 61 |
2 files changed, 38 insertions, 25 deletions
diff --git a/.config/emacs/init.el b/.config/emacs/init.el index 30d31d2..bed7033 100644 --- a/.config/emacs/init.el +++ b/.config/emacs/init.el @@ -36,7 +36,7 @@ '(jdee-db-spec-breakpoint-face-colors (cons "#1c1f2b" "#676E95")) '(objed-cursor-color "#ff5370") '(package-selected-packages - '(fzf helm-fuzzy helm-fuzzy-find workgroups2 helm-ag evil-numbers ccls org-superstar company-lsp lsp-ui lsp-mode evil-mc evil-surround cl-format company-irony neotree irony xr font-utils org-evil evil-vimish-fold crontab-mode symon toc-org yaml-mode helm-w3m helm-mu htmlize babel org-pdftools shell-pop which-key dmenu lua-mode dionysos helm-c-yasnippet helm-emms emms font-lock-cl restart-emacs w3m string-utils go-mode major-mode-icons dired-icon mode-icons evil-collection sed-mode zones kaolin-themes gruvbox-theme helm-themes yasnippet-classic-snippets yasnippet-snippets auto-yasnippet php-auto-yasnippets el-autoyas yasnippet cargo evil-ediff windresize helm-make spacemacs-theme centaur-tabs evil-magit dashboard ssh sudo-ext dockerfile-mode docker frame-local ov dash-functional helm-addressbook org-mime flyspell-correct pdf-tools websocket request emojify-logos emojify oauth2 circe web-mode doom-themes doom-modeline all-the-icons-dired all-the-icons-gnus all-the-icons html5-schema phps-mode org-babel-eval-in-repl rust-mode smart-mode-line-powerline-theme eshell-prompt-extras eshell-fixed-prompt pyenv-mode s realgud-lldb ranger ## color-theme-modern auto-complete-c-headers command-log-mode auto-complete magit smart-tabs-mode airline-themes paredit autopair tabbar-ruler tabbar use-package-el-get color-theme-approximate diminish rainbow-delimiters color-identifiers-mode use-package helm evil-visual-mark-mode)) + '(diff-hl difflib fzf helm-fuzzy helm-fuzzy-find workgroups2 helm-ag evil-numbers ccls org-superstar company-lsp lsp-ui lsp-mode evil-mc evil-surround cl-format company-irony neotree irony xr font-utils org-evil evil-vimish-fold crontab-mode symon toc-org yaml-mode helm-w3m helm-mu htmlize babel org-pdftools shell-pop which-key dmenu lua-mode dionysos helm-c-yasnippet helm-emms emms font-lock-cl restart-emacs w3m string-utils go-mode major-mode-icons dired-icon mode-icons evil-collection sed-mode zones kaolin-themes gruvbox-theme helm-themes yasnippet-classic-snippets yasnippet-snippets auto-yasnippet php-auto-yasnippets el-autoyas yasnippet cargo evil-ediff windresize helm-make spacemacs-theme centaur-tabs evil-magit dashboard ssh sudo-ext dockerfile-mode docker frame-local ov dash-functional helm-addressbook org-mime flyspell-correct pdf-tools websocket request emojify-logos emojify oauth2 circe web-mode doom-themes doom-modeline all-the-icons-dired all-the-icons-gnus all-the-icons html5-schema phps-mode org-babel-eval-in-repl rust-mode smart-mode-line-powerline-theme eshell-prompt-extras eshell-fixed-prompt pyenv-mode s realgud-lldb ranger ## color-theme-modern auto-complete-c-headers command-log-mode auto-complete magit smart-tabs-mode airline-themes paredit autopair tabbar-ruler tabbar use-package-el-get color-theme-approximate diminish rainbow-delimiters color-identifiers-mode use-package helm evil-visual-mark-mode)) '(pdf-view-midnight-colors (cons "#EEFFFF" "#292D3E")) '(pos-tip-background-color "#2E2A29") '(pos-tip-foreground-color "#d4d4d6") diff --git a/.config/emacs/org/config.org b/.config/emacs/org/config.org index f9c82b2..b1baa8f 100644 --- a/.config/emacs/org/config.org +++ b/.config/emacs/org/config.org @@ -572,29 +572,34 @@ then it takes a second \\[keyboard-quit] to abort the minibuffer." *** company #+BEGIN_SRC emacs-lisp - (require 'company) - (require 'company-irony) - ;; (add-to-list 'company-backends 'company-irony) - ;; (add-to-list 'company-backends 'company-yasnippet) - (add-hook 'after-init-hook 'global-company-mode) - (global-company-mode) - ;; company delay until suggestions are shown - (setq company-idle-delay 0) - - ;; weight by frequency - (setq company-transformers '(company-sort-by-occurrence)) - - ;; Add yasnippet support for all company backends - ;; https://github.com/syl20bnr/spacemacs/pull/179 - (defvar company-mode/enable-yas t "Enable yasnippet for all backends.") - - (defun company-mode/backend-with-yas (backend) - (if (or (not company-mode/enable-yas) (and (listp backend) (member 'company-yasnippet backend))) - backend - (append (if (consp backend) backend (list backend)) - '(:with company-yasnippet)))) - - (setq company-backends (mapcar #'company-mode/backend-with-yas company-backends)) + (require 'company) + (require 'company-irony) + ;; (add-to-list 'company-backends 'company-irony) + ;; (add-to-list 'company-backends 'company-yasnippet) + (add-hook 'after-init-hook 'global-company-mode) + (global-company-mode) + ;; company delay until suggestions are shown + (setq company-idle-delay 0) + + ;; weight by frequency + (setq company-transformers '(company-sort-by-occurrence)) + + ;; Add yasnippet support for all company backends + ;; https://github.com/syl20bnr/spacemacs/pull/179 + (defvar company-mode/enable-yas t "Enable yasnippet for all backends.") + + (defun company-mode/backend-with-yas (backend) + (if (or (not company-mode/enable-yas) (and (listp backend) (member 'company-yasnippet backend))) + backend + (append (if (consp backend) backend (list backend)) + '(:with company-yasnippet)))) + + (setq company-backends (mapcar #'company-mode/backend-with-yas company-backends)) + (define-key company-active-map (kbd "C-j") 'company-select-next) + (define-key company-active-map (kbd "C-k") 'company-select-previous) + (define-key company-search-map (kbd "C-j") 'company-select-next) + (define-key company-search-map (kbd "C-k") 'company-select-previous) + (define-key company-search-map (kbd "C-t") 'company-search-toggle-filtering) #+END_SRC *** lsp, ccls @@ -648,7 +653,7 @@ then it takes a second \\[keyboard-quit] to abort the minibuffer." ;; (ccls/vars 3) => field or local variable. 3 = 1 | 2 ;; (ccls/vars 4) => parameter - (setq lsp-ui-doc-header t) + (setq lsp-ui-doc-header nil) (setq lsp-ui-doc-position 'top) (setq lsp-ui-sideline-enable t) @@ -660,6 +665,14 @@ then it takes a second \\[keyboard-quit] to abort the minibuffer." ;; (ccls-use-default-rainbow-sem-highlight) #+END_SRC +*** diff-hl +#+BEGIN_SRC emacs-lisp + (require 'diff-hl) + (global-diff-hl-mode) + (add-hook 'magit-pre-refresh-hook 'diff-hl-magit-pre-refresh) + (add-hook 'magit-post-refresh-hook 'diff-hl-magit-post-refresh) +#+END_SRC + ** Compilation *** Close window after errorless compilation #+BEGIN_SRC emacs-lisp |