From 412080ca85be284ee2ed16ca4812f81b3554f481 Mon Sep 17 00:00:00 2001
From: Chizi123 <joelgrun@gmail.com>
Date: Tue, 07 May 2019 08:45:35 +0000
Subject: [PATCH] Added some more theming options

---
 config.org |  190 +++++++++++++++++++++++++++++++++++-----------
 1 files changed, 143 insertions(+), 47 deletions(-)

diff --git a/config.org b/config.org
index 7d0e42c..36eb92a 100644
--- a/config.org
+++ b/config.org
@@ -1,4 +1,6 @@
 #+TITLE: My Emacs configuration
+#  LocalWords:  poppler mingw emacs eq nt gnuplot setenv mapconcat el cond minibuffer pdf color Smartparens smartparens yas aindent whitespace eldoc ielm ibuffer hippie pscp pos Spaceline spaceline powerline spacemacs seperator dir Yasnippet yasnippet flycheck magit fullscreen CEDET askifnotset semanticdb EDE ede gdb srefactor analyzer eval cdb autosetup ghostscript math unicode reftex bibtex TeXcount texcount str latin rkt PlantUML plantuml autoload alist matlab verilog ds vh src fontify natively fortran dvipng plist xcolor
+
 * Windows dependencies
 Dependencies needed for Aspell, poppler PDF-tools, compilers and ghost-script provided by mingw64
 #+BEGIN_SRC emacs-lisp
@@ -10,17 +12,42 @@
 #+END_SRC
 
 * Aesthetic changes
-** Zenburn theme
+** Emacs theme
+Zenburn theme is the default
 #+BEGIN_SRC emacs-lisp
-  (use-package zenburn-theme
-    :ensure t
-    :config
-    (load-theme 'zenburn t))
+  (setq emacs-theme 'zenburn)
+
+  (defun disable-all-themes ()
+    (dolist (i custom-enabled-themes)
+      (disable-theme i)))
+
+  (cond ((eq emacs-theme 'zenburn)
+         (use-package zenburn-theme
+           :ensure t
+           :init
+           (disable-all-themes)
+           :config
+           (load-theme 'zenburn t)))
+        ((eq emacs-theme 'doom-one)
+         (use-package doom-themes
+           :ensure t
+           :init
+           (disable-all-themes)
+           :config
+           (setq doom-themes-enable-bolt t
+                 doom-themes-enable-italic t)
+           (load-theme 'doom-one t)
+           (doom-themes-visual-bell-config)
+           (doom-themes-org-config)))
+        ((eq emacs-theme 'none)
+         (disable-all-themes)))
 #+END_SRC
+
 ** Default font
 #+BEGIN_SRC emacs-lisp
   (set-frame-font "DejaVu Sans Mono" nil t)
 #+END_SRC
+
 ** Remove menu bar, toolbar, but keep scroll bar
 #+BEGIN_SRC emacs-lisp
   (menu-bar-mode 0)
@@ -55,6 +82,7 @@
   :bind
     ([remap other-window] . switch-window))
 #+END_SRC
+
 ** Go to new window when opened
 #+BEGIN_SRC emacs-lisp
   (defun split-and-follow-horizontally ()
@@ -71,14 +99,15 @@
     (other-window 1))
   (global-set-key (kbd "C-x 3") 'split-and-follow-vertically)
 #+END_SRC
+
 ** PDF-tools
 #+BEGIN_SRC emacs-lisp
 (use-package pdf-tools
   :ensure t
   :config
   (pdf-tools-install))
-
 #+END_SRC
+
 * Helm and Projectile
 ** Helm core
 #+BEGIN_SRC emacs-lisp
@@ -112,6 +141,7 @@
               'spacemacs//helm-hide-minibuffer-maybe)
     (helm-mode 1))
 #+END_SRC
+
 ** Projectile
 *** Enable it
  #+BEGIN_SRC emacs-lisp
@@ -125,27 +155,32 @@
      (when (eq system-type 'windows-nt)
        (setq projectile-indexing-method 'alien)))
  #+END_SRC
+
 *** Let it compile things
  #+BEGIN_SRC emacs-lisp
    (global-set-key (kbd "<f5>") 'projectile-compile-project)
  #+END_SRC
+
 *** Enable communication with helm
 #+BEGIN_SRC emacs-lisp
-(use-package helm-projectile
-  :ensure t
-  :config
-  (helm-projectile-on))
+  (use-package helm-projectile
+    :ensure t
+    :config
+    (helm-projectile-on))
 #+END_SRC
+
 * Small tweaks
 ** Remove startup screen
 #+BEGIN_SRC emacs-lisp
 (setq inhibit-startup-message t)
 #+END_SRC
+
 ** Disable bell
 Bloody bell dings every time you hit a key too much
 #+BEGIN_SRC emacs-lisp
 (setq ring-bell-function 'ignore)
 #+END_SRC
+
 ** Pretty symbols
 Why not? They make it look nice
 #+BEGIN_SRC emacs-lisp
@@ -156,6 +191,7 @@
       :config
       (global-pretty-mode)))
 #+END_SRC
+
 ** find file other window
 Lets it accept more than one file. Works recursively.
 #+BEGIN_SRC emacs-lisp
@@ -164,6 +200,7 @@
       (loop for f in filename do (find-file-other-window f wildcards))
     ad-do-it))
 #+END_SRC
+
 ** Which key
 Helps to explain keybindings if you get lost
 #+BEGIN_SRC emacs-lisp
@@ -173,6 +210,7 @@
     :config
     (which-key-mode))
 #+END_SRC
+
 ** Go to this file
 #+BEGIN_SRC emacs-lisp
 (defun config-visit ()
@@ -180,6 +218,7 @@
   (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 ()
@@ -187,6 +226,7 @@
     (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 ()
@@ -195,6 +235,7 @@
   (org-babel-load-file (expand-file-name "~/.emacs.d/config.org")))
 (global-set-key (kbd "C-c e r") 'config-reload)
 #+END_SRC
+
 ** Smartparens
 Matches brackets automatically
 #+BEGIN_SRC emacs-lisp
@@ -206,6 +247,7 @@
     (require 'smartparens-config)
     (smartparens-global-mode 1)))
 #+END_SRC
+
 ** Rainbow
 Its a little gimmicky but its still cool
 #+BEGIN_SRC emacs-lisp
@@ -215,6 +257,7 @@
     :init
     (add-hook 'prog-mode-hook 'rainbow-mode))
 #+END_SRC
+
 ** Rainbow delimiters
 A bit more useful than above.
 Colours the brackets so that they stand out more.
@@ -224,6 +267,7 @@
     :init
       (add-hook 'prog-mode-hook #'rainbow-delimiters-mode))
 #+END_SRC
+
 ** clean-aindent-mode
 Removes unnecessary white space
 #+BEGIN_SRC emacs-lisp
@@ -235,6 +279,7 @@
 #+BEGIN_SRC emacs-lisp
 (add-hook 'prog-mode-hook (lambda () (interactive) (setq show-trailing-whitespace 1)))
 #+END_SRC
+
 ** whitespace mode
 Reveals whitespace characters
 #+BEGIN_SRC emacs-lisp
@@ -254,12 +299,14 @@
                             (whitespace-mode 1)))
 
 #+END_SRC
+
 ** eldoc
 #+BEGIN_SRC emacs-lisp
   (add-hook 'emacs-lisp-mode-hook 'eldoc-mode)
   (add-hook 'lisp-interaction-mode-hook 'eldoc-mode)
   (add-hook 'ielm-mode-hook 'eldoc-mode)
 #+END_SRC
+
 ** key-freq
 collects interesting statistics
 #+BEGIN_SRC emacs-lisp
@@ -269,6 +316,7 @@
   (keyfreq-mode 1)
   (keyfreq-autosave-mode 1))
 #+END_SRC
+
 ** undo-tree
 A more advanced undo mechanism
 #+BEGIN_SRC emacs-lisp
@@ -278,6 +326,7 @@
   :config
   (global-undo-tree-mode))
 #+END_SRC
+
 ** volatile highlights
 Colour the material just copied
 #+BEGIN_SRC emacs-lisp
@@ -287,20 +336,13 @@
   :config
   (volatile-highlights-mode t))
 #+END_SRC
-** Workgroups
-Open the pages when you quit
-#+BEGIN_SRC emacs-lisp
-  ;; (use-package workgroups2
-  ;;   :ensure t
-  ;;   :diminish workgroups-mode
-  ;;   :config
-  ;;   (workgroups-mode 1))
-#+END_SRC
+
 ** ibuffer
 #+BEGIN_SRC emacs-lisp
 (global-set-key (kbd "C-x C-b") 'ibuffer)
 (setq ibuffer-use-other-window t)
 #+END_SRC
+
 ** hippie expand
 #+BEGIN_SRC emacs-lisp
 (global-set-key (kbd "M-/") 'hippie-expand) ;; replace dabbrev-expand
@@ -318,10 +360,12 @@
    try-complete-lisp-symbol) ;; Try to complete word as an Emacs Lisp symbol.
  )
 #+END_SRC
+
 ** Highlight line
 #+BEGIN_SRC emacs-lisp
 (global-hl-line-mode)
 #+END_SRC
+
 ** Line numbers
 #+BEGIN_SRC emacs-lisp
 (add-hook 'prog-mode-hook 'linum-mode)
@@ -342,6 +386,7 @@
 	kill-ring-max 5000
 	kill-whole-line t)
 #+END_SRC
+
 ** Coding style
 #+BEGIN_SRC emacs-lisp
 (setq c-default-style "linux")
@@ -357,6 +402,7 @@
 (delete-selection-mode)
 (global-set-key (kbd "RET") 'newline-and-indent)
 #+END_SRC
+
 ** Move to beginning of line ignoring whitespace
 Move point back to indentation of beginning of line.
 
@@ -384,6 +430,7 @@
 
 (global-set-key (kbd "C-a") 'prelude-move-beginning-of-line)
 #+END_SRC
+
 ** Indent region or buffer
 #+BEGIN_SRC emacs-lisp
 (defun indent-region-or-buffer ()
@@ -402,6 +449,7 @@
 
 (global-set-key (kbd "C-c i") 'indent-region-or-buffer)
 #+END_SRC
+
 ** Tramp
 #+BEGIN_SRC emacs-lisp
   (when (eq system-type 'windows-nt)
@@ -414,20 +462,23 @@
 ** Spaceline
 A little easier to read than the default emacs mode line
 #+BEGIN_SRC emacs-lisp
-  (use-package spaceline
-    :ensure t
-    :config
-    (require 'spaceline-config)
-    (setq spaceline-buffer-encoding-abbrev-p t)
-    (setq spaceline-line-column-p t)
-    (setq spaceline-line-p t)
-    (setq powerline-default-separator (quote arrow))
-    (spaceline-spacemacs-theme))
+    (use-package spaceline
+      :ensure t
+      :config
+      (require 'spaceline-config)
+      (setq spaceline-buffer-encoding-abbrev-p t)
+      (setq spaceline-line-column-p t)
+      (setq spaceline-line-p t)
+      (setq powerline-default-separator (quote arrow))
+      (spaceline-spacemacs-theme)
+      (spaceline-helm-mode))
 #+END_SRC
+
 ** No separator
 #+BEGIN_SRC emacs-lisp
 (setq powerline-default-seperator nil)
 #+END_SRC
+
 * Programming tweaks
 ** Yasnippet
 #+BEGIN_SRC emacs-lisp
@@ -440,10 +491,14 @@
       (yas-reload-all)
       (yas-global-mode 1))
 #+END_SRC
+
 ** flycheck
 #+BEGIN_SRC emacs-lisp
-(use-package flycheck
-  :ensure t)
+  (use-package flycheck
+    :ensure t
+    :diminish flycheck-mode
+    :config
+    (global-flycheck-mode))
 #+END_SRC
 *** flycheck-pos-tip
 #+BEGIN_SRC emacs-lisp
@@ -453,8 +508,9 @@
   :config
   (flycheck-pos-tip-mode))
 #+END_SRC
+
 ** Company
-Company is auto-complete for emacs
+Company is auto-complete for Emacs
 #+BEGIN_SRC emacs-lisp
   (use-package company
     :ensure t
@@ -464,6 +520,7 @@
     (setq company-idle-delay 0)
     (setq company-minimum-prefix-length 3))
 #+END_SRC
+
 ** Magit
 #+BEGIN_SRC emacs-lisp
   (use-package magit
@@ -518,6 +575,7 @@
        magit-set-upstream-on-push 'askifnotset
        )))
 #+END_SRC
+
 ** CEDET
 *** semantic
 #+BEGIN_SRC emacs-lisp
@@ -528,12 +586,14 @@
     (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
@@ -543,6 +603,7 @@
  ;; 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
@@ -556,6 +617,7 @@
 	      :map c++-mode-map
 	      ("M-RET" . 'srefactor-refactor-at-point)))
 #+END_SRC
+
 ** Language specific configs
 *** C/C++
 **** yasnippet
@@ -563,6 +625,7 @@
 (add-hook 'c++-mode-hook 'yas-minor-mode)
 (add-hook 'c-mode-hook 'yas-minor-mode)
 #+END_SRC
+
 **** flycheck clang
 #+BEGIN_SRC emacs-lisp
 (use-package flycheck-clang-analyzer
@@ -572,6 +635,7 @@
     (require 'flycheck-clang-analyzer)
      (flycheck-clang-analyzer-setup)))
 #+END_SRC
+
 **** company
 #+BEGIN_SRC emacs-lisp
   (use-package company-c-headers
@@ -598,15 +662,18 @@
     (add-hook 'irony-mode-hook 'irony-cdb-autosetup-compile-options)
     (add-hook 'irony-mode-hook 'irony-cdb-autosetup-compile-options))
 #+END_SRC
+
 *** emacs-lisp
 **** eldoc
 #+BEGIN_SRC emacs-lisp
 (add-hook 'emacs-lisp-mode-hook 'eldoc-mode)
 #+END_SRC
+
 **** yasnippet
 #+BEGIN_SRC emacs-lisp
 (add-hook 'emacs-lisp-mode-hook 'yas-minor-mode)
 #+END_SRC
+
 **** company
 #+BEGIN_SRC emacs-lisp
 (add-hook 'emacs-lisp-mode-hook 'company-mode)
@@ -623,6 +690,7 @@
     (require 'company)
     (slime-setup '(slime-fancy slime-company)))
 #+END_SRC
+
 *** x86
 **** x86-lookup
 #+BEGIN_SRC emacs-lisp
@@ -632,6 +700,7 @@
   (setq x86-lookup-pdf "D:/Coding/x86-instructions.pdf")
   :bind ("C-h x" . x86-lookup))
 #+END_SRC
+
 *** Latex
 **** AucTex
 #+BEGIN_SRC emacs-lisp
@@ -643,6 +712,7 @@
   (setq doc-view-ghostscript-program "c:/msys64/mingw64/bin/gswin32c.exe")
   (setq preview-gs-command "c:/msys64/mingw64/bin/gs.exe"))
 #+END_SRC
+
 **** Company
 #+BEGIN_SRC emacs-lisp
   (use-package company-math
@@ -668,6 +738,7 @@
     :after company
     (add-to-list 'company-backends 'company-bibtex))
 #+END_SRC
+
 **** Preview pane
 #+BEGIN_SRC emacs-lisp
 (use-package latex-preview-pane
@@ -675,6 +746,7 @@
   :config
   (latex-preview-pane-enable))
 #+END_SRC
+
 **** TeXcount
      Word counts in latex
      #+BEGIN_SRC emacs-lisp
@@ -725,19 +797,31 @@
       (autoload 'racket-mode "Racket" "Racket Editing Mode" t)
       (add-to-list
        'auto-mode-alist
-       '("\\.rkt$" . matlab-mode))
+       '("\\.rkt$" . racket-mode))
       (setq matlab-indent-function t))
 #+END_SRC
 
 *** Verilog
+**** Get latest version
+Pull the latest version from the web
+#+BEGIN_SRC emacs-lisp
+  (defun get-verilog-latest()
+    (interactive)
+    (url-copy-file "https://www.veripool.org/ftp/verilog-mode.el" "c:/Users/joelg/.emacs.d/elpa/verilog-mode/verilog-mode.el" 1))
+#+END_SRC
+
+**** Integrate into emacs
 Add updated version and integrate it with Emacs.
 #+BEGIN_SRC emacs-lisp
-  (add-to-list 'load-path "~/.emacs.d/elpa/verilog-mode-20190324/verilog-mode.el")
-  (require 'verilog-mode)
-
-  (autoload 'verilog-mode "verilog-mode" "Verilog mode" t )
-  (add-to-list 'auto-mode-alist '("\\.[ds]?vh?\\'" . verilog-mode))
+  (use-package verilog-mode
+    :init
+    (get-verilog-latest)
+    (add-to-list 'load-path "~/.emacs.d/elpa/verilog-mode/verilog-mode.el")
+    :config
+    (autoload 'verilog-mode "verilog-mode" "Verilog mode" t )
+    (add-to-list 'auto-mode-alist '("\\.[ds]?vh?\\'" . verilog-mode)))
 #+END_SRC
+
 * Org mode
 ** Up to date org
 #+BEGIN_SRC emacs-lisp
@@ -745,6 +829,7 @@
       :ensure t
       :pin org)
 #+END_SRC
+
 ** Small tweaks
 #+BEGIN_SRC emacs-lisp
 (setq org-src-fontify-natively t)
@@ -756,12 +841,14 @@
 (diminish 'org-indent-mode)
 (diminish 'visual-line-mode)
 #+END_SRC
+
 ** Line wrapping
 #+BEGIN_SRC emacs-lisp
   (add-hook 'org-mode-hook
 	      '(lambda ()
 		 (visual-line-mode 1)))
 #+END_SRC
+
 ** org-bullets
 #+BEGIN_SRC emacs-lisp
 (use-package org-bullets
@@ -769,21 +856,29 @@
   :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
-  (org-babel-do-load-languages 'org-babel-load-languages '((emacs-lisp . t)
-                                                           (C . t)
-                                                           (python . t)
-                                                           (latex . t)
-                                                           (scheme . t)
-                                                           (gnuplot . t)
-                                                           (matlab . t)
-                                                           (plantuml . t)
-                                                           (fortran . t)
-                                                           (java . t)))
+    (org-babel-do-load-languages 'org-babel-load-languages '((emacs-lisp . t)
+                                                             (C . t)
+                                                             (python . t)
+                                                             (latex . t)
+                                                             (scheme . t)
+                                                             (gnuplot . t)
+                                                             (matlab . t)
+                                                             (plantuml . t)
+                                                             (fortran . t)
+                                                             (java . t)
+                                                             (plantuml . t)))
 #+END_SRC
+
+**** Plantuml path
+#+BEGIN_SRC emacs-lisp
+  (setq org-plantuml-jar-path plantuml-jar-path)
+#+END_SRC
+
 ** Latex preview fragments match colour
 Make the previews match theme colour of Emacs.
 #+BEGIN_SRC emacs-lisp
@@ -792,3 +887,4 @@
     (plist-put dvipng--plist :image-converter '("dvipng -D %D -T tight -o %O %f")))
 #+END_SRC
 
+

--
Gitblit v1.9.3