pti/emacs-config
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix merge conflicts

Browse source
This commit is contained in:
Peter Tillemans 2025-02-03 10:23:27 +01:00
parent c4c07fedfb
commit f81d6ee7c9
1 changed files with 34 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
init.org
View file

@ -2104,6 +2104,35 @@ errors :
In a separate terminal I see the pid change every 2 seconds. It seems In a separate terminal I see the pid change every 2 seconds. It seems
to work fine in vscode. Not tested in neovim yet. to work fine in vscode. Not tested in neovim yet.
** Gemini Code Completion
#+BEGIN_SRC emacs-lisp
(use-package google-gemini
:ensure (google-gemini
:host github
:repo "emacs-openai/google-gemini")
:config
(setq google-gemini-key (auth-source-pass-get 'secret "snamellit/gemini-api-key"))
)
#+END_SRC
#+RESULTS:
: [nil 26528 34920 363895 nil elpaca-process-queues nil nil 695000 nil]
#+BEGIN_SRC emacs-lisp
(use-package gemini-code-completion
:ensure (gemini-code-completion
:host github
:repo "shishimaru/gemini-code-completion.el"
:files ("*.el"))
:bind
("C-c g" . gemini-code-completion)
)
#+END_SRC
#+RESULTS:
: [nil 26528 34424 382719 nil elpaca-process-queues nil nil 536000 nil]
** Aider Support ** Aider Support
@ -2116,21 +2145,21 @@ generate code.
:ensure (:host github :repo "tninja/aider.el" :files ("aider.el")) :ensure (:host github :repo "tninja/aider.el" :files ("aider.el"))
:config :config
;; Use claude-3-5-sonnet cause it is best in aider benchmark ;; Use claude-3-5-sonnet cause it is best in aider benchmark
(setq aider-args '("--model" "anthropic/claude-3-5-sonnet-20241022")) ;;(setq aider-args '("--model" "anthropic/claude-3-5-sonnet-20241022"))
(setenv "ANTHROPIC_API_KEY" anthropic-api-key) ;;(setenv "ANTHROPIC_API_KEY" anthropic-api-key)
;; Or use chatgpt model since it is most well known ;; Or use chatgpt model since it is most well known
;; (setq aider-args '("--model" "gpt-4o-mini")) ;; (setq aider-args '("--model" "gpt-4o-mini"))
;; (setenv "OPENAI_API_KEY" <your-openai-api-key>) ;; (setenv "OPENAI_API_KEY" <your-openai-api-key>)
;; Or use gemini v2 model since it is very good and free ;; Or use gemini v2 model since it is very good and free
;; (setq aider-args '("--model" "gemini/gemini-exp-1206")) (setq aider-args '("--model" "gemini/gemini-exp-1206"))
;; (setenv "GEMINI_API_KEY" <your-gemini-api-key>) (setenv "GEMINI_API_KEY" google-gemini-key)
;; ;;
;; Optional: Set a key binding for the transient menu ;; Optional: Set a key binding for the transient menu
(global-set-key (kbd "C-c a") 'aider-transient-menu)) (global-set-key (kbd "C-c a") 'aider-transient-menu))
#+END_SRC #+END_SRC
#+RESULTS: #+RESULTS:
: [nil 26507 57728 13169 nil elpaca-process-queues nil nil 655000 nil] : [nil 26528 35167 709869 nil elpaca-process-queues nil nil 408000 nil]
** Gitlab Support ** Gitlab Support