From 8dbbb251e359d3e41e2ba0ea06772f4f87b06c6c Mon Sep 17 00:00:00 2001 From: Chizi123 <joelgrun@gmail.com> Date: Fri, 23 Nov 2018 03:34:19 +0000 Subject: [PATCH] altered magit config --- init.el | 105 ++++++++++++++++++++++++++++++++++++++-------------- 1 files changed, 77 insertions(+), 28 deletions(-) diff --git a/init.el b/init.el index 2aae3df..40b1e02 100644 --- a/init.el +++ b/init.el @@ -1,6 +1,7 @@ (provide 'init) ;; set paths for executable +;; use mingw64 for aspell, poppler (pdf-tools), gcc, ghostscript (add-to-list 'exec-path "C:/msys64/usr/bin") (add-to-list 'exec-path "C:/msys64/mingw64/bin") (add-to-list 'exec-path "c:/Program Files/Racket") @@ -29,6 +30,10 @@ ;; setting up aspell (require 'ispell) (setq-default ispell-program-name "aspell") +(add-hook 'latex-mode-hook 'flyspell-mode) +(add-hook 'latex-mode-hook 'flyspell-buffer) +(add-hook 'org-mode-hook 'flyspell-mode) +(add-hook 'org-mode-hook 'flyspell-buffer) ;; Repos (require 'package) @@ -48,6 +53,7 @@ ;; auto-package-update (use-package auto-package-update + :ensure t :config (setq auto-package-update-delete-old-versions t) (setq auto-package-update-hide-results t) @@ -57,7 +63,7 @@ (use-package zenburn-theme :ensure t :config - (load-theme 'zenburn) + (load-theme 'zenburn t) (setq auto-package-update-delete-old-versions t) (setq auto-package-update-hide-results t) (auto-package-update-maybe)) @@ -170,10 +176,27 @@ :ensure t :init (global-company-mode) :config - (add-to-list 'company-backends 'company-c-headers) (add-hook 'c-mode-common-hook (lambda () (define-key c-mode-base-map [(tab)] 'company-complete))) + (setq auto-package-update-delete-old-versions t) + (setq auto-package-update-hide-results t) + (auto-package-update-maybe)) + +(use-package company-c-headers + :ensure t + :after company + :config + (add-to-list 'company-backends 'company-c-headers) + (setq auto-package-update-delete-old-versions t) + (setq auto-package-update-hide-results t) + (auto-package-update-maybe)) + +(use-package company-math + :ensure t + :after company + :config + (add-to-list 'company-backends 'company-math-symbols-unicode) (setq auto-package-update-delete-old-versions t) (setq auto-package-update-hide-results t) (auto-package-update-maybe)) @@ -208,9 +231,6 @@ ("C-x g t" . magit-tag)) :init (progn - - ;; we no longer need vc-git - (delete 'Git vc-handled-backends) ;; make magit status go full-screen but remember previous window ;; settings ;; from: http://whattheemacsd.com/setup-magit.el-01.html @@ -228,14 +248,6 @@ (defadvice git-commit-abort (after delete-window activate) (delete-window)) - ;; these two force a new line to be inserted into a commit window, - ;; which stops the invalid style showing up. - ;; From: http://git.io/rPBE0Q - (defun magit-commit-mode-init () - (when (looking-at "\n") - (open-line 1))) - - (add-hook 'git-commit-mode-hook 'magit-commit-mode-init)) :config (progn ;; restore previously hidden windows @@ -256,13 +268,8 @@ (define-key magit-mode-map "c" 'magit-maybe-commit) - ;; major mode for editing `git rebase -i` files - (use-package rebase-mode) - ;; magit settings (setq - ;; use ido to look for branches - magit-completing-read-function 'magit-ido-completing-read ;; don't put "origin-" in front of new branch names by default magit-default-tracking-name-function 'magit-default-tracking-name-branch-only ;; open magit status in same window as current buffer @@ -300,6 +307,15 @@ (setq auto-package-update-hide-results t) (auto-package-update-maybe)) +(use-package flycheck-clang-analyzer + :ensure t + :after flycheck + :config + (flycheck-clang-analyzer-setup) + (setq auto-package-update-delete-old-versions t) + (setq auto-package-update-hide-results t) + (auto-package-update-maybe)) + ;; nyan mode (use-package nyan-mode :if window-system @@ -308,22 +324,32 @@ (nyan-mode)) ;; semantic refactor -(use-package srefactor +(use-package semantic :ensure t :config - (semantic-mode 1) + (semantic-mode 1)) + +(use-package srefactor + :ensure t + :bind (("M-RET o" . 'srefactor-lisp-one-line) + ("M-RET m" . 'srefactor-lisp-format-sexp) + ("M-RET d" . 'srefactor-lisp-format-defun) + ("M-RET b" . 'srefactor-lisp-format-buffer) + :map c-mode-base-map + ("M-RET" . 'srefactor-refactor-at-point) + :map c++-mode-map + ("M-RET" . 'srefactor-refactor-at-point)) + :config (setq auto-package-update-delete-old-versions t) (setq auto-package-update-hide-results t) (auto-package-update-maybe)) -;; guide-key -(use-package guide-key +;; which-key +(use-package which-key :ensure t :config - (setq guide-key/guide-key-sequence '("C-x" "C-c" "M-g" "C-h")) - (setq guide-key/recursive-key-sequence-flag t) - (setq guide-key/popup-window-position 'bottom) - (guide-key-mode 1) + (which-key-mode) + (which-key-setup-side-window-bottom) (setq auto-package-update-delete-old-versions t) (setq auto-package-update-hide-results t) (auto-package-update-maybe)) @@ -342,8 +368,8 @@ ;; org-bullets (use-package org-bullets :ensure t - :hook org-mode :config + (add-hook 'org-mode-hook (lambda () (org-bullets-mode 1))) (setq auto-package-update-delete-old-versions t) (setq auto-package-update-hide-results t) (auto-package-update-maybe)) @@ -357,9 +383,32 @@ (setq auto-package-update-hide-results t) (auto-package-update-maybe)) +;; org (use-package org :ensure t :config + (setq org-src-tab-acts-natively t) + (setq auto-package-update-delete-old-versions t) + (setq auto-package-update-hide-results t) + (auto-package-update-maybe)) + +;; tex/AUCTex +(use-package tex + :ensure auctex + :config + (setq TeX-auto-save t) + (setq TeX-parse-self t) + (setq doc-view-ghostscript-program "c:/msys64/mingw64/bin/gswin32c.exe") + (setq preview-gs-command "c:/msys64/mingw64/bin/gs.exe") + (setq auto-package-update-delete-old-versions t) + (setq auto-package-update-hide-results t) + (auto-package-update-maybe)) + +;; latex-preview-pane +(use-package latex-preview-pane + :ensure t + :config + (latex-preview-pane-enable) (setq auto-package-update-delete-old-versions t) (setq auto-package-update-hide-results t) (auto-package-update-maybe)) @@ -374,7 +423,7 @@ ("ec5f697561eaf87b1d3b087dd28e61a2fc9860e4c862ea8e6b0b77bd4967d0ba" default))) '(package-selected-packages (quote - (zenburn-theme org flycheck-pos-tip flycheck rtags racket-mode geiser auto-package-update use-package pdf-tools org-bullets x86-lookup ztree yasnippet workgroups2 volatile-highlights undo-tree srefactor smartparens nyan-mode magit ibuffer-vc helm-projectile guide-key ggtags diff-hl company-c-headers clean-aindent-mode)))) + (company-math latex-preview-pane auctex zenburn-theme org flycheck-pos-tip flycheck rtags racket-mode geiser auto-package-update use-package pdf-tools org-bullets x86-lookup ztree yasnippet workgroups2 volatile-highlights undo-tree srefactor smartparens nyan-mode magit ibuffer-vc helm-projectile ggtags diff-hl company-c-headers clean-aindent-mode)))) (custom-set-faces ;; custom-set-faces was added by Custom. ;; If you edit it by hand, you could mess it up, so be careful. -- Gitblit v1.9.3