config.org

@@ -94,7 +94,12 @@ 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)
-  (set-frame-font "xos4 Terminus 12")
+<<<<<<< HEAD
+  (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
@@ -260,7 +265,7 @@ you try to copmile vterm for further information.
 
 It should use your default shell by default.
 #+BEGIN_SRC emacs-lisp
-  (use-package vterm
+  (use-package "vterm"
        :ensure t)
 #+END_SRC
 And to have multiple buffers
@@ -272,10 +277,27 @@ And to have multiple buffers
 #+END_SRC
 ** Theme
 #+begin_src emacs-lisp
-  (use-package plan9-theme
+<<<<<<< HEAD
+  (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
-       :init(load-theme 'plan9 t))
+<<<<<<< HEAD
+       :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
@@ -287,12 +309,6 @@ 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.
@@ -312,9 +328,17 @@ 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
@@ -453,7 +477,7 @@ Scroll by lines rather than by pages.
 ** Mark multiple
 Multiple cursors :DD
 #+begin_src emacs-lisp
-  (use-package multiple-cursors
+  (use-package "multiple-cursors"
        :ensure t
        :bind ("C-x q" . 'mc/mark-next-like-this))
 
@@ -462,7 +486,7 @@ Multiple cursors :DD
 ** Highlight indent guides
 I don't really know, it looks cool.
 #+begin_src emacs-lisp
-  (use-package highlight-indent-guides
+  (use-package "highlight-indent-guides"
        :ensure t
        :defer
        :init (add-hook 'prog-mode-hook 'highlight-indent-guides-mode)
@@ -474,13 +498,13 @@ Fly to live, do or die
 Won't you run, live to fly
 Fly to live, aces high
 #+begin_src emacs-lisp
-  (use-package ace-jump-mode
+  (use-package "ace-jump-mode"
        :ensure t
        :bind("C-l" . 'ace-jump-mode))
 #+end_src
 And same but jumping between frames
 #+begin_src emacs-lisp
-  (use-package ace-window
+  (use-package "ace-window"
        :ensure t
        :bind("M-l" . 'ace-window)
        :bind("M-o" . 'ace-delete-window))
@@ -504,12 +528,16 @@ And same but jumping between frames
 #+end_src
 ** Beacon mode
 #+begin_src emacs-lisp
-  (use-package beacon
+  (use-package "beacon"
        :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
@@ -524,27 +552,32 @@ I am tired of =M-x auto-fill-mode= in some modes
 Having to delete multiple whitespaces is one of the things I hate,
 thankfully there's this thing.
 #+begin_src emacs-lisp
-  (use-package hungry-delete
+  (use-package "hungry-delete"
        :ensure t
        :init(global-hungry-delete-mode))
 #+end_src
 ** Yasnippet
 #+begin_src emacs-lisp
-  (use-package yasnippet
+  (use-package "yasnippet"
        :ensure t
        :config
-       (use-package yasnippet-snippets
+       (use-package "yasnippet-snippets"
             :ensure t)
        :init(yas-global-mode)
        (yas-reload-all))
 #+end_src
 ** Org-mode customization
 #+begin_src emacs-lisp
-  (use-package org-bullets
+  (use-package "org-bullets"
        :ensure t
        :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
@@ -579,13 +612,13 @@ stuff. And has support for Perl regular expressions. Because it is
 written in Perl.
 
 #+begin_src emacs-lisp
-  (use-package ack
+  (use-package "ack"
        :ensure t)
 #+end_src
 ** whitespace-cleanup-mode
 Useful for makefiles.
 #+begin_src emacs-lisp
-(use-package whitespace-cleanup-mode
+(use-package "whitespace-cleanup-mode"
 	:ensure t
 	:init(add-hook 'after-init-hook 'whitespace-cleanup-mode))
 #+end_src
@@ -597,7 +630,27 @@ 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
@@ -616,6 +669,11 @@ 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)
@@ -691,7 +749,7 @@ Yes.
 * CRUX
 This thing add sane shortcuts for emacs
 #+begin_src emacs-lisp
-  (use-package crux
+  (use-package "crux"
        :ensure t
        :bind("C-k" . 'crux-smart-kill-line)
        :bind("C-c o" . 'crux-open-with)
@@ -730,7 +788,7 @@ create it in case you accidentally killed the buffer)
 
 * Modeline
 #+begin_src emacs-lisp
-  (use-package doom-modeline
+  (use-package "doom-modeline"
        :ensure t
        :init(doom-modeline-mode)
        :config