From e9a5ac733db26414562d679cff552cb7d09246e8 Mon Sep 17 00:00:00 2001
From: Chris Cochrun <chris@tfcconneciton.org>
Date: Tue, 26 Apr 2022 12:41:51 -0500
Subject: [PATCH] adding temel stuff

---
 README.org | 15 ++++++++++++---
 init.el    | 13 +++++++++++--
 templates  |  4 ++++
 3 files changed, 27 insertions(+), 5 deletions(-)

diff --git a/README.org b/README.org
index d62f7181..a08453c9 100644
--- a/README.org
+++ b/README.org
@@ -287,7 +287,11 @@ Let's make parens and other delimiters easier to tell apart by making nested one
 (use-package aggressive-indent
   :defer 1
   :config
+<<<<<<< HEAD
   (aggressive-indent-mode -1))
+=======
+)
+>>>>>>> 2338cd74 (adding temel stuff)
 #+end_src
 
 #+begin_src emacs-lisp
@@ -1587,7 +1591,7 @@ Tempel is another templating system. Also perhaps even more powerful with it's e
 #+BEGIN_SRC emacs-lisp
 (use-package tempel
   :bind (("M-+" . tempel-complete) ;; Alternative tempel-expand
-         ("M-*" . tempel-insert)
+         ("M-'" . tempel-insert)
          ("C-M-<return>" . tempel-done))
 
   :init
@@ -1611,6 +1615,9 @@ Tempel is another templating system. Also perhaps even more powerful with it's e
   ;; either locally or globally. `expand-abbrev' is bound to C-x '.
   ;; (add-hook 'prog-mode-hook #'tempel-abbrev-mode)
   ;; (tempel-global-abbrev-mode)
+  :general
+  (chris/leader-keys
+    "it" 'tempel-insert)
 )
 #+END_SRC
 
@@ -1767,10 +1774,11 @@ Let's also set =hl-line-mode= to be on for comint and prog modes
 #+BEGIN_SRC emacs-lisp
 (add-hook 'comint-mode-hook 'hl-line-mode)
 (add-hook 'prog-mode-hook 'hl-line-mode)
+(add-hook 'prog-mode-hook 'hs-minor-mode)
 #+END_SRC
 
 *** C++
-In c++ I just want to make sure lsp is called when enter cc-mode
+In c++ I just want to make sure lsp is called when enter c++-mode
 #+BEGIN_SRC emacs-lisp
 (add-hook 'c++-mode-hook 'lsp)
 #+END_SRC
@@ -2798,7 +2806,8 @@ Since Bongo seems kinda difficult I shall give EMMS another try.
     :keymaps 'override
     "mo" 'emms
     "mb" 'emms-browser
-    "mp" 'emms-pause)
+    "mp" 'emms-pause
+    "ma" 'emms-add-dired)
   (general-def 'normal emms-playlist-mode-map
     "q" 'bury-buffer
     "d" 'emms-playlist-mode-kill-track
diff --git a/init.el b/init.el
index c296b2e4..80e950a2 100644
--- a/init.el
+++ b/init.el
@@ -126,7 +126,11 @@
 (use-package aggressive-indent
   :defer 1
   :config
+<<<<<<< HEAD
   (aggressive-indent-mode -1))
+=======
+)
+>>>>>>> 2338cd74 (adding temel stuff)
 
 (use-package adaptive-wrap
   :defer t)
@@ -1086,7 +1090,7 @@ targets."
 
 (use-package tempel
   :bind (("M-+" . tempel-complete) ;; Alternative tempel-expand
-         ("M-*" . tempel-insert)
+         ("M-'" . tempel-insert)
          ("C-M-<return>" . tempel-done))
 
   :init
@@ -1110,6 +1114,9 @@ targets."
   ;; either locally or globally. `expand-abbrev' is bound to C-x '.
   ;; (add-hook 'prog-mode-hook #'tempel-abbrev-mode)
   ;; (tempel-global-abbrev-mode)
+  :general
+  (chris/leader-keys
+    "it" 'tempel-insert)
 )
 
 (use-package projectile
@@ -1223,6 +1230,7 @@ targets."
 
 (add-hook 'comint-mode-hook 'hl-line-mode)
 (add-hook 'prog-mode-hook 'hl-line-mode)
+(add-hook 'prog-mode-hook 'hs-minor-mode)
 
 (add-hook 'c++-mode-hook 'lsp)
 
@@ -2034,7 +2042,8 @@ interfere with the default `bongo-playlist-buffer'."
     :keymaps 'override
     "mo" 'emms
     "mb" 'emms-browser
-    "mp" 'emms-pause)
+    "mp" 'emms-pause
+    "ma" 'emms-add-dired)
   (general-def 'normal emms-playlist-mode-map
     "q" 'bury-buffer
     "d" 'emms-playlist-mode-kill-track
diff --git a/templates b/templates
index 33283d42..e9ebaf53 100644
--- a/templates
+++ b/templates
@@ -70,6 +70,10 @@ c-mode :condition (re-search-backward "^\\w*$" (line-beginning-position) 'noerro
 (inc "#include <" (p (concat (file-name-base (or (buffer-file-name) (buffer-name))) ".h")) ">")
 (incc "#include \"" (p (concat (file-name-base (or (buffer-file-name) (buffer-name))) ".h")) "\"")
 
+c++-mode
+
+(Q_PROP "Q_PROPERTY(" (p "type") " " (p "name") " READ " (p "name") " WRITE set" (p "name") " NOTIFY " (p "name") "CHANGED)")
+
 org-mode
 
 (title "#+title: " p n "#+author: Chris Cochrun" n n)