From 6d9503d41b759b76b794d2eecb969e7c3d85e986 Mon Sep 17 00:00:00 2001 From: Chizi123 <joelgrun@gmail.com> Date: Mon, 11 Mar 2019 10:31:07 +0000 Subject: [PATCH] Removed workgroups2, added org babel c support --- config.org | 325 +++++++++++++++++++++++++++++++++++------------------- 1 files changed, 211 insertions(+), 114 deletions(-) diff --git a/config.org b/config.org index 5aa556b..6349e10 100644 --- a/config.org +++ b/config.org @@ -5,7 +5,7 @@ (when (eq system-type 'windows-nt) (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") + (add-to-list 'exec-path "c:/Program Files/gnuplot") (setenv "PATH" (mapconcat #'identity exec-path path-separator))) #+END_SRC @@ -71,7 +71,7 @@ (pdf-tools-install)) #+END_SRC -* Helm and projectile +* Helm and Projectile ** Helm core #+BEGIN_SRC emacs-lisp (use-package helm-config @@ -110,10 +110,12 @@ (use-package projectile :ensure t :bind ("C-c p" . projectile-command-map) + :diminish projectile-mode :config (projectile-global-mode) (setq projectile-completion-system 'helm) - (setq projectile-indexing-method 'alien)) + (when (eq system-type 'windows-nt) + (setq projectile-indexing-method 'alien))) #+END_SRC *** Let it compile things #+BEGIN_SRC emacs-lisp @@ -170,6 +172,13 @@ (find-file "~/.emacs.d/config.org")) (global-set-key (kbd "C-c e d") 'config-visit) #+END_SRC +** Go to init.el +#+BEGIN_SRC emacs-lisp + (defun init-visit () + (interactive) + (find-file "~/.emacs.d/init.el")) + (global-set-key (kbd "C-c e i") 'init-visit) +#+END_SRC ** Reload configuration #+BEGIN_SRC emacs-lisp (defun config-reload () @@ -194,6 +203,7 @@ #+BEGIN_SRC emacs-lisp (use-package rainbow-mode :ensure t + :diminish rainbow-mode :init (add-hook 'prog-mode-hook 'rainbow-mode)) #+END_SRC @@ -256,6 +266,7 @@ #+BEGIN_SRC emacs-lisp (use-package undo-tree :ensure t + :diminish undo-tree-mode :config (global-undo-tree-mode)) #+END_SRC @@ -264,16 +275,18 @@ #+BEGIN_SRC emacs-lisp (use-package volatile-highlights :ensure t + :diminish volatile-highlights-mode :config (volatile-highlights-mode t)) #+END_SRC ** Workgroups Open the pages when you quit #+BEGIN_SRC emacs-lisp -(use-package workgroups2 - :ensure t - :config - (workgroups-mode 1)) + ;; (use-package workgroups2 + ;; :ensure t + ;; :diminish workgroups-mode + ;; :config + ;; (workgroups-mode 1)) #+END_SRC ** ibuffer #+BEGIN_SRC emacs-lisp @@ -384,7 +397,7 @@ ** Tramp #+BEGIN_SRC emacs-lisp (when (eq system-type 'windows-nt) - (setq tramp-default-method "plink")) + (setq tramp-default-method "pscp")) (setq password-cache-expiry nil) #+END_SRC @@ -410,13 +423,14 @@ * Programming tweaks ** Yasnippet #+BEGIN_SRC emacs-lisp - (use-package yasnippet - :ensure t - :diminish yas-minor-mode - :config - (use-package yasnippet-snippets - :ensure t) - (yas-reload-all)) + (use-package yasnippet + :ensure t + :diminish yas-minor-mode + :config + (use-package yasnippet-snippets + :ensure t) + (yas-reload-all) + (yas-global-mode 1)) #+END_SRC ** flycheck #+BEGIN_SRC emacs-lisp @@ -436,10 +450,103 @@ #+BEGIN_SRC emacs-lisp (use-package company :ensure t - :hook (prog-mode) + :diminish company-mode :config + (global-company-mode) (setq company-idle-delay 0) (setq company-minimum-prefix-length 3)) +#+END_SRC +** Magit +#+BEGIN_SRC emacs-lisp + (use-package magit + :ensure t + :commands magit-get-top-dir + :bind ("C-x g" . magit-status) + :init + (progn + ;; make magit status go full-screen but remember previous window + ;; settings + ;; from: http://whattheemacsd.com/setup-magit.el-01.html + (defadvice magit-status (around magit-fullscreen activate) + (window-configuration-to-register :magit-fullscreen) + ad-do-it + (delete-other-windows)) + + ;; Close popup when committing - this stops the commit window + ;; hanging around + ;; From: http://git.io/rPBE0Q + (defadvice git-commit-commit (after delete-window activate) + (delete-window)) + + (defadvice git-commit-abort (after delete-window activate) + (delete-window)) + + :config + (progn + ;; restore previously hidden windows + (defadvice magit-quit-window (around magit-restore-screen activate) + (let ((current-mode major-mode)) + ad-do-it + ;; 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))))) + + ;; 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 + ))) +#+END_SRC +** CEDET +*** semantic +#+BEGIN_SRC emacs-lisp +(use-package semantic + :config + (global-semanticdb-minor-mode 1) + (global-semantic-idle-scheduler-mode 1) + (global-semantic-idle-summary-mode 1) + (semantic-mode 1)) +#+END_SRC +*** EDE +#+BEGIN_SRC emacs-lisp +(use-package ede + :config + (global-ede-mode t)) +#+END_SRC +*** gdb-many-windows +#+BEGIN_SRC emacs-lisp +(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) +#+END_SRC +*** Semantic refactor +#+BEGIN_SRC emacs-lisp +(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))) #+END_SRC ** Language specific configs *** C/C++ @@ -459,27 +566,24 @@ #+END_SRC **** company #+BEGIN_SRC emacs-lisp - (add-hook 'c-mode-common-hook - (lambda () - (define-key c-mode-base-map [(tab)] 'company-complete)))) - (use-package company-c-headers - :ensure t - :after company - :config - (add-hook 'c++-mode-hook 'company-mode) - (add-hook 'c-mode-hook 'company-mode)) + :ensure tk + :after company + :config + (add-hook 'c++-mode-hook 'company-mode) + (add-hook 'c-mode-hook 'company-mode)) (use-package company-irony :ensure t :config - (add-to-list company-backends '((company-c-headers - company-dabbrev-code - company-irony)))) + (add-to-list 'company-backends '(company-c-headers + company-dabbrev-code + company-irony))) (use-package irony :ensure t :config + (setq w32-pipe-read-delay 0) (add-hook 'c++-mode-hook 'irony-mode) (add-hook 'c-mode-hook 'irony-mode) (add-hook 'irony-mode-hook 'irony-cdb-autosetup-compile-options)) @@ -536,6 +640,23 @@ :after company :config (add-to-list 'company-backends 'company-math-symbols-unicode)) + + (use-package company-reftex + :ensure t + :after company + :config + (add-to-list 'company-backends 'company-reftex)) + + (use-package company-auctex + :ensure t + :after company + :config + (company-auctex-init)) + + (use-package company-bibtex + :ensure t + :after company + (add-to-list 'company-backends 'company-bibtex)) #+END_SRC **** Preview pane #+BEGIN_SRC emacs-lisp @@ -544,6 +665,35 @@ :config (latex-preview-pane-enable)) #+END_SRC +**** TeXcount + Word counts in latex + #+BEGIN_SRC emacs-lisp + (when (eq system-type 'windows-nt) + (add-to-list 'exec-path "c:/Users/joelg/TeXcount_3_1_1") + (setenv "PATH" (mapconcat #'identity exec-path path-separator))) + + (defun texcount () + (interactive) + (let* + ( (this-file (buffer-file-name)) + (enc-str (symbol-name buffer-file-coding-system)) + (enc-opt + (cond + ((string-match "utf-8" enc-str) "-utf8") + ((string-match "latin" enc-str) "-latin1") + ("-encoding=guess") + ) ) + (word-count + (with-output-to-string + (with-current-buffer standard-output + (call-process "texcount" nil t nil "-0" enc-opt this-file) + ) ) ) ) + (message word-count) + ) ) + (add-hook 'LaTeX-mode-hook (lambda () (define-key LaTeX-mode-map (kbd "C-c c") 'texcount))) + (add-hook 'latex-mode-hook (lambda () (define-key latex-mode-map (kbd "C-c c") 'texcount))) + #+END_SRC + *** PlantUML #+BEGIN_SRC emacs-lisp (use-package plantuml-mode @@ -551,98 +701,36 @@ :init (setq plantuml-jar-path "c:/ProgramData/chocolatey/lib/plantuml/tools/plantuml.jar")) #+END_SRC -** Magit -#+BEGIN_SRC emacs-lisp -(use-package magit - :ensure t - :commands magit-get-top-dir - :bind ("C-x g" . magit-status) - :init - (progn - ;; make magit status go full-screen but remember previous window - ;; settings - ;; from: http://whattheemacsd.com/setup-magit.el-01.html - (defadvice magit-status (around magit-fullscreen activate) - (window-configuration-to-register :magit-fullscreen) - ad-do-it - (delete-other-windows)) - ;; Close popup when committing - this stops the commit window - ;; hanging around - ;; From: http://git.io/rPBE0Q - (defadvice git-commit-commit (after delete-window activate) - (delete-window)) - - (defadvice git-commit-abort (after delete-window activate) - (delete-window)) - - :config - (progn - ;; restore previously hidden windows - (defadvice magit-quit-window (around magit-restore-screen activate) - (let ((current-mode major-mode)) - ad-do-it - ;; 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))))) - - ;; 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 - ))) -#+END_SRC -** CEDET -*** semantic +*** Matlab +**** Matlab mode #+BEGIN_SRC emacs-lisp -(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 matlab-mode + :ensure t + :config + (autoload 'matlab-mode "matlab" "Matlab Editing Mode" t) + (add-to-list + 'auto-mode-alist + '("\\.m$" . matlab-mode)) + (setq matlab-indent-function t)) #+END_SRC -*** EDE +*** Racket +**** Major mode #+BEGIN_SRC emacs-lisp -(use-package ede - :config - (global-ede-mode t)) -#+END_SRC -*** gdb-many-windows -#+BEGIN_SRC emacs-lisp -(setq - ;; use gdb-many-windows by default - gdb-many-windows t + (when (eq system-type 'windows-nt) + (add-to-list 'exec-path "c:/Program Files/Racket") + (setenv "PATH" (mapconcat #'identity exec-path path-separator))) - ;; Non-nil means display source file containing the main routine at startup - gdb-show-main t) + (use-package racket-mode + :ensure t + :config + (autoload 'racket-mode "Racket" "Racket Editing Mode" t) + (add-to-list + 'auto-mode-alist + '("\\.rkt$" . matlab-mode)) + (setq matlab-indent-function t)) #+END_SRC -*** Semantic refactor -#+BEGIN_SRC emacs-lisp -(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))) -#+END_SRC + * Org mode ** Up to date org #+BEGIN_SRC emacs-lisp @@ -658,6 +746,8 @@ (setq org-export-with-smart-quotes t) (setq org-src-window-setup 'current-window) (add-hook 'org-mode-hook 'org-indent-mode) +(diminish 'org-indent-mode) +(diminish 'visual-line-mode) #+END_SRC ** Line wrapping #+BEGIN_SRC emacs-lisp @@ -672,3 +762,10 @@ :config (add-hook 'org-mode-hook (lambda () (org-bullets-mode)))) #+END_SRC +** Org Babel +*** Languages +Add C to org babel supported languages +#+BEGIN_SRC emacs-lisp + (add-to-list 'org-babel-load-languages '(C . t)) +#+END_SRC + -- Gitblit v1.9.3