diff options
Diffstat (limited to '.config/emacs/init.el')
| -rw-r--r-- | .config/emacs/init.el | 24 |
1 files changed, 14 insertions, 10 deletions
diff --git a/.config/emacs/init.el b/.config/emacs/init.el index b3f6644..8213892 100644 --- a/.config/emacs/init.el +++ b/.config/emacs/init.el @@ -36,7 +36,7 @@ (setf copyright-names-regexp (format "%s <%s>" user-full-name user-mail-address)) -(defvar is-zeus (string= (system-name) "zeus")) +(defvar is-constantine (string= (system-name) "constantine")) (defvar is-hermes (string= (system-name) "hermes")) (defvar is-phone (string= (system-name) "localhost")) (defvar is-uranus (string= (system-name) "uranus")) @@ -279,7 +279,7 @@ (use-package emacs :ensure nil :config - (if is-zeus + (if is-constantine (display-battery-mode 0) (display-battery-mode 1)) @@ -503,10 +503,8 @@ :config (defun vc-git--commit-hash-at-point () "Return commit hash at point." - (let ((hash (thing-at-point 'word t))) - (and (stringp hash) - (string-match-p "^[0-9a-f]\\{7,40\\}$" hash) - hash))) + (let ((hash (log-view-current-entry nil t))) + (cadr hash))) (defun vc-git-reset-to-commit-at-point (&optional hash) "Reset the current branch to the commit at point in the vc log buffer." @@ -564,6 +562,12 @@ vc-prefix-map ("b d" . 'vc-git-delete-branch))) +(use-package magit + :defer t + :config + (setf magit-display-buffer-function #'magit-display-buffer-same-window-except-diff-v1) + :bind ("C-x g" . magit)) + (when (or is-phone is-uranus) (use-package corfu-terminal)) @@ -741,7 +745,7 @@ (setf sudo-edit-local-method "sudo")) ;; My packages -(when (or is-zeus is-hermes) +(when (or is-constantine is-hermes) (use-package yeetube :init (define-prefix-command 'thanos/yeetube-map) :vc t @@ -1000,7 +1004,7 @@ (setq-default gptel-model "llama3.2:latest") (setq gptel-backend (gptel-make-ollama "Ollama" - :host (if is-zeus "localhost:11434" "zeus:11434") + :host (if is-constantine "localhost:11434" "constantine:11434") :stream t :models '("llama3.2:latest" "dolphin-phi" "dolphin-llama3:latest"))) @@ -1100,7 +1104,7 @@ ;; (use-package yasnippet ;; :ensure nil ;; :config -;; (when is-zeus (add-to-list 'yas-snippet-dirs "~/Dev/guile/guix/etc/snippets/yas"))) +;; (when is-constantine (add-to-list 'yas-snippet-dirs "~/Dev/guile/guix/etc/snippets/yas"))) (use-package emms :ensure t @@ -1290,7 +1294,7 @@ Create a temporary frame to execute BODY, which will then be deleted." (add-variable-watcher 'wallpaper-current #'thanos/wallpaper-watcher) ;; Set wallpaper -(when (or is-zeus is-hermes) +(when (or is-constantine is-hermes) (thanos/wallpaper-startup)) (defvar-keymap thanos/applications-map |