merge
This commit is contained in:
parent
a98c753d77
commit
44536beaef
|
|
@ -4,6 +4,7 @@
|
||||||
'("melpa" . "https://melpa.org/packages/")
|
'("melpa" . "https://melpa.org/packages/")
|
||||||
'("nongnu" . "https://elpa.nongnu.org/nongnu/")))
|
'("nongnu" . "https://elpa.nongnu.org/nongnu/")))
|
||||||
(package-initialize)
|
(package-initialize)
|
||||||
|
(setq package-enable-at-startup t)
|
||||||
(require 'use-package)
|
(require 'use-package)
|
||||||
|
|
||||||
(defvar bootstrap-version)
|
(defvar bootstrap-version)
|
||||||
|
|
@ -362,7 +363,6 @@
|
||||||
|
|
||||||
;; navigation
|
;; navigation
|
||||||
;; ===
|
;; ===
|
||||||
|
|
||||||
(use-package avy
|
(use-package avy
|
||||||
:ensure t
|
:ensure t
|
||||||
:bind (("C-x j j" . avy-goto-char)
|
:bind (("C-x j j" . avy-goto-char)
|
||||||
|
|
@ -665,23 +665,67 @@
|
||||||
(global-set-key (kbd "C-x y b p") 'copy-file-path-to-clipboard)
|
(global-set-key (kbd "C-x y b p") 'copy-file-path-to-clipboard)
|
||||||
(add-hook 'before-save-hook #'gofmt-before-save)
|
(add-hook 'before-save-hook #'gofmt-before-save)
|
||||||
|
|
||||||
|
;; (use-package ellama
|
||||||
|
;; :init
|
||||||
|
;; ;; setup key bindings
|
||||||
|
;; (setopt ellama-keymap-prefix "C-c e")
|
||||||
|
;; ;; language you want ellama to translate to
|
||||||
|
;; (setopt ellama-language "English")
|
||||||
|
;; ;; could be llm-openai for example
|
||||||
|
;; (require 'llm-ollama)
|
||||||
|
;; (setopt ellama-provider
|
||||||
|
;; (make-llm-ollama
|
||||||
|
;; ;; this model should be pulled to use it
|
||||||
|
;; ;; value should be the same as you print in terminal during pull
|
||||||
|
;; :chat-model "codellama:latest"
|
||||||
|
;; :embedding-model "nomic-embed-text"
|
||||||
|
;; :default-chat-non-standard-params '(("num_ctx" . 8192)))))
|
||||||
|
|
||||||
(use-package ellama
|
(use-package lmtf :ensure t :defer t
|
||||||
|
:straight (lmtf :type git :host github :repo "lneely/lmtf")
|
||||||
|
:bind (:map emacs-lisp-mode-map
|
||||||
|
("C-c t !" . lmtf-run-all-tests)
|
||||||
|
("C-c t r" . lmtf-show-results)))
|
||||||
|
|
||||||
|
(defun compile-init-on-save ()
|
||||||
|
"Automatically compile init.el when saving it."
|
||||||
|
(when (equal buffer-file-name (expand-file-name "~/.emacs.d/init.el"))
|
||||||
|
(byte-compile-file buffer-file-name)))
|
||||||
|
|
||||||
|
(add-hook 'after-save-hook #'compile-init-on-save)
|
||||||
|
|
||||||
|
(use-package claude-shell
|
||||||
|
:straight (claude-shell :type git :host github :repo "arminfriedl/claude-shell")
|
||||||
|
:config
|
||||||
|
(setq claude-shell-api-token (getenv "CLAUDE_API_KEY")))
|
||||||
|
|
||||||
|
|
||||||
|
(use-package org-ai
|
||||||
|
:ensure t
|
||||||
|
:commands (org-ai-mode org-ai-global-mode)
|
||||||
:init
|
:init
|
||||||
;; setup key bindings
|
(add-hook 'org-mode-hook #'org-ai-mode)
|
||||||
(setopt ellama-keymap-prefix "C-c e")
|
(org-ai-global-mode nil)
|
||||||
;; language you want ellama to translate to
|
|
||||||
(setopt ellama-language "English")
|
:config
|
||||||
;; could be llm-openai for example
|
(setq org-ai-default-provider 'anthropic)
|
||||||
(require 'llm-ollama)
|
(setq org-ai-default-chat-model "claude-3-opus-20240229")
|
||||||
(setopt ellama-provider
|
(setq org-ai-use-auth-source t)
|
||||||
(make-llm-ollama
|
(global-set-key (kbd "C-x O a") org-ai-global-prefix-map))
|
||||||
;; this model should be pulled to use it
|
|
||||||
;; value should be the same as you print in terminal during pull
|
|
||||||
:chat-model "codellama:latest"
|
|
||||||
:embedding-model "nomic-embed-text"
|
|
||||||
:default-chat-non-standard-params '(("num_ctx" . 8192)))))
|
|
||||||
|
|
||||||
|
;; setup key bindings
|
||||||
|
(setopt ellama-keymap-prefix "C-c e")
|
||||||
|
;; language you want ellama to translate to
|
||||||
|
(setopt ellama-language "English")
|
||||||
|
;; could be llm-openai for example
|
||||||
|
(require 'llm-ollama)
|
||||||
|
(setopt ellama-provider
|
||||||
|
(make-llm-ollama
|
||||||
|
;; this model should be pulled to use it
|
||||||
|
;; value should be the same as you print in terminal during pull
|
||||||
|
:chat-model "codellama:latest"
|
||||||
|
:embedding-model "nomic-embed-text"
|
||||||
|
:default-chat-non-standard-params '(("num_ctx" . 8192)))))
|
||||||
|
|
||||||
(defun magit-reset-to-merge-base ()
|
(defun magit-reset-to-merge-base ()
|
||||||
"Reset to merge-base of two branches using Magit's branch selection."
|
"Reset to merge-base of two branches using Magit's branch selection."
|
||||||
|
|
@ -714,8 +758,7 @@
|
||||||
(global-set-key (kbd "C-x g r b") 'magit-reset-to-merge-base)
|
(global-set-key (kbd "C-x g r b") 'magit-reset-to-merge-base)
|
||||||
(global-set-key (kbd "C-x g r u") 'magit-reset-to-upstream)
|
(global-set-key (kbd "C-x g r u") 'magit-reset-to-upstream)
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
(provide 'init)
|
(provide 'init)
|
||||||
|
|
||||||
;;; init.el ends here
|
;;; init.el ends here
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue