From 220b8d987b1053671571cc570b3b334ab5dd6c9d Mon Sep 17 00:00:00 2001
From: Matthew Kosarek <mattkae@protonmail.com>
Date: Tue, 21 Jun 2022 06:44:57 -0400
Subject: C++ specific things

---
 .gitignore  |  4 +++-
 init.el     |  4 ++--
 init.el~    | 68 -------------------------------------------------------------
 lisp/cpp.el |  7 +++++--
 4 files changed, 10 insertions(+), 73 deletions(-)
 delete mode 100644 init.el~

diff --git a/.gitignore b/.gitignore
index 9b758b0..4deb2fa 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,4 @@
 elpa
-projectile-bookmarks.eld
\ No newline at end of file
+projectile-bookmarks.eld
+irony
+*~
\ No newline at end of file
diff --git a/init.el b/init.el
index a3281e5..2e54fff 100644
--- a/init.el
+++ b/init.el
@@ -14,7 +14,7 @@
 
 
 (setq package-list
-    '(tide auctex evil js2-highlight-vars ac-js2 js2-refactor js2-mode flycheck-irony company-irony all-the-icons req-package projectile irony org web-mode))
+    '(tide auctex evil js2-highlight-vars ac-js2 js2-refactor js2-mode flycheck-irony company-irony all-the-icons req-package projectile irony org web-mode cmake-mode rtags))
 
 ; fetch the list of packages available 
 (unless package-archive-contents
@@ -74,7 +74,7 @@
  '(org-agenda-files (list org-directory))
  '(org-directory "~/Documents/org")
  '(package-selected-packages
-   '(tide auctex evil js2-highlight-vars ac-js2 js2-refactor js2-mode flycheck-irony company-irony all-the-icons req-package projectile irony org)))
+   '(rtags cmake-ide cmake-mode tide auctex evil js2-highlight-vars ac-js2 js2-refactor js2-mode flycheck-irony company-irony all-the-icons req-package projectile irony org)))
 (custom-set-faces
  ;; custom-set-faces was added by Custom.
  ;; If you edit it by hand, you could mess it up, so be careful.
diff --git a/init.el~ b/init.el~
deleted file mode 100644
index 84c7b29..0000000
--- a/init.el~
+++ /dev/null
@@ -1,68 +0,0 @@
-;; Load path
-(add-to-list 'load-path "~/.emacs.d/lisp/")
-(add-to-list 'custom-theme-load-path "~/.emacs.d/themes")
-
-;; Melpa support
-(require 'package)
-(add-to-list 'package-archives '("melpa" . "https://melpa.org/packages/") t)
-;; Comment/uncomment this line to enable MELPA Stable if desired.  See `package-archive-priorities`
-;; and `package-pinned-packages`. Most users will not need or want to do this.
-;;(add-to-list 'package-archives '("melpa-stable" . "https://stable.melpa.org/packages/") t)
-(package-initialize)
-
-;; The default is 800 kilobytes.  Measured in bytes.
-(setq gc-cons-threshold (* 50 1000 1000))
-
-;; Profile emacs startup
-(add-hook 'emacs-startup-hook
-          (lambda ()
-            (message "*** Emacs loaded in %s seconds with %d garbage collections."
-                     (emacs-init-time "%.2f")
-                     gcs-done)))
-
-;; Theme
-(load-theme 'vs-light t)
-(set-face-attribute 'region nil :background "#ffffcd")
-(setq debug-on-error t)
-
-(require 'evil)
-(evil-mode 1)
-
-(require 'general)
-(setup-general)
-
-(require 'cpp)
-(add-hook 'c-mode-common-hook 'setup-c)
-
-(require 'text)
-(add-hook 'text-mode-hook 'setup-text-mode)
-
-(require 'org-custom)
-(add-hook 'org-mode-hook 'org-custom-hook)
-
-(require 'js-mode-custom)
-(setup-js)
-
-(require 'ts-custom)
-(setup-ts)
-
-(require 'latex-custom)
-(setup-latex)
-
-(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.
- '(custom-safe-themes
-   '("5859f61b502aa335b502b231c86a051210cb5974f74966e620c31be3a966659f" "32a9fa0f3722e679ed77a28aed3ae99161ef54dc27c35fd19e68e0410633960b" default))
- '(org-agenda-files (list org-directory))
- '(org-directory "~/Documents/org")
- '(package-selected-packages
-   '(auctex evil js2-highlight-vars ac-js2 js2-refactor js2-mode flycheck-irony company-irony all-the-icons req-package projectile irony org)))
-(custom-set-faces
- ;; custom-set-faces 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.
-)
diff --git a/lisp/cpp.el b/lisp/cpp.el
index 0fca237..77ca740 100644
--- a/lisp/cpp.el
+++ b/lisp/cpp.el
@@ -4,10 +4,10 @@
   (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)
+  (cmake-ide-setup)
+  ;; (electric-indent-mode 0)
   )
 
 ;; == irony-mode ==
@@ -51,4 +51,7 @@
 (eval-after-load 'flycheck
   '(add-hook 'flycheck-mode-hook #'flycheck-irony-setup))
 
+(require 'cmake-ide)
+
 (provide 'cpp)
+
-- 
cgit v1.2.1