diff --git a/.emacs.d/init.el b/.emacs.d/init.el index 0d466fa..996083e 100644 --- a/.emacs.d/init.el +++ b/.emacs.d/init.el @@ -16,10 +16,6 @@ (straight-use-package 'use-package) (eval-when-compile (require 'use-package)) -(setq my/slow-ssh - (or - (string= (getenv "IS_TRAMP") "true"))) - (setq my/remote-server (or (string= (getenv "IS_REMOTE") "true") (string= (system-name) "dev-digital") @@ -27,6 +23,7 @@ (setq my/is-termux (string-match-p (rx (* nonl) "com.termux" (* nonl)) (getenv "HOME"))) +(setq my/nested-emacs (and (getenv "IS_EMACS") t)) (setenv "IS_EMACS" "true") (defmacro with-eval-after-load-norem (file &rest body) @@ -378,7 +375,7 @@ then it takes a second \\[keyboard-quit] to abort the minibuffer." (global-set-key (kbd "C-+") 'my/zoom-in) (global-set-key (kbd "C-=") 'my/zoom-out) -(unless my/remote-server +(unless (or my/remote-server my/nested-emacs) (add-hook 'after-init-hook #'server-start)) (defmacro i3-msg (&rest args) @@ -611,7 +608,6 @@ then it takes a second \\[keyboard-quit] to abort the minibuffer." (use-package git-gutter :straight t - :if (not my/slow-ssh) :config (global-git-gutter-mode +1)) @@ -716,7 +712,6 @@ then it takes a second \\[keyboard-quit] to abort the minibuffer." (use-package editorconfig :straight t :config - (unless my/slow-ssh (editorconfig-mode 1)) (add-to-list 'editorconfig-indentation-alist '(emmet-mode emmet-indentation))) @@ -1517,7 +1512,7 @@ Obeys `widen-automatically', which see." (use-package lsp-mode :straight t - :if (not (or my/slow-ssh my/is-termux my/remote-server)) + :if (not (or my/is-termux my/remote-server)) :hook ( (typescript-mode . lsp) (js-mode . lsp) @@ -2681,7 +2676,6 @@ Returns ( . ) or nil." (use-package lsp-pyright :straight t :defer t - :if (not my/slow-ssh) :hook (python-mode . (lambda () (require 'lsp-pyright) (setq-local lsp-pyright-python-executable-cmd (my/get-pipenv-python)) @@ -2693,7 +2687,6 @@ Returns ( . ) or nil." (use-package pipenv :straight t :hook (python-mode . pipenv-mode) - :if (not my/slow-ssh) :init (setq pipenv-projectile-after-switch-function @@ -2803,10 +2796,9 @@ Returns ( . ) or nil." (use-package json-mode :straight t - :mode "\\.json\\'" :config - (add-hook 'json-mode #'smartparens-mode) - (add-hook 'json-mode #'hs-minor-mode) + (add-hook 'json-mode-hook #'smartparens-mode) + (add-hook 'json-mode-hook #'hs-minor-mode) (my/set-smartparens-indent 'json-mode)) (use-package csv-mode @@ -2918,7 +2910,8 @@ Returns ( . ) or nil." (add-hook 'gnuplot-mode-hook #'smartparens-mode)) (use-package x509-mode - :straight t) + :straight (:host github :repo "jobbflykt/x509-mode" + :build (:not native-compile))) (use-package lsp-java :straight t @@ -4516,6 +4509,27 @@ KEYS is a list of cons cells like (