Zander671/emacs-config
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

A bunch of changes

Browse Source
This commit is contained in:
Alexander Rosenberg 2025-02-18 06:24:16 -08:00
parent 2a2264be9f
commit a5e3bd4c11
Signed by: Zander671
GPG Key ID: 5FD0394ADBD72730
1 changed files with 45 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

102
init.el
View File

@ -1528,7 +1528,6 @@ With PROJECT, give diagnostics for all buffers in the current project."
;; project.el ;; project.el
(use-package project (use-package project
:bind (([remap project-compile] . my/project-compile-or-default) :bind (([remap project-compile] . my/project-compile-or-default)
("C-c v" . my/project-eshell-or-default)
:map project-prefix-map :map project-prefix-map
("s" . my/project-eshell) ("s" . my/project-eshell)
("u" . my/project-run)) ("u" . my/project-run))
@ -1555,12 +1554,10 @@ With PROJECT, give diagnostics for all buffers in the current project."
(call-interactively 'compile))) (call-interactively 'compile)))
(defvar my/project-run-command nil (defvar my/project-run-command nil
"Command to run with `my/project-run'.") "Command to run with `my/project-run'.")
(put 'my/project-run-command 'safe-local-variable (lambda (val) (put 'my/project-run-command 'safe-local-variable #'stringp)
(stringp val)))
(defvar my/project-run-dir nil (defvar my/project-run-dir nil
"Directory to run project in with `my/project-run'.") "Directory to run project in with `my/project-run'.")
(put 'my/project-run-dir 'safe-local-variable (lambda (val) (put 'my/project-run-dir 'safe-local-variable #'stringp)
(stringp val)))
(defvar my/-project-run-history '() (defvar my/-project-run-history '()
"Commands previously run with `my/project-run'") "Commands previously run with `my/project-run'")
(defvar my/project-root-marker ".project-root" (defvar my/project-root-marker ".project-root"
@ -2404,6 +2401,25 @@ argument."
;; gnuplot (mostly for org-plot) ;; gnuplot (mostly for org-plot)
(use-package gnuplot) (use-package gnuplot)
(defun my/dir-container-p (&optional dir)
"Return non-nil if DIR is a remote directory that is a container."
(member (file-remote-p default-directory 'method)
'("docker" "podman")))
(defun my/dir-distrobox-p (&optional dir)
"Return non-nil if DIR is a remote directory that is a distrobox container."
(and (my/dir-container-p dir)
(let ((default-directory (or dir default-directory)))
(executable-find "distrobox-host-exec" t))))
(defun my/dir-sudo-p (&optional dir)
"Return non-nil if DIR is a remote directory that is sudo, doas, etc.."
(member (file-remote-p (or dir default-directory) 'method)
'("sudo" "doas" "su" "sudoedit")))
(defun my/dir-really-remote-p (&optional dir)
"Return non-nil if DIR is a remote directory that is really remote."
(and (file-remote-p (or dir default-directory))
(not (my/dir-distrobox-p dir))
(not (my/dir-sudo-p dir))))
;; eat ;; eat
(use-package eat (use-package eat
:bind (("C-c V" . my/project-eat-or-default) :bind (("C-c V" . my/project-eat-or-default)
@ -2441,41 +2457,27 @@ argument."
(add-hook 'eat--char-mode-hook #'my/-eat-disable-evil-in-char-mode) (add-hook 'eat--char-mode-hook #'my/-eat-disable-evil-in-char-mode)
;; Evil fixes done ;; Evil fixes done
(defvar my/project-eat-hash-table (make-hash-table :test 'equal) (defun my/-eat-choose-good-term ()
"Hash table that maps project root dirs to eat buffers.") (if (my/dir-really-remote-p)
"xterm-256color"
(eat-term-get-suitable-term-name)))
(setq eat-term-name #'my/-eat-choose-good-term)
(defun my/-eat-shell-for-cwd () (defun my/-eat-shell-for-cwd ()
"Return a good shell for CWD, or nil if the default shell should be used." "Return a good shell for CWD, or nil if the default shell should be used."
(when (file-remote-p default-directory) (when (my/dir-really-remote-p)
"/bin/sh")) "/bin/sh"))
(defun my/project-eat (prompt &optional arg) (defun my/project-eat (&optional arg prompt)
"Switch to or create a eat buffer in the current projects root." "Switch to or create a eat buffer in the current projects root."
(interactive (list t current-prefix-arg)) (interactive (list current-prefix-arg t))
(if-let ((proj (project-current prompt)) (if-let ((proj (project-current prompt))
(default-directory (project-root proj))) (default-directory (project-root proj)))
(if-let ((eat-buff (gethash default-directory (let ((eat-buffer-name (format "*eat for project %s*" default-directory)))
my/project-eat-hash-table)) (eat (my/-eat-shell-for-cwd) arg))))
((buffer-live-p eat-buff)))
(switch-to-buffer eat-buff)
(let ((eat-buffer-name (concat "*eat for project " default-directory
"*"))
(eat-term-name (if (file-remote-p default-directory)
"xterm-256color"
eat-term-name)))
(puthash default-directory
(eat (my/-eat-shell-for-cwd) arg)
my/project-eat-hash-table)))))
(defun my/project-eat-or-default (&optional arg) (defun my/project-eat-or-default (&optional arg)
"Open an eat for the current project, otherwise, open a normal eat." "Open an eat for the current project, otherwise, open a normal eat."
(interactive "P") (interactive "P")
(unless (my/project-eat nil) (unless (my/project-eat arg)
(if-let ((eat-buff (gethash nil my/project-eat-hash-table)) (eat (my/-eat-shell-for-cwd) arg))))
((buffer-live-p eat-buff)))
(switch-to-buffer eat-buff)
(puthash nil (let ((eat-term-name (if (file-remote-p default-directory)
"xterm-256color"
eat-term-name)))
(eat (my/-eat-shell-for-cwd) arg))
my/project-eat-hash-table)))))
;; eshell stuff ;; eshell stuff
(use-package eshell (use-package eshell
@ -2500,21 +2502,6 @@ argument."
(cl-second elt)))) (cl-second elt))))
eshell-command-aliases-list)) eshell-command-aliases-list))
(defun my/-eshell-container-p (&optional dir)
(member (file-remote-p default-directory 'method)
'("docker" "podman")))
(defun my/-eshell-distrobox-p (&optional dir)
(and (my/-eshell-container-p dir)
(let ((default-directory (or dir default-directory)))
(executable-find "distrobox-host-exec" t))))
(defun my/-eshell-sudo-p (&optional dir)
(member (file-remote-p (or dir default-directory) 'method)
'("sudo" "doas" "su" "sudoedit")))
(defun my/-eshell-really-remote-p (&optional dir)
(and (file-remote-p (or dir default-directory))
(not (my/-eshell-distrobox-p dir))
(not (my/-eshell-sudo-p dir))))
(defun eshell/-captive-cd (&optional dir &rest _) (defun eshell/-captive-cd (&optional dir &rest _)
(cond (cond
((not dir) ((not dir)
@ -2532,7 +2519,7 @@ argument."
(when (or force (not (equal my/-eshell-last-remote-system (when (or force (not (equal my/-eshell-last-remote-system
(file-remote-p default-directory)))) (file-remote-p default-directory))))
(kill-local-variable 'eshell-syntax-highlighting-highlight-in-remote-dirs) (kill-local-variable 'eshell-syntax-highlighting-highlight-in-remote-dirs)
(if (my/-eshell-really-remote-p) (if (my/dir-really-remote-p)
(setq-local eshell-command-aliases-list (my/-eshell-filter-alias-list)) (setq-local eshell-command-aliases-list (my/-eshell-filter-alias-list))
(setq-local eshell-command-aliases-list (setq-local eshell-command-aliases-list
(default-toplevel-value 'eshell-command-aliases-list))) (default-toplevel-value 'eshell-command-aliases-list)))
@ -2540,12 +2527,12 @@ argument."
(copy-tree eshell-command-aliases-list)) (copy-tree eshell-command-aliases-list))
(when (file-remote-p default-directory) (when (file-remote-p default-directory)
(add-to-list 'eshell-command-aliases-list '("cd" "-captive-cd $1") t)) (add-to-list 'eshell-command-aliases-list '("cd" "-captive-cd $1") t))
(when (or (my/-eshell-distrobox-p) (when (or (my/dir-distrobox-p)
(my/-eshell-sudo-p)) (my/dir-sudo-p))
(setq-local eshell-syntax-highlighting-highlight-in-remote-dirs t) (setq-local eshell-syntax-highlighting-highlight-in-remote-dirs t)
(setf (alist-get "pwd" eshell-command-aliases-list nil nil 'equal) (setf (alist-get "pwd" eshell-command-aliases-list nil nil 'equal)
'("(directory-file-name (file-remote-p default-directory 'localname))"))) '("(directory-file-name (file-remote-p default-directory 'localname))")))
(when (my/-eshell-distrobox-p) (when (my/dir-distrobox-p)
(unless (executable-find "eza" t) (unless (executable-find "eza" t)
(if (executable-find "exa" t) (if (executable-find "exa" t)
(setf (alist-get "ls" eshell-command-aliases-list nil nil 'equal) (setf (alist-get "ls" eshell-command-aliases-list nil nil 'equal)
@ -2603,7 +2590,7 @@ If no name is given, list all bookmarks instead."
(after-path (match-string 2 name)) (after-path (match-string 2 name))
(bm-path (bookmark-get-filename bm-name)) (bm-path (bookmark-get-filename bm-name))
(full-path (expand-file-name after-path bm-path))) (full-path (expand-file-name after-path bm-path)))
(when (my/-eshell-distrobox-p) (when (my/dir-distrobox-p)
(setq full-path (concat (file-remote-p default-directory) (setq full-path (concat (file-remote-p default-directory)
full-path))) full-path)))
(if (not (file-directory-p full-path)) (if (not (file-directory-p full-path))
@ -2671,15 +2658,16 @@ If no name is given, list all bookmarks instead."
(set-face-attribute 'eshell-starship-icon-face nil (set-face-attribute 'eshell-starship-icon-face nil
:family "FiraCode Nerd Font")) :family "FiraCode Nerd Font"))
(defun my/open-eshell-unless-remote (&optional arg) (defvar my/eshell-or-eat-hook nil
"Open either an Eshell or eat terminal based on `default-directory'. "Hook to determine weather `my/open-shell-dwin' uses `eshell' or `eat'.")
If `default-directory' is remote, call `my/project-eat-or-default'. Otherwise, (defun my/open-shell-dwim (&optional arg)
call `my/project-eshell-or-default'. ARG is the same as for either of the above "Open either an `eshell' or `eat' terminal based on `my/eshell-or-eat-hook'.
functions (only eshell uses it at the time of writing)." ARG is the same as for either of the above functions."
(interactive "P") (interactive "P")
(if (my/-eshell-really-remote-p) (if (run-hook-with-args-until-success 'my/eshell-or-eat-hook)
(my/project-eat-or-default arg) (my/project-eat-or-default arg)
(my/project-eshell-or-default arg))) (my/project-eshell-or-default arg)))
(keymap-global-set "C-c v" #'my/open-shell-dwim)
;; proced ;; proced
(use-package proced (use-package proced