some new font locks, text mode, and cpp stuff

12 files changed, 99 insertions, 9 deletions

diff --git a/init.el b/init.el
index f4ff936..bfb0211 100644
--- a/init.el
+++ b/init.el
@@ -42,9 +42,13 @@
   (packages-install
    '(ace-window
      cider
+     company
+     company-c-headers
+     company-glsl
      clojure-mode
      clojure-mode-extra-font-locking
      clojure-snippets
+     cmake-mode
      dash
      dockerfile-mode
      elm-mode
@@ -60,6 +64,7 @@
      ido-vertical-mode
      magit
      markdown-mode
+     modern-cpp-font-lock
      multiple-cursors
      paredit
      play-routes-mode
@@ -72,6 +77,7 @@
      slime
      smart-mode-line
      solarized-theme
+     systemd
      visual-regexp
      visual-regexp-steroids
      web-mode
@@ -108,6 +114,7 @@
 (require 'setup-avy-mode)
 (require 'setup-c++-mode)
 (require 'setup-clojure-mode)
+(require 'setup-company-mode)
 (require 'setup-ember-mode)
 (require 'setup-flycheck)
 (require 'setup-haskell-mode)
@@ -122,6 +129,7 @@
 (require 'setup-purescript-mode)
 (require 'setup-scala-mode)
 (require 'setup-slime-mode)
+(require 'setup-txt-mode)
 (require 'setup-web-mode)
 (require 'setup-yaml-mode)
 (require 'setup-yasnippet)
diff --git a/settings/setup-auto-insert-mode.el b/settings/setup-auto-insert-mode.el
index 639a4f0..68d444a 100644
--- a/settings/setup-auto-insert-mode.el
+++ b/settings/setup-auto-insert-mode.el
@@ -21,7 +21,7 @@
 
 ;; C++
 (define-auto-insert "\\.cc\\'"  ["template.cc" custom/expand-yasnippet])
-(define-auto-insert "\\.hh\\'"  ["template.cc" custom/expand-yasnippet])
+(define-auto-insert "\\.hh\\'"  ["template.hh" custom/expand-yasnippet])
 
 ;; Python
 (define-auto-insert "\\.py\\'"  ["template.py" custom/expand-yasnippet])
diff --git a/settings/setup-c++-mode.el b/settings/setup-c++-mode.el
index 3980c1d..820c057 100644
--- a/settings/setup-c++-mode.el
+++ b/settings/setup-c++-mode.el
@@ -5,4 +5,9 @@
 	     '(;; add some keywords
 	       ("\\<\\(nullptr\\)\\>" . font-lock-keyword-face)))))
 
+(add-hook 'c++-mode-hook 'rtags-start-process-unless-running)
+
+(setq c-basic-offset 2)
+(setq c-default-style "gnu")
+
 (provide 'setup-c++-mode)
diff --git a/settings/setup-company-mode.el b/settings/setup-company-mode.el
new file mode 100644
index 0000000..9c5a843
--- /dev/null
+++ b/settings/setup-company-mode.el
@@ -0,0 +1,14 @@
+;;; setup-company-mode.el --- company mode config    -*- lexical-binding: t; -*-
+
+;;; Commentary:
+
+;; basic company mode configs
+
+;;; Code:
+
+(add-hook 'after-init-hook 'global-company-mode)
+(setq company-idle-delay 0.1)
+
+
+(provide 'setup-company-mode)
+;;; setup-company-mode.el ends here
diff --git a/settings/setup-markdown-mode.el b/settings/setup-markdown-mode.el
index 13c5ec0..0e68d1c 100644
--- a/settings/setup-markdown-mode.el
+++ b/settings/setup-markdown-mode.el
@@ -1,3 +1,4 @@
+(require 'markdown-mode)
 (setq markdown-imenu-generic-expression
       '(("title"  "^\\(.*\\)[\n]=+$" 1)
 	("h2-"    "^\\(.*\\)[\n]-+$" 1)
@@ -10,6 +11,14 @@
 	("fn"   "^\\[\\^\\(.*\\)\\]" 1)
 	))
 
+(add-to-list 'auto-mode-alist '("\\.markdown\\'" . markdown-mode))
+(add-to-list 'auto-mode-alist '("\\.md' ." markdown-mode))
+
+(autoload 'gfm-mode "markdown-mode"
+  (add-to-list 'auto-mode-alist '("README\\.md]]'" .gfm-mode)))
+
+(setq markdown-command "pandoc")
+
 (add-hook 'markdown-mode-hook
 	  (lambda ()
 	    (setq imenu-generic-expression markdown-imenu-generic-expression)))
diff --git a/settings/setup-org-mode.el b/settings/setup-org-mode.el
index ff93336..d4b236a 100644
--- a/settings/setup-org-mode.el
+++ b/settings/setup-org-mode.el
@@ -1,7 +1,13 @@
 ;; Pretty bullets
 (add-hook 'org-mode-hook (lambda() (org-bullets-mode 1)))
 
-(setq org-ellipsis "⤳")
+(custom-set-faces
+ '(org-level-1 ((t (:inherit outline-1 :height 1.0))))
+ '(org-level-2 ((t (:inherit outline-2 :height 1.0))))
+ '(org-level-3 ((t (:inherit outline-3 :height 1.0))))
+ '(org-level-4 ((t (:inherit outline-4 :height 1.0))))
+ '(org-level-5 ((t (:inherit outline-5 :height 1.0)))))
+
 (setq org-log-done 'time)
 (setq org-src-fontify-natively t)
 (setq org-src-tab-acts-natively t)
diff --git a/settings/setup-package.el b/settings/setup-package.el
index 530e5f4..03445b1 100644
--- a/settings/setup-package.el
+++ b/settings/setup-package.el
@@ -10,7 +10,7 @@
 ;; https://github.com/magnars/.emacs.d/blob/master/settings/setup-package.el
 (add-to-list 'package-archives '("melpa" . "http://melpa.org/packages/") t)
 (add-to-list 'package-archives '("melpa-stable" . "http://stable.melpa.org/packages/") t)
-(package-initialize)
+;; (package-initialize)
 
 (unless (file-exists-p "~/.emacs.d/elpa/archives/melpa")
   (package-refresh-contents))
diff --git a/settings/setup-projectile-mode.el b/settings/setup-projectile-mode.el
index 3ad9ee8..a22719d 100644
--- a/settings/setup-projectile-mode.el
+++ b/settings/setup-projectile-mode.el
@@ -28,5 +28,7 @@
 
 (define-key projectile-command-map (kbd "s g") 'projectile-ripgrep)
 
+(setq projectile-enable-caching t)
+
 (provide 'setup-projectile-mode)
 ;;; setup-projectile-mode.el ends here
diff --git a/settings/setup-txt-mode.el b/settings/setup-txt-mode.el
new file mode 100644
index 0000000..3190138
--- /dev/null
+++ b/settings/setup-txt-mode.el
@@ -0,0 +1,24 @@
+;;; setup-txt-mode.el --- basic txt mode config      -*- lexical-binding: t; -*-
+
+;;; Commentary:
+
+;; Basic text mode config
+
+;;; Code:
+
+(defun setup-margins ()
+  "Setup margins for text mode."
+  (setq left-margin-width 20)
+  (setq right-margin-width 20))
+
+(defun text-configs ()
+  "Setup basic text configs"
+  (visual-line-mode t)
+  (flyspell-mode t)
+  (setup-margins))
+
+
+(add-hook 'text-mode-hook 'text-configs)
+
+(provide 'setup-txt-mode)
+;;; setup-txt-mode.el ends here
diff --git a/settings/setup-web-mode.el b/settings/setup-web-mode.el
index 8aedb56..48e300c 100644
--- a/settings/setup-web-mode.el
+++ b/settings/setup-web-mode.el
@@ -1,16 +1,15 @@
 (require 'web-mode)
 
-
-(add-to-list 'auto-mode-alist '("\\.html?\\'" . web-mode))
-(add-to-list 'auto-mode-alist '("\\.tpl\\'" . web-mode))
-(add-to-list 'auto-mode-alist '("\\.js\\'" . web-mode))
-(add-to-list 'auto-mode-alist '("\\.json\\'" . web-mode))
 (add-to-list 'auto-mode-alist '("\\.[agj]sp\\'" . web-mode))
 (add-to-list 'auto-mode-alist '("\\.as[cp]x\\'" . web-mode))
 (add-to-list 'auto-mode-alist '("\\.erb\\'" . web-mode))
+(add-to-list 'auto-mode-alist '("\\.ejs\\'" . web-mode))
 (add-to-list 'auto-mode-alist '("\\.hbs\\'" . web-mode))
+(add-to-list 'auto-mode-alist '("\\.html?\\'" . web-mode))
+(add-to-list 'auto-mode-alist '("\\.js\\'" . web-mode))
+(add-to-list 'auto-mode-alist '("\\.json\\'" . web-mode))
 (add-to-list 'auto-mode-alist '("\\.mustache\\'" . web-mode))
-(add-to-list 'auto-mode-alist '("\\.djhtml\\'" . web-mode))
+(add-to-list 'auto-mode-alist '("\\.tpl\\'" . web-mode))
 
 
 (set-face-attribute 'web-mode-doctype-face nil :foreground "misty rose")
diff --git a/templates/auto-insert/template.cc b/templates/auto-insert/template.cc
new file mode 100644
index 0000000..d9afc65
--- /dev/null
+++ b/templates/auto-insert/template.cc
@@ -0,0 +1,7 @@
+/*
+ * @file `(buffer-name)`
+ * @brief $0
+ *
+ * @author `user-full-name`
+ * @date `(format-time-string "%Y-%m-%d")`
+ */
diff --git a/templates/auto-insert/template.hh b/templates/auto-insert/template.hh
new file mode 100644
index 0000000..0f9cb8e
--- /dev/null
+++ b/templates/auto-insert/template.hh
@@ -0,0 +1,16 @@
+/**
+ * @file `(buffer-name)`
+ * @brief $1
+ *
+ * $2
+ *
+ * @author MAGIT_USER or SYSTEM_USER
+ * @date `(format-time-string "%Y-%m-%d")`
+ */
+
+#ifndef `(git-include-guard-path)`
+#define `(git-include-guard-path)`
+
+$0
+
+#endif