Merge branch 'master' of matthewkosarek.xyz:/srv/git/emacs_config

2 files changed, 32 insertions, 20 deletions

diff --git a/lisp/cpp.el b/lisp/cpp.el
index d7a58e7..264c059 100644
--- a/lisp/cpp.el
+++ b/lisp/cpp.el
@@ -5,22 +5,23 @@
   (setq c++-tab-always-indent 0)
   (setq c-basic-offset 4)                  ;; Default is 2
   (setq c-indent-level 4)                  ;; Default is 2
-  (c-set-offset 'brace-list-open 0)
 
   (setq tab-stop-list '(4 8 12 16 20 24 28 32 36 40 44 48 52 56 60))
   (setq tab-width 4)
-  ;; (electric-indent-mode 0)
   )
 
 (add-hook 'c-mode-common-hook 'setup-c)
 
+(c-set-offset 'brace-list-open 0)
+(c-set-offset 'substatement-open 0)
+(c-set-offset 'arglist-intro '+)
+(c-set-offset 'arglist-cont-non-empty '+)
+
 (defun create-cpp-class()
   "Create a cpp class."
   (interactive "Enter the name of the class: ")
   )
 
-(defun me:c-mode-config ()   
-  (c-set-style "ellemtel"))
 
 (provide 'cpp)
 ;;; cpp.el ends here
diff --git a/lisp/general.el b/lisp/general.el
index 068552e..7155d8a 100644
--- a/lisp/general.el
+++ b/lisp/general.el
@@ -191,15 +191,16 @@
   :ensure t)
 
 ;; Emojis
-(use-package emojify
-  :ensure t
-  :config
-  (when (member "Segoe UI Emoji" (font-family-list))
-    (set-fontset-font
-     t 'symbol (font-spec :family "Segoe UI Emoji") nil 'prepend))
-  (setq emojify-display-style 'unicode)
-  (setq emojify-emoji-styles '(unicode))
-  (bind-key* (kbd "C-c e") #'emojify-insert-emoji)) ; override binding in any mode
+;; (use-package emojify
+;;   :ensure t
+;;   :config
+;;   (when (member "Segoe UI Emoji" (font-family-list))
+;;     (set-fontset-font
+;;      t 'symbol (font-spec :family "Segoe UI Emoji") nil 'prepend))
+;;   (setq emojify-display-style 'unicode)
+;;   (setq emojify-emoji-styles '(unicode))
+;;   (bind-key* (kbd "C-c e") #'emojify-insert-emoji)) ; override binding i
+;;  n any mode
 
 ;; icons
 (use-package all-the-icons
@@ -220,6 +221,7 @@
         company-minimum-prefix-length   2
         company-tooltip-limit           10
         company-backends                '((company-capf company-gtags company-elisp company-css company-dabbrev company-nxml))
+        company-dabbrev-downcase nil
         )
   )
 
@@ -244,6 +246,9 @@
 
 (set-face-underline 'eglot-highlight-symbol-face t)
 
+(bind-key* (kbd "M-n") 'flymake-goto-next-error)
+(bind-key* (kbd "M-p") 'flymake-goto-prev-error)
+
 ;; Vterm
 
 (defun vterm-mode-set-colors()
@@ -293,12 +298,6 @@
   (define-key drag-stuff-mode-map (drag-stuff--kbd 'down) 'drag-stuff-down)
   )
 
-(use-package flycheck
-  :ensure t
-  :config
-  (setq flycheck-check-syntax-automatically '(save mode-enable))
-  '(flycheck-idle-change-delay 1))
-
 ;; Snippets
 (use-package yasnippet
   :ensure t
@@ -314,7 +313,19 @@
   :ensure t)
 
 (use-package ledger-mode
-  :ensure t)
+  :ensure t
+  :config
+  (add-to-list 'auto-mode-alist '("\\.ledger\\'" . ledger-mode)))
+
+(use-package plantuml-mode
+  :ensure t
+  :config
+  (add-to-list 'auto-mode-alist '("\\.puml\\'" . plantuml-mode)))
+
+(add-hook 'plantuml-mode-hook
+          (lambda ()
+            (setq indent-line-function (lambda () 'noindent))))
+
 
 (provide 'general)
 ;;; general.el ends here