Compare commits
2
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
b91a681072 | ||
|
|
5d502329a2 |
@@ -25,8 +25,12 @@
|
|||||||
:general (:keymaps 'syd-leader-code-map
|
:general (:keymaps 'syd-leader-code-map
|
||||||
"a" #'lsp-execute-code-action
|
"a" #'lsp-execute-code-action
|
||||||
"r" #'lsp-rename)
|
"r" #'lsp-rename)
|
||||||
:custom (; Fixes type error when using rename.
|
:custom (;; Fixes type error when using rename.
|
||||||
(lsp-rename-use-prepare nil))
|
(lsp-rename-use-prepare nil)
|
||||||
|
;; Don't override `indent-region' with the server's
|
||||||
|
;; formatting functionality. Very silly, I think —
|
||||||
|
;; indentation and formatting are different things.
|
||||||
|
(lsp-enable-indentation nil))
|
||||||
:config
|
:config
|
||||||
(syd-defadvice syd-lsp-install-server-a ()
|
(syd-defadvice syd-lsp-install-server-a ()
|
||||||
"Override and disbale `lsp-install-server'"
|
"Override and disbale `lsp-install-server'"
|
||||||
|
|||||||
@@ -249,19 +249,21 @@ form."
|
|||||||
|
|
||||||
(defun syd-import-systemd-environment ()
|
(defun syd-import-systemd-environment ()
|
||||||
(interactive)
|
(interactive)
|
||||||
(with-temp-buffer
|
(let ((blacklist '("TERM")))
|
||||||
(shell-command "systemctl --user show-environment" (current-buffer))
|
(with-temp-buffer
|
||||||
(goto-char (point-min))
|
(shell-command "systemctl --user show-environment" (current-buffer))
|
||||||
(while (re-search-forward
|
(goto-char (point-min))
|
||||||
(rx bol (group (+ (not "=")))
|
(while (re-search-forward
|
||||||
"="
|
(rx bol (group (+ (not "=")))
|
||||||
(or (and "$'" (group (* (not "'"))) "'")
|
"="
|
||||||
(group (* any)))
|
(or (and "$'" (group (* (not "'"))) "'")
|
||||||
eol)
|
(group (* any)))
|
||||||
nil t)
|
eol)
|
||||||
(let ((var (match-string 1))
|
nil t)
|
||||||
(val (or (match-string 2)
|
(let ((var (match-string 1))
|
||||||
(match-string 3))))
|
(val (or (match-string 2)
|
||||||
(setenv var val)))))
|
(match-string 3))))
|
||||||
|
(unless (member var blacklist)
|
||||||
|
(setenv var val)))))))
|
||||||
|
|
||||||
(provide 'syd/prelude)
|
(provide 'syd/prelude)
|
||||||
|
|||||||
Reference in New Issue
Block a user