From 42474392bd52dae1fe25287a0f4ac19df330a8d9 Mon Sep 17 00:00:00 2001 From: Chizi123 <joelgrun@gmail.com> Date: Sat, 24 Nov 2018 08:00:56 +0000 Subject: [PATCH] added plantuml and stopped startup message --- init.el | 205 ++++++++++++++++++++++++++++++++++----------------- 1 files changed, 136 insertions(+), 69 deletions(-) diff --git a/init.el b/init.el index 9155053..385f649 100644 --- a/init.el +++ b/init.el @@ -1,6 +1,9 @@ (provide 'init) +(setq inhibit-startup-message t) + ;; 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") @@ -26,14 +29,21 @@ (require 'setup-text) (require 'setup-local) +;; set default font +(set-default-font "DejaVu Sans Mono-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) (add-to-list 'package-archives '("melpa" . "http://melpa.milkbox.net/packages/")) -(add-to-list 'package-archives '("marmalade" . "http://marmalade-repo.org/packages/")) +;; (add-to-list 'package-archives '("marmalade" . "http://marmalade-repo.org/packages/")) (add-to-list 'package-archives '("gnu" . "http://elpa.gnu.org/packages/")) ;; use-package @@ -48,7 +58,17 @@ ;; 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) + (auto-package-update-maybe)) + +;; zenburn theme +(use-package zenburn-theme + :ensure t + :config + (load-theme 'zenburn t) (setq auto-package-update-delete-old-versions t) (setq auto-package-update-hide-results t) (auto-package-update-maybe)) @@ -86,6 +106,28 @@ (setq auto-package-update-delete-old-versions t) (setq auto-package-update-hide-results t) (auto-package-update-maybe)) + +;; CEDET +(use-package cedet) + +(use-package semantic + :config + (global-semanticdb-minor-mode 1) + (global-semantic-idle-scheduler-mode 1) + (global-semantic-idle-summary-mode 1) + (semantic-mode 1)) + +(use-package ede + :config + (global-ede-mode)) + +(setq + ;; use gdb-many-windows by default + gdb-many-windows t + + ;; Non-nil means display source file containing the main routine at startup + gdb-show-main t + ) ;; undo-tree (use-package undo-tree @@ -127,7 +169,7 @@ (auto-package-update-maybe)) ;; workgroups2 -(use-package workgroups +(use-package workgroups2 :ensure t :config (workgroups-mode 1) @@ -161,10 +203,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)) @@ -191,6 +250,7 @@ ;; magit config (use-package magit + :ensure t :commands magit-get-top-dir :bind (("C-x g s" . magit-status) ("C-x g f" . magit-file-log) @@ -199,9 +259,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 @@ -219,14 +276,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 @@ -236,40 +285,26 @@ ;; we only want to jump to register when the last seen buffer ;; was a magit-status buffer. (when (eq 'magit-status-mode current-mode) - (jump-to-register :magit-fullscreen)))) + (jump-to-register :magit-fullscreen))))) - (defun magit-maybe-commit (&optional show-options) - "Runs magit-commit unless prefix is passed" - (interactive "P") - (if show-options - (magit-key-mode-popup-committing) - (magit-commit))) - - (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 - magit-status-buffer-switch-function 'switch-to-buffer - ;; highlight word/letter changes in hunk diffs - magit-diff-refine-hunk t - ;; ask me if I want to include a revision when rewriting - magit-rewrite-inclusive 'ask - ;; ask me to save buffers - magit-save-some-buffers t - ;; pop the process buffer if we're taking a while to complete - magit-process-popup-time 10 - ;; ask me if I want a tracking upstream - magit-set-upstream-on-push 'askifnotset - ) - (setq auto-package-update-delete-old-versions t) + ;; magit settings + (setq + ;; 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 + magit-status-buffer-switch-function 'switch-to-buffer + ;; highlight word/letter changes in hunk diffs + magit-diff-refine-hunk t + ;; ask me if I want to include a revision when rewriting + magit-rewrite-inclusive 'ask + ;; ask me to save buffers + magit-save-some-buffers t + ;; pop the process buffer if we're taking a while to complete + magit-process-popup-time 10 + ;; ask me if I want a tracking upstream + magit-set-upstream-on-push 'askifnotset + ) + (setq auto-package-update-delete-old-versions t) (setq auto-package-update-hide-results t) (auto-package-update-maybe))) @@ -291,6 +326,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 @@ -301,20 +345,25 @@ ;; semantic refactor (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 - (semantic-mode 1) (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)) @@ -333,8 +382,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)) @@ -348,24 +397,42 @@ (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)) -(custom-set-variables - ;; custom-set-variables was added by Custom. - ;; If you edit it by hand, you could mess it up, so be careful. - ;; Your init file should contain only one such instance. - ;; If there is more than one, they won't work right. - '(package-selected-packages - (quote - (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)))) -(custom-set-faces - ;; custom-set-faces was added by Custom. - ;; If you edit it by hand, you could mess it up, so be careful. - ;; Your init file should contain only one such instance. - ;; If there is more than one, they won't work right. - ) +;; 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)) + +;; plantuml +(use-package plantuml-mode + :ensure t + :init + (setq plantuml-jar-path "c:/ProgramData/chocolatey/lib/plantuml/tools/plantuml.jar") + :config + (setq auto-package-update-delete-old-versions t) + (setq auto-package-update-hide-results t) + (auto-package-update-maybe)) -- Gitblit v1.9.3