removing some things

README.org

@@ -419,8 +419,7 @@ This evil-collection package includes a lot of other evil based things.
     "wh" '(evil-window-left :which-key "left window")
     "wl" '(evil-window-right :which-key "right window")
     ";" '(execute-extended-command :which-key "execute command")
-    ":" '(eval-expression :which-key "evaluate expression")
-    )
+    ":" '(eval-expression :which-key "evaluate expression"))
   (general-def 'minibuffer-local-map
     "C-v" 'evil-paste-after)
   (general-def 'normal
@@ -743,6 +742,7 @@ YASnippet is a templating system. It's powerful.
 I'm going to use projectile to keep my projects inline.
 #+begin_src emacs-lisp
 (use-package projectile
+  :defer t
   :general
   (chris/leader-keys
     :states 'normal
@@ -859,13 +859,12 @@ Since I like to make my window manager handle a lot of the window management, I
 #+end_src
 
 ** Languages
-<<<<<<< HEAD
 Before getting into languages, often times compilation of things use ansi-colors, so in order to make sure those characters get rendered properly, here we make sure that those colors work ok.
+
 #+BEGIN_SRC emacs-lisp
 (defvar read-symbol-positions-list nil)
 (add-hook 'comint-mode-hook 'ansi-color-for-comint-mode-on)
 #+END_SRC
-=======
 
 *** C++
 In c++ I just want to make sure lsp is called when enter cc-mode
@@ -873,7 +872,6 @@ In c++ I just want to make sure lsp is called when enter cc-mode
 (add-hook 'c++-mode-hook 'lsp)
 #+END_SRC
 
->>>>>>> bc54f870 (fixing a bunch of broken stuff I think)
 *** Lua
 Since I use the Awesome WM I thought it'd be good to have lua around. It's also in a lot of things.
 #+begin_src emacs-lisp
@@ -1481,6 +1479,7 @@ In order to use it, I need to go to http://localhost:8080
         org-roam-ui-open-on-start t))
 
 #+END_SRC
+
 *** Org-Superstar
 Org-Superstar makes the stars at the beginning of the line in =org-mode= a lot prettier.
 #+begin_src emacs-lisp
@@ -1495,6 +1494,12 @@ Org-Superstar makes the stars at the beginning of the line in =org-mode= a lot p
   (set-face-attribute 'org-superstar-item nil :inherit 'org-level-3)
   (add-hook 'org-mode-hook 'org-superstar-mode))
 #+end_src
+
+*** Org Modern
+#+BEGIN_SRC emacs-lisp :tangle no
+(use-package org-modern
+  :straight (:host github :repo "minad/org-modern"))
+#+END_SRC
 *** Org DWIM
 I've stolen most of this code from Doom Emacs but we want to create a dwim-at-point function for Org-Mode that will fit under the =RET= key. This allows us to do a bunch of different functions depending on the context of point.
 #+begin_src emacs-lisp