From d070a7b257cf0c42efe058bc520a585fb166f46d Mon Sep 17 00:00:00 2001 From: Chizi123 <joelgrun@gmail.com> Date: Sun, 06 Jan 2019 07:32:04 +0000 Subject: [PATCH] Moved config from init.el to config.org --- init.el | 423 ++++++++++++++++++++++++++++++---------------------- 1 files changed, 245 insertions(+), 178 deletions(-) diff --git a/init.el b/init.el index 449f62f..0e592d3 100644 --- a/init.el +++ b/init.el @@ -1,41 +1,31 @@ -(provide 'init) - -;; set paths for executable -(add-to-list 'exec-path "C:/msys64/usr/bin") -(add-to-list 'exec-path "C:/msys64/mingw64/bin") -(setenv "PATH" (mapconcat #'identity exec-path path-separator)) - ;; adding modules to load path -(add-to-list 'load-path "~/.emacs.d/custom/") +;; (add-to-list 'load-path "~/.emacs.d/custom/") +;; (add-to-list 'load-path "~/.emacs.d/elpa/") ;; load your modules -(require 'setup-applications) -(require 'setup-communication) -(require 'setup-convenience) -(require 'setup-data) -(require 'setup-development) -(require 'setup-editing) -(require 'setup-environment) -(require 'setup-external) -(require 'setup-faces) -(require 'setup-files) -(require 'setup-help) -(require 'setup-programming) -(require 'setup-text) -(require 'setup-local) - -;; setting up aspell -(require 'ispell) -(setq-default ispell-program-name "aspell") +;; (require 'setup-applications) +;; (require 'setup-communication) +;; (require 'setup-convenience) +;; (require 'setup-data) +;; (require 'setup-development) +;; (require 'setup-editing) +;; (require 'setup-environment) +;; (require 'setup-external) +;; (require 'setup-faces) +;; (require 'setup-files) +;; (require 'setup-help) +;; (require 'setup-programming) +;; (require 'setup-text) +;; (require 'setup-local) ;; 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 '("gnu" . "http://elpa.gnu.org/packages/")) +(setq package-archives '(("gnu" . "http://elpa.gnu.org/packages/") + ("melpa" . "https://melpa.org/packages/") + ("org" . "https://orgmode.org/elpa/"))) +(package-initialize) ;; use-package -(package-initialize) (unless (package-installed-p 'use-package) (package-refresh-contents) (package-install 'use-package)) @@ -43,198 +33,275 @@ (eval-when-compile (require 'use-package)) +;; 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)) -;; helm -(require 'helm-config) +;; diminish +(use-package diminish + :ensure t) -(setq helm-split-window-in-side-p t ; open helm buffer inside current window, not occupy whole other window - helm-move-to-line-cycle-in-source t ; move to end or beginning of source when reaching top or bottom of source. - helm-ff-search-library-in-sexp t ; search for library in `require' and `declare-function' sexp. - helm-scroll-amount 8 ; scroll 8 lines other window using M-<next>/M-<prior> - helm-ff-file-name-history-use-recentf t - helm-echo-input-in-header-line t) +;; redirect to org config file +(when (file-readable-p "~/.emacs.d/config.org") + (org-babel-load-file "~/.emacs.d/config.org")) -(defun spacemacs//helm-hide-minibuffer-maybe () - "Hide minibuffer in Helm session if we use the header line as input field." - (when (with-helm-buffer helm-echo-input-in-header-line) - (let ((ov (make-overlay (point-min) (point-max) nil nil t))) - (overlay-put ov 'window (selected-window)) - (overlay-put ov 'face - (let ((bg-color (face-background 'default nil))) - `(:background ,bg-color :foreground ,bg-color))) - (setq-local cursor-type nil)))) +;; 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 t)) -(add-hook 'helm-minibuffer-set-up-hook - 'spacemacs//helm-hide-minibuffer-maybe) +;; (setq +;; ;; use gdb-many-windows by default +;; gdb-many-windows t -(global-set-key (kbd "M-x") 'helm-M-x) -(setq helm-M-x-fuzzy-match t) ;; optional fuzzy matching for helm-M-x +;; ;; Non-nil means display source file containing the main routine at startup +;; gdb-show-main t) -(global-set-key (kbd "M-y") 'helm-show-kill-ring) +;; ;; undo-tree +;; (use-package undo-tree +;; :ensure t +;; :config +;; (global-undo-tree-mode)) -(global-set-key (kbd "C-x b") 'helm-mini) -(setq helm-buffers-fuzzy-matching t - helm-recentf-fuzzy-match t) +;; ;; volatile highlights +;; (use-package volatile-highlights +;; :ensure t +;; :config +;; (volatile-highlights-mode t)) -(global-set-key (kbd "C-x C-f") 'helm-find-files) +;; ;; yasnippet +;; (use-package yasnippet +;; :ensure t +;; :config +;; (yas-global-mode 1)) -(global-set-key (kbd "C-c h o") 'helm-occur) +;; ;; ggtags +;; (use-package ggtags +;; :ensure t +;; :config +;; (add-hook 'c-mode-common-hook +;; (lambda +;; (when (derived-mode-p 'c-mode 'c++-mode 'java-mode) +;; (ggtags-mode 1))))) -(helm-mode 1) +;; ;; workgroups2 +;; (use-package workgroups2 +;; :ensure t +;; :config +;; (workgroups-mode 1)) -;; undo-tree -(require 'undo-tree) -(global-undo-tree-mode) +;; ;; smartparens +;; (use-package smartparens +;; :ensure t +;; :diminish smartparens-mode +;; :config +;; (progn +;; (require 'smartparens-config) +;; (smartparens-global-mode 1))) -;; volatile highlights -(require 'volatile-highlights) -(volatile-highlights-mode t) +;; ;; clean-aindent-mode +;; (use-package clean-aindent-mode +;; :ensure t +;; :hook prog-mode) -;; yasnippet -(require 'yasnippet) -(yas-global-mode 1) +;; ;; company config +;; (use-package company +;; :ensure t +;; :init (global-company-mode) +;; :config +;; (add-hook 'c-mode-common-hook +;; (lambda () +;; (define-key c-mode-base-map [(tab)] 'company-complete)))) -;; ggtags -(require 'ggtags) -(add-hook 'c-mode-common-hook - (lambda - (when (derived-mode-p 'c-mode 'c++-mode 'java-mode) - (ggtags-mode 1)))) -(add-hook 'dired-mode-hook 'ggtags-mode) +;; (use-package company-c-headers +;; :ensure t +;; :after company +;; :config +;; (add-to-list 'company-backends 'company-c-headers)) -;; workgroups2 -(require 'workgroups2) -(workgroups-mode 1) +;; (use-package company-math +;; :ensure t +;; :after company +;; :config +;; (add-to-list 'company-backends 'company-math-symbols-unicode)) -;; smartparens -(require 'smartparens-config) -(add-hook 'prog-mode-hook #'smartparens-mode) -(setq sp-base-key-bindings 'paredit) -(setq sp-autoskip-closing-pair 'always) -(setq sp-hybrid-kill-entire-symbol nil) -(sp-use-paredit-bindings) +;; ;; projectile config +;; (use-package projectile +;; :ensure t +;; :bind (("C-c p" . projectile-command-map)) +;; :config +;; (projectile-global-mode) +;; (setq projectile-completion-system 'helm) +;; (setq projectile-indexing-method 'alien)) -;; clean-aindent-mode -(require 'clean-aindent-mode) -(add-hook 'prog-mode-hook 'clean-aindent-mode) +;; ;; magit config +;; (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)) -;; company config -(require 'company) -(add-hook 'after-init-hook 'global-company-mode) -(add-to-list 'company-backends 'company-c-headers) -(setq company-backends (delete 'company-semantic company-backends)) -(add-hook 'c-mode-common-hook - (lambda () - (define-key c-mode-base-map [(tab)] 'company-complete))) -;; (define-key c++-mode-map [(tab)] 'company-complete) +;; ;; Close popup when commiting - this stops the commit window +;; ;; hanging around +;; ;; From: http://git.io/rPBE0Q +;; (defadvice git-commit-commit (after delete-window activate) +;; (delete-window)) -;; ibuffer-vc config -(add-hook 'ibuffer-hook - (lambda () - (ibuffer-vc-set-filter-groups-by-vc-root) - (unless (eq ibuffer-sorting-mode 'alphabetic) - (ibuffer-do-sort-by-alphabetic)))) +;; (defadvice git-commit-abort (after delete-window activate) +;; (delete-window)) -(setq ibuffer-formats - '((mark modified read-only vc-status-mini " " - (name 18 18 :left :elide) - " " - (size 9 -1 :right) - " " - (mode 16 16 :left :elide) - " " - (vc-status 16 16 :left) - " " - filename-and-process))) +;; :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))))) -;; projectile config -(projectile-global-mode) -(setq projectile-completion-system 'helm) -(helm-projectile-on) -(setq projectile-indexing-method 'alien) -(define-key projectile-mode-map (kbd "C-c p") 'projectile-command-map) +;; ;; 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 +;; ))) -;; ztree config -(require 'ztree-diff) -(require 'ztree-dir) +;; ;; flycheck +;; (use-package flycheck +;; :ensure t +;; :init (global-flycheck-mode)) -;; diff-hl config -(global-diff-hl-mode) -(add-hook 'dired-mode-hook 'diff-hl-dired-mode) +;; (use-package flycheck-pos-tip +;; :ensure t +;; :after flycheck +;; :config +;; (flycheck-pos-tip-mode)) -;; magit config -(require 'magit) -(set-default 'magit-stage-all-confirm nil) -(add-hook 'magit-mode-hook 'magit-load-config-extensions) -;; full screen magit-status -(defadvice magit-status (around magit-fullscreen activate) - (window-configuration-to-register :magit-fullscreen) - ad-do-it - (delete-other-windows)) +;; (use-package flycheck-clang-analyzer +;; :ensure t +;; :after flycheck +;; :config +;; (flycheck-clang-analyzer-setup)) -(global-unset-key (kbd "C-x g")) -(global-set-key (kbd "C-x g h") 'magit-log) -(global-set-key (kbd "C-x g f") 'magit-file-log) -(global-set-key (kbd "C-x g b") 'magit-blame-mode) -(global-set-key (kbd "C-x g m") 'magit-branch-manager) -(global-set-key (kbd "C-x g c") 'magit-branch) -(global-set-key (kbd "C-x g s") 'magit-status) -(global-set-key (kbd "C-x g r") 'magit-reflog) -(global-set-key (kbd "C-x g t") 'magit-tag) +;; ;; nyan mode +;; (use-package nyan-mode +;; :if window-system +;; :ensure t +;; :config +;; (nyan-mode)) -;; flycheck -(require 'flycheck) -(add-hook 'after-init-hook #'global-flycheck-mode) +;; ;; 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))) -;; flycheck-pos-tip -(with-eval-after-load 'flycheck - (flycheck-pos-tip-mode)) +;; ;; which-key +;; (use-package which-key +;; :ensure t +;; :config +;; (which-key-mode) +;; (which-key-setup-side-window-bottom)) -;; nyan mode -(case window-system ((x w32) (nyan-mode))) +;; ;; x86 lookup +;; (use-package x86-lookup +;; :ensure t +;; :init +;; (setq x86-lookup-pdf "D:/Coding/x86-instructions.pdf") +;; :bind ("C-h x" . x86-lookup)) -;; semantic refactor -(require 'srefactor) -(require 'srefactor-lisp) +;; ;; org-bullets +;; (use-package org-bullets +;; :ensure t +;; :config +;; (add-hook 'org-mode-hook (lambda () (org-bullets-mode 1)))) -;; OPTIONAL: ADD IT ONLY IF YOU USE C/C++. -(semantic-mode 1) ;; -> this is optional for Lisp +;; ;; pdf-tools +;; (use-package pdf-tools +;; :ensure t +;; :config +;; (pdf-tools-install)) -(define-key c-mode-map (kbd "M-RET") 'srefactor-refactor-at-point) -(define-key c++-mode-map (kbd "M-RET") 'srefactor-refactor-at-point) -(global-set-key (kbd "M-RET o") 'srefactor-lisp-one-line) -(global-set-key (kbd "M-RET m") 'srefactor-lisp-format-sexp) -(global-set-key (kbd "M-RET d") 'srefactor-lisp-format-defun) -(global-set-key (kbd "M-RET b") 'srefactor-lisp-format-buffer) +;; ;; org +;; (use-package org +;; :ensure t +;; :config +;; (setq org-src-tab-acts-natively t)) -;; guide-key -(require 'guide-key) -(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) ; Enable guide-key-mode +;; ;; 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")) -;; x86 lookup -(require 'x86-lookup) -(setq x86-lookup-pdf "D:/Coding/x86-instructions.pdf") -(global-set-key (kbd "C-h x") #'x86-lookup) +;; ;; latex-preview-pane +;; (use-package latex-preview-pane +;; :ensure t +;; :config +;; (latex-preview-pane-enable)) -;; org-bullets -(require 'org-bullets) -(add-hook 'org-mode-hook 'org-bullets-mode) +;; ;; plantuml +;; (use-package plantuml-mode +;; :ensure t +;; :init +;; (setq plantuml-jar-path "c:/ProgramData/chocolatey/lib/plantuml/tools/plantuml.jar")) -;; pdf-tools -(pdf-tools-install) +;; (use-package keyfreq +;; :ensure t +;; :config +;; (keyfreq-mode 1) +;; (keyfreq-autosave-mode 1)) (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. + '(ede-project-directories (quote ("c:/Users/joelg/.emacs.d"))) '(package-selected-packages (quote - (use-package pdf-tools org org-bullets x86-lookup ztree yasnippet workgroups2 volatile-highlights undo-tree srefactor smartparens nyan-mode magit ibuffer-vc helm-projectile guide-key ggtags flycheck-tip flycheck-pos-tip diff-hl company-c-headers clean-aindent-mode)))) + (diminish keyfreq zenburn-theme yasnippet x86-lookup workgroups2 which-key volatile-highlights use-package undo-tree srefactor smartparens racket-mode popwin plantuml-mode pdf-tools org-bullets org nyan-mode magit latex-preview-pane helm-projectile ggtags flycheck-pos-tip flycheck-clang-analyzer company-math company-c-headers clean-aindent-mode auto-package-update auctex)))) (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