Emacs fira-code-mode fix

users/profiles/emacs/emacs.d/config/aesthetics.el

@@ -10,10 +10,11 @@
 )  
 
 (use-package fira-code-mode
-  :custom (fira-code-mode-disabled-ligatures '("x")) ;; List of ligatures to turn off
+  ;;:custom (fira-code-mode-disabled-ligatures '("x")) ;; List of ligatures to turn off
-  :config
+  :config (progn
-  (fira-code-mode-set-font)
+	    (global-fira-code-mode)
-  (global-fira-code-mode))
+	    ;;TODO: why a timer is needed? It shouldn't
+	    (run-at-time "30 sec" nil #'set-fontset-font t '(#Xe100 . #Xe16f) "Fira Code Symbol")))
 
 (use-package visual-fill-column
   :commands (visual-fill-column-mode)
@@ -39,8 +40,6 @@
   :bind (("<next>" . #'good-scroll-up-full-screen)
 	 ("<prior>" . #'good-scroll-down-full-screen))) 
 
-
-
 (use-package rainbow-identifiers
   :hook ((prog-mode . rainbow-identifiers-mode)))
 

users/profiles/emacs/emacs.d/config/config-org.el

@@ -4,11 +4,8 @@
     (require 'org-protocol)
   :custom
   (org-startup-folded 'fold)
-<<<<<<< HEAD
-  (org-startup-indented nil)
-=======
   (org-startup-indented f)
->>>>>>> 087566ed5f0d08df2e0b36e4c80398f5c0d26c22
+  (org-startup-indented nil)
   (org-agenda-files '("~/roam/" "~/orgzly~"))
   (org-ellipsis "⤵")
   (org-pretty-entities t)
@@ -52,7 +49,6 @@
 (use-package org-superstar
   :custom
   (org-superstar-special-todo-items t)
-  (org-superstar-headline-bullets-list '("\u200b"))
   :hook
   (('org-mode . (lambda () (org-superstar-mode 1)))))