fixed

config.org

@@ -94,12 +94,7 @@ it. I don't think i'd ever use the overwritten.
   (global-set-key (kbd "M-m") 'mark-whole-buffer)
   (global-set-key (kbd "C-c m") 'man)
   (define-key org-mode-map (kbd "C-c p") 'org-publish-current-file)
-<<<<<<< HEAD
+  (set-frame-font "xos4 Terminus 12")
-  (set-frame-font "Monospace 12")
-||||||| parent of 5575988 (no se ni que he hecho)
-  (set-frame-font "Hack 17")
-=======
->>>>>>> 5575988 (no se ni que he hecho)
 #+END_SRC
   
 * No idea
@@ -277,27 +272,11 @@ And to have multiple buffers
 #+END_SRC
 ** Theme
 #+begin_src emacs-lisp
-<<<<<<< HEAD
+  (use-package "plan9-theme"
-  (use-package "base16-theme"
-||||||| parent of 5575988 (no se ni que he hecho)
-  (use-package "exotica-theme"
-=======
-  (use-package "zweilight-theme"
->>>>>>> 5575988 (no se ni que he hecho)
        :ensure t
-<<<<<<< HEAD
+       :init(load-theme 'plan9 t)
-       :init(load-theme 'base16-black-metal-bathory t)
        )
-||||||| parent of 5575988 (no se ni que he hecho)
-       :init(load-theme 'exotica t)
-       )
-=======
-       :init(load-theme 'zweilight t))
-  (set-frame-font "Inconsolata 15")
->>>>>>> 5575988 (no se ni que he hecho)
   (set-cursor-color "purple")
-
-#+end_src
 ** ctrlf
 So, you know, C-s in emacs sucks, so this is a repleacement for that.
 #+BEGIN_SRC emacs-lisp
@@ -309,6 +288,12 @@ So, you know, C-s in emacs sucks, so this is a repleacement for that.
 #+END_SRC
 
 ** Programming language things
+*** LSP
+Le language server
+#+begin_src emacs-lisp
+  (use-package "lsp-mode"
+       :ensure t)
+#+end_src
 *** Lisp
 Parentheses highlight in lisp modes. So you can easily identify
 them.
@@ -328,17 +313,9 @@ I use LSP for perl.
   (setq perl-indent-level 5)
   (defalias 'perl-mode 'cperl-mode)
   (add-hook 'perl-mode-hook (lambda ()
-<<<<<<< HEAD
                                  (lsp)
                                  (irony-mode -1)))
   (load-file "~/.config/emacs/perltidy.el")
-||||||| parent of 5575988 (no se ni que he hecho)
-                                 (lsp)
-                                 (irony-mode -1)))
-=======
-                                 (lsp)))
-  (load-file "~/.config/emacs/perltidy.el")
->>>>>>> 5575988 (no se ni que he hecho)
 #+END_SRC
 *** C*
 This use c-eldoc mode so it prints the function's prototype in the
@@ -532,12 +509,8 @@ And same but jumping between frames
        :ensure t
        :init(beacon-mode 1))
 #+end_src
-** LSP
+
-Le language server
+*
-#+begin_src emacs-lisp
-  (use-package "lsp-mode"
-       :ensure t)
-#+end_src
 ** Hooks
 I am tired of =M-x auto-fill-mode= in some modes
 #+begin_src emacs-lisp
@@ -573,11 +546,6 @@ thankfully there's this thing.
        :config
        (add-hook 'org-mode-hook 'org-bullets-mode))
   (local-unset-key (kbd"C-c C-q"))
-  (set-face-font 'org-level-1 "IBM Plex Mono 16")
-  (set-face-font 'org-level-2 "IBM Plex Mono 15")
-  (set-face-font 'org-level-3 "IBM Plex Mono 14")
-  (set-face-font 'org-level-4 "IBM Plex Mono 14")
-  (set-face-font 'org-level-5 "IBM Plex Mono 14")
   (setq org-hide-emphasis-markers t)
 #+end_src
 ** zzz-to-char
@@ -630,27 +598,7 @@ Yes.
        :init(nyan-mode))
 
 #+end_src
-<<<<<<< HEAD
-** Orderless
-#+begin_src emacs-lisp
-  (use-package orderless
-    :ensure t
-    :custom
-    (completion-styles '(orderless basic))
-    (completion-category-overrides '((file (styles basic partial-completion)))))
-#+end_src
-** web-mode
-#+begin_src emacs-lisp
-  (use-package web-mode
-       :ensure t
-       :config
-       (define-key web-mode-map (kbd "C-c C-e") 'web-mode-element-close)
-       (add-to-list 'auto-mode-alist '("\\.html?\\'" . web-mode))
-       (define-key web-mode-map (kbd "C-c C-o") 'web-mode-element-insert))
-#+end_src
-||||||| parent of 5575988 (no se ni que he hecho)
 
-=======
 ** Orderless
 #+begin_src emacs-lisp
   (use-package orderless
@@ -669,11 +617,6 @@ Yes.
        (define-key web-mode-map (kbd "C-c C-o") 'web-mode-element-insert))
 #+end_src
 
->>>>>>> 5575988 (no se ni que he hecho)
-* Vertico
-Better interactive selection minibuffer. Alternative to ido and
-helm. This also installs =marginalia-mode=. So you can have further
-information of the commands, files and stuff in the minibuffer.
 #+begin_src emacs-lisp
   (use-package marginalia
        :ensure t)