summaryrefslogtreecommitdiff
path: root/.emacs.d/modules
diff options
context:
space:
mode:
Diffstat (limited to '.emacs.d/modules')
-rw-r--r--.emacs.d/modules/thanos-commands.el3
-rw-r--r--.emacs.d/modules/thanos-dev.el9
2 files changed, 8 insertions, 4 deletions
diff --git a/.emacs.d/modules/thanos-commands.el b/.emacs.d/modules/thanos-commands.el
index 8b3407e..8966d96 100644
--- a/.emacs.d/modules/thanos-commands.el
+++ b/.emacs.d/modules/thanos-commands.el
@@ -29,8 +29,6 @@
;; ╱╱╱╱╱╱╱╱╱╱╱╱╱╱╱╱╱╱╱╱╱╱╱╱╱╰╯
;;; Code:
-(require 'gptel)
-
(defvar vm-directory "~/virtual-machines/")
@@ -39,7 +37,6 @@
(let ((command-parts (split-string command "[ ]+")))
(apply #'call-process `(,(car command-parts) nil 0 nil ,@(cdr command-parts)))))
-
(defun thanos/emacs-keys ()
"Swap caps with ctrl."
(interactive)
diff --git a/.emacs.d/modules/thanos-dev.el b/.emacs.d/modules/thanos-dev.el
index d80170e..f711bba 100644
--- a/.emacs.d/modules/thanos-dev.el
+++ b/.emacs.d/modules/thanos-dev.el
@@ -51,6 +51,13 @@
;; Magit
(require 'magit)
+(defun project-magit ()
+ "Run magit-status in the current project's root."
+ (interactive)
+ (magit-status (project-root (project-current t))))
+
+(define-key project-prefix-map (kbd "s") 'project-magit)
+
(setf magit-display-buffer-function #'magit-display-buffer-same-window-except-diff-v1)
(define-prefix-command 'thanos/magit)
(global-set-key (kbd "C-c g") 'thanos/magit)
@@ -103,7 +110,7 @@
(require 'python-mode)
(add-to-list 'auto-mode-alist '("\\.py\\'" . python-mode))
-(add-hook 'python-mode 'lsp-mode)
+(add-hook 'python-mode #'eglot)
;; json
(require 'json-mode)