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

refactor(php-cs-fixer): Move rules to external config file
feat(dired-sidebar): Show directories first in sidebar
2025-10-20 14:23:44 -03:00 · 2025-10-20 14:22:46 -03:00 · 2025-10-20 14:21:35 -03:00 · 2025-10-20 14:21:06 -03:00 · 2025-10-02 14:27:45 -03:00 · 2025-09-30 06:30:46 -03:00
9 changed files with 57 additions and 86 deletions
--- a/28
+++ b/28
@@ -14,34 +14,6 @@
    ("doctype" "<!DOCTYPE html>" nil :count 0)
   ))

-(define-abbrev-table 'php-ts-mode-abbrev-table
-  '(
-    ("bwtest" "use Tests\\TestCase;
-
-class Test extends TestCase
-{
-    /**
-     * @group
-     * @group
-     * @test
-     */
-    public function Service()
-    {
-        /**
-         * Preparing
-         */
-
-        /**
-         * Actions
-         */
-
-        /**
-         * Asserts
-         */
-    }
-}" nil :count 6)
-   ))
-
 (define-abbrev-table 'web-mode-abbrev-table
  '(
    ("doc" "<!DOCTYPE html>
--- a/configs/init-ai.el
+++ b/configs/init-ai.el
@@ -12,17 +12,22 @@
 ;; Cliente LLM (ollama, chatgpt, gemini, etc.)
 (use-package gptel
  :config
-  ;; (setq gptel-model 'gemma3:4b
-  ;;       gptel-backend (gptel-make-ollama "Ollama"
-  ;;                       :host "localhost:11434"
-  ;;                       :stream t
-  ;;                       :models '("mistral:latest"
-  ;;                                 "deepseek-r1:1.5b"
-  ;;                                 "deepcoder"
-  ;;                                 "dolphin-llama3:latest"
-  ;;                                 "gemma3:4b"
-  ;;                                 "llava:latest"))
-        gptel-default-mode 'org-mode
+  (if (getenv "GEMINI_KEY")
+      (setq gptel-model 'gemini-2.5-flash
+            gptel-backend (gptel-make-gemini "Gemini"
+                            :key (getenv "GEMINI_KEY")
+                            :stream t))
+    (setq gptel-model 'gemma3:4b
+          gptel-backend (gptel-make-ollama "Ollama"
+                          :host "localhost:11434"
+                          :stream t
+                          :models '("mistral:latest"
+                                    "deepseek-r1:1.5b"
+                                    "deepcoder"
+                                    "dolphin-llama3:latest"
+                                    "gemma3:4b"
+                                    "llava:latest"))))
+  (setq gptel-default-mode 'org-mode
        gptel-prompt-prefix-alist
        '((markdown-mode . "# User\n\n")
          (org-mode . "* User\n\n")
--- a/configs/init-evil.el
+++ b/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-n") 'next-line)
-  (evil-define-key 'normal 'global (kbd "C-e") 'move-end-of-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-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)
--- a/configs/init-lsp.el
+++ b/configs/init-lsp.el
@@ -45,23 +45,6 @@
  :config
  (setq eglot-sync-connect 0)
  (add-to-list 'eglot-server-programs '(php-mode . ("intelephense" "--stdio")))
-
-  (add-to-list 'eglot-server-programs
-               '((tsx-ts-mode
-                  ;; js-ts-mode
-                  ;; js-mode
-                  typescript-ts-mode
-                  typescript-mode)
-                 .
-                 (eglot-deno "deno" "lsp")))
-
-  (defclass eglot-deno (eglot-lsp-server) ()
-    :documentation "A custom class for deno lsp.")
-
-  (cl-defmethod eglot-initialization-options ((server eglot-deno))
-    "Passes through required deno initialization options"
-    (list :enable t
-          :lint t))
  )

 ;; Mejorar la velocidad de eglot (un binario en rust )
--- a/configs/init-org.el
+++ b/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)
--- a/configs/init-ui.el
+++ b/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
--- a/configs/init-utils.el
+++ b/configs/init-utils.el
@@ -56,8 +56,7 @@
  :ensure nil
  :bind (("s-u" . winner-undo)
         ("s-U" . winner-redo))
-  :config
-  (winner-mode))
+  :hook (elpaca-after-init . winner-mode))

 ;; Moverme entre frames
 (use-package windmove
--- a/configs/lang-php.el
+++ b/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)
-                                                              ("ordered_imports" . (("sort_algorithm" . "alpha")))
-                                                              ("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 '())
+  (php-cs-fixer-config-option (expand-file-name
+                               (concat user-emacs-directory "php-cs-fixer-config")))
  ;; :hook (before-save . php-cs-fixer-before-save)
  )

--- a/24
+++ b/24
@@ -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);
Author	SHA1	Message	Date
kj	e2943af548	chore(evil): Refine keybinds and remove Emacs-like mappings	2025-10-20 14:23:44 -03:00
kj	cb8b34bae7	refactor(php-cs-fixer): Move rules to external config file	2025-10-20 14:22:46 -03:00
kj	9a5f61bbdd	feat(dired-sidebar): Show directories first in sidebar	2025-10-20 14:21:35 -03:00
kj	c7c54fdeab	refactor(org): Move visual line and fill column config	2025-10-20 14:21:06 -03:00
kj	844e2965db	feat(ai): Add Gemini backend with Ollama fallback Prioritize Gemini backend if GEMINI_KEY enviroment variable is present, otherwise fallback to the local Ollama instance.	2025-10-02 14:27:45 -03:00
kj	9cce858cd5	Delete unused PHP test abbrev boilerplate	2025-09-30 06:30:46 -03:00
kj	7967a5f0f9	Remove custom Deno LSP configuration	2025-09-30 06:29:55 -03:00
kj	970699f934	Move winner-mode init to elpaca-after-init hook	2025-09-30 05:58:31 -03:00