chore(evil): Refine keybinds and remove Emacs-like mappings

configs/init-evil.el

@@ -35,9 +35,6 @@
                                                       (call-interactively 'corfu-quit)
                                                       (evil-normal-state)))
 
-  ;; (evil-define-key 'normal 'global (kbd "<escape>") 'corfu-quit)
-  ;; Cambiar a mode emacs con escape
-  ;; (evil-define-key 'emacs 'global (kbd "<escape>") 'evil-normal-state)
   ;; Cambiar Insert state por emacs state.
   (defalias 'evil-insert-state 'evil-emacs-state)
 
@@ -51,34 +48,34 @@
 
   ;; Cambiar C-z a deshacer
   (evil-define-key all-states 'global (kbd "C-z") 'undo)
+  (evil-define-key all-states 'global (kbd "C-S-z") 'undo-redo)
 
   ;; Cambiar U para hacer redo
   (evil-define-key 'normal 'global (kbd "U") 'undo-redo)
-  (evil-define-key 'normal 'global (kbd "C-S-z") 'undo-redo)
   (evil-define-key 'normal 'global (kbd "M-.") 'xref-find-definitions)
 
   ;; Arreglar yank-pop en normal mode
-  (evil-define-key 'normal 'global (kbd "M-y") 'consult-yank-pop)
+  ;; (evil-define-key 'normal 'global (kbd "M-y") 'consult-yank-pop)
 
   ;; Re-bindear keys a como funcionan en emacs.
-  (evil-define-key 'normal 'global (kbd "C-p") 'previous-line)
+  ;; (evil-define-key 'normal 'global (kbd "C-p") 'previous-line)
-  (evil-define-key 'normal 'global (kbd "C-n") 'next-line)
+  ;; (evil-define-key 'normal 'global (kbd "C-n") 'next-line)
-  (evil-define-key 'normal 'global (kbd "C-e") 'move-end-of-line)
+  ;; (evil-define-key 'normal 'global (kbd "C-e") 'move-end-of-line)
 
   ;; Navegación entre frames
   (evil-define-key 'motion 'global (kbd "<leader>o") 'other-window)
 
   ;; Habilitar el scrolear con C-v como en emacs en evil
-  (evil-define-key 'motion 'global (kbd "C-v") 'scroll-up-command)
+  ;; (evil-define-key 'motion 'global (kbd "C-v") 'scroll-up-command)
 
   ;; Añadir nueva linea sin salir del modo normal
-  (evil-define-key 'motion 'global (kbd "<leader><RET>") 'newline)
+  ;; (evil-define-key 'motion 'global (kbd "<leader><RET>") 'newline)
 
   ;; Abrir historial del kill-ring/portapapeles
   (evil-define-key vim-states 'global (kbd "<leader>y") 'consult-yank-pop)
 
   ;; Expand region desde motion states
-  (evil-define-key 'motion 'global (kbd "<leader>+") 'er/expand-region)
+  (evil-define-key 'motion 'global (kbd "<leader>=") 'er/expand-region)
 
   ;; Indentado en motion modes.
   (evil-define-key 'motion 'global (kbd "<tab>") 'indent-for-tab-command)

configs/init-org.el

@@ -21,8 +21,6 @@
   "Configuración para el hook de 'org-mode'."
 
   (display-line-numbers-mode 0)
-  (visual-line-mode 1)
-  (visual-fill-column-mode 1)
 
   ;; Configuracin para Systanx Highlight en porg-blocks
   (add-to-list 'org-src-lang-modes (cons "html" 'mhtml))
@@ -88,7 +86,8 @@
 (use-package org
   :ensure nil
   :hook
-  (org-mode . kj/org-hook)
+  ((org-mode . kj/org-hook)
+   (org-mode . visual-line-fill-column-mode))
   :config
   (setq org-ellipsis " ▾")
   (setq org-hide-emphasis-markers t)
@@ -119,8 +118,8 @@
 
   ;; Tachar los checkbox marcados como terminados
   (defface org-checkbox-done-text
-  '((t (:foreground "#71696A" :strike-through t)))
+    '((t (:foreground "#71696A" :strike-through t)))
-  "Face for the text part of a checked org-mode checkbox.")
+    "Face for the text part of a checked org-mode checkbox.")
 
   (font-lock-add-keywords
    'org-mode

configs/init-ui.el

@@ -25,6 +25,8 @@
   :bind ([f9] . dired-sidebar-toggle-sidebar)
   :commands (dired-sidebar-toggle-sidebar)
   :config
+  ;; Show directories first
+  (setq dired-listing-switches "-la --group-directories-first")
   (setq dired-sidebar-theme 'nerd
         dired-sidebar-window-fixed nil
         ;; dired-sidebar-should-follow-file t

configs/lang-php.el

@@ -32,18 +32,8 @@
 
 (use-package php-cs-fixer
   :custom
-  (php-cs-fixer-rules-level-part-options (list (json-encode '(("@PSR12" . t)
+  (php-cs-fixer-config-option (expand-file-name
-                                                              ("ordered_imports" . (("sort_algorithm" . "alpha")))
+                               (concat user-emacs-directory "php-cs-fixer-config")))
-                                                              ("concat_space" . (("spacing" . "one")))
-                                                              ("whitespace_after_comma_in_array" . t)
-                                                              ("align_multiline_comment" . t)
-                                                              ("no_unused_imports" . t)
-                                                              ("phpdoc_align" . t)
-                                                              ("phpdoc_indent" . t)
-                                                              ("no_useless_return" . t)
-                                                              ("return_assignment" . t)
-                                                              ("trailing_comma_in_multiline" . t)))))
-  (php-cs-fixer-rules-fixer-part-options '())
   ;; :hook (before-save . php-cs-fixer-before-save)
   )
 

php-cs-fixer-config

@@ -0,0 +1,24 @@
+#!/usr/bin/php
+<?php
+
+error_reporting(E_ALL);
+
+$finder = \PhpCsFixer\Finder::create();
+
+$config = new \PhpCsFixer\Config();
+$config->setRules([
+    '@PSR12' => true,
+    'ordered_imports' => ['sort_algorithm' => 'alpha'],
+    'concat_space' => ['spacing' => 'one'],
+    'whitespace_after_comma_in_array' => true,
+    'align_multiline_comment' => true,
+    'no_unused_imports' => true,
+    'phpdoc_align' => true,
+    'phpdoc_indent' => true,
+    // 'psr_autoloading' => true,
+    'no_useless_return' => true,
+    'return_assignment' => true,
+    'trailing_comma_in_multiline' => true,
+])->setRiskyAllowed(true);
+
+return $config->setFinder($finder);