Compare commits

..

14 Commits

Author SHA1 Message Date
0f16547bcb feat(ai): Fully remove eca package 2026-04-20 11:52:02 -03:00
608eee5167 feat(ai): Add gptel-agent 2026-04-20 11:51:03 -03:00
0a752577fc fix(lsp): Disable flycheck global for org-mode by default 2026-04-20 11:49:59 -03:00
3f6e673a6b refactor(config): disable eca and add gptel-complete 2026-04-20 09:22:14 -03:00
a285f0b68e feat(ai): Directly disable thinking for ollama 2026-04-20 02:24:56 -03:00
217ad59844 chore(ai): Update Ollama AI model list 2026-04-19 19:26:06 -03:00
fc35b7b0eb fix(minibuffer): Change C-' binding to consult-register 2026-04-16 11:54:12 -03:00
ddad78fea1 Fix(ai): Use gemma3n:e2b model by default for ollama gptel 2026-04-16 11:52:36 -03:00
2ca9c993fd feat(ai): Add gptel switch and allow use ollama alongside gemini 2026-04-16 11:42:32 -03:00
5a2483cdfa feat(gptel): Add new Ollama models and configure request params 2026-04-16 10:38:40 -03:00
fc51e197ea chore(config): Update elpaca setup paths and version 2026-04-16 08:49:45 -03:00
89b7ffbbba chore: Remove custom comment/uncomment function 2026-04-14 13:25:22 -03:00
ff1afcf073 refactor(drag-stuff): Configure diferent keybindings using :bind 2026-04-14 13:23:17 -03:00
9350f41fe2 chore(keybindings): Migrate windmove and window navigation to Meta 2026-04-14 13:22:06 -03:00
8 changed files with 87 additions and 52 deletions

View File

@@ -11,23 +11,36 @@
;; Cliente LLM (ollama, chatgpt, gemini, etc.)
(use-package gptel
:defer nil
:config
(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"
"glm-5:cloud"
"dolphin-llama3:latest"
"gemma3:4b"
"llava:latest"))))
(setq gptel-model 'gemma4:e2b
gptel-backend (gptel-make-ollama "Ollama"
:host "localhost:11434"
:stream t
:request-params '(:think :json-false)
:models '("cajina/gemma4_e2b-Q4_k_s:v01"
"su_robin/gemma-4-E4B-it-Q4_K_M:latest"
"dagbs/qwen2.5-coder-0.5b-instruct-abliterated:q4_k_l"
"jewelzufo/Qwen2.5-Coder-0.5B-Instruct-GGUF-Assistant:latest"
"jaahas/qwen3.5-uncensored:4b"
"jaahas/qwen3.5-uncensored:2b"
"qwen3.5:4b"
"qwen3.5:2b"
"gemma4:e2b"
"glm-5.1:cloud"
"gemma4:31b-cloud"
"minimax-m2.5:cloud"
"gpt-oss:120b-cloud"
"gemini-3-flash-preview:cloud"
"glm-5:cloud"
"qwen3-coder-next:cloud"
"qwen3-coder:480b-cloud"
"embeddinggemma:latest")))
(when (getenv "GEMINI_KEY")
(setq gptel-model 'gemini-2.5-flash
gptel-backend (gptel-make-gemini "Gemini"
:key (getenv "GEMINI_KEY")
:stream t)))
(setq gptel-default-mode 'org-mode
gptel-prompt-prefix-alist
'((markdown-mode . "# User\n\n")
@@ -40,7 +53,33 @@
gptel-directives
'((default . "You are a large language model living in Emacs and a helpful assistant. Respond concisely in Spanish."))
)
(setopt gptel-include-reasoning nil)) ;; Mantener hasta resolver: https://github.com/ragnard/gptel-magit/issues/8
(setopt gptel-include-reasoning nil) ;; Mantener hasta resolver: https://github.com/ragnard/gptel-magit/issues/8
(defun gptel-switch+model ()
"Switch to gptel backend and model in a single completion prompt."
(interactive)
(let (choices)
(dolist (pair gptel--known-backends)
(let* ((backend-name (car pair))
(backend (cdr pair))
(models
(and (fboundp 'gptel-backend-models)
(gptel-backend-models backend))))
(when models
(dolist (model models)
(push (cons ; (format "%s:%s" backend-name model)
(format "%s → %s"
(propertize backend-name 'face 'font-lock-keyword-face)
(propertize (symbol-name model) 'face 'font-lock-function-name-face))
(cons backend-name model))
choices)))))
(let* ((choice
(completing-read "Model: " (mapcar #'car choices) nil t))
(sel (cdr (assoc choice choices))))
(setq gptel-backend (cdr (assoc (car sel) gptel--known-backends))
gptel-model (cdr sel))
(message "gptel set to %s:%s" (car sel) (cdr sel)))))
)
;; (use-package copilot
;; :hook (prog-mode . copilot-mode)
@@ -49,17 +88,20 @@
;; ("C-<return>" . 'copilot-accept-completion)
;; ("S-<return>" . 'copilot-accept-completion-by-word)))
;; El asistente más completo de todos: Tiene chat mpc, code completion, etc.
(use-package eca
;; :hook (prog-mode . eca-completion-mode)
:bind (("M-<return>" . eca-complete)
:map eca-completion-map
("C-<return>" . eca-completion-accept)))
(use-package gptel-magit
:ensure t
:hook (magit-mode . gptel-magit-install))
(use-package gptel-autocomplete
:ensure (:host github :repo "JDNdeveloper/gptel-autocomplete")
:bind (("M-<return>" . gptel-complete)
:map gptel-autocomplete-completion-map
("C-<return>" . gptel-accept-completion)))
(use-package gptel-agent
:ensure t
:config (gptel-agent-update))
(use-package macher
:ensure (:host github :repo "kmontag/macher")
:custom

View File

@@ -60,11 +60,15 @@
;; Mover líneas o regiones con M-<teclas de dirección>
(use-package drag-stuff
:diminish
:autoload drag-stuff-define-keys
;; :autoload drag-stuff-define-keys
:hook (elpaca-after-init . drag-stuff-global-mode)
:config
(add-to-list 'drag-stuff-except-modes 'org-mode)
(drag-stuff-define-keys))
:bind (:map drag-stuff-mode-map
("M-p" . drag-stuff-up)
("M-n" . drag-stuff-down))
;; :config
;; (add-to-list 'drag-stuff-except-modes 'org-mode)
;; (drag-stuff-define-keys)
)
;; A comprehensive visual interface to diff & patch
(use-package ediff

View File

@@ -15,18 +15,6 @@
(interactive "nTransparency Value 0 - 100 opaque:")
(set-frame-parameter nil 'alpha-background value))
;; Comentar línea o región
(defun comment-or-uncomment-region-or-line ()
"Comments or uncomments the region or the current line."
(interactive)
(let (beg end)
(if (region-active-p)
(setq beg (region-beginning) end (region-end))
(setq beg (line-beginning-position) end (line-end-position)))
(comment-or-uncomment-region beg end)
;;(next-line) ;; saltar a la siguiente línea
))
;; Duplicar la línea actual
(defun duplicate-current-line (&optional n)
"Duplicate current line, make more than 1 copy given a numeric (N) argument."

View File

@@ -17,8 +17,6 @@
(global-set-key (kbd "C-x C-z") nil) ; Unbind C-x C-z (don't minimize)
(global-set-key (kbd "C-z") 'undo) ; Unbind C-z y hacerlo funcionar para deshacer cambios
(global-set-key (kbd "C-S-z") 'undo-redo) ; Rehacer cambios con C-S-z
(global-set-key (kbd "C-S-c")
'comment-or-uncomment-region-or-line) ; Comentar/descomentar línea o selección
(global-set-key (kbd "C-<f11>") 'toggle-frame-maximized) ; Maximizar / restaurar
(global-set-key (kbd "C-S-d") 'duplicate-current-line) ; Duplicar línea
(global-set-key (kbd "<mouse-3>") 'context-menu-open) ; Abrir menú contextal al hacer clic derecho

View File

@@ -79,6 +79,7 @@
(use-package flycheck
:init (global-flycheck-mode)
:config
(setq-default flycheck-global-modes '(not org-mode))
(setq flycheck-indication-mode nil
flycheck-phpcs-standard "PSR12"))

View File

@@ -34,7 +34,8 @@
("C-c p f" . consult-find) ;; Búsqueda de archivos en todo el projecto incluso en carpetas
("C-c p l" . consult-line-multi) ;; Búsqueda en todos los buffers del projecto abiertos
;; Custom M-# bindings for fast register access
("C-'" . consult-register-load)
;; ("C-'" . consult-register-load)
("C-'" . consult-register)
("M-'" . consult-register-store) ;; orig. abbrev-prefix-mark (unrelated)
;; Other custom bindings
("M-y" . consult-yank-pop) ;; orig. yank-pop

View File

@@ -9,15 +9,15 @@
;; Configuración de repositorios de paquetes
(defvar elpaca-installer-version 0.11)
(defvar elpaca-installer-version 0.12)
(defvar elpaca-directory (expand-file-name "elpaca/" user-emacs-directory))
(defvar elpaca-builds-directory (expand-file-name "builds/" elpaca-directory))
(defvar elpaca-repos-directory (expand-file-name "repos/" elpaca-directory))
(defvar elpaca-sources-directory (expand-file-name "sources/" elpaca-directory))
(defvar elpaca-order '(elpaca :repo "https://github.com/progfolio/elpaca.git"
:ref nil :depth 1 :inherit ignore
:files (:defaults "elpaca-test.el" (:exclude "extensions"))
:build (:not elpaca--activate-package)))
(let* ((repo (expand-file-name "elpaca/" elpaca-repos-directory))
:build (:not elpaca-activate)))
(let* ((repo (expand-file-name "elpaca/" elpaca-sources-directory))
(build (expand-file-name "elpaca/" elpaca-builds-directory))
(order (cdr elpaca-order))
(default-directory repo))

View File

@@ -52,11 +52,12 @@
;; Moverme entre frames
(use-package windmove
:ensure nil
:bind (("s-K" . windmove-up)
("s-J" . windmove-down)
("s-H" . windmove-left)
("s-L" . windmove-right)
("s-O" . other-window)))
:bind (("M-I" . windmove-up)
("M-K" . windmove-down)
("M-J" . windmove-left)
("M-L" . windmove-right)
("M-O" . other-window)
("M-o" . other-window)))
;; Terminal
(use-package vterm