Update parinfer module to comply with review.
Also add support for BSD systems. Signed-off-by: Johan Thoren <johan@thoren.xyz>
This commit is contained in:
parent
ec747395c6
commit
4ff23752f2
3 changed files with 59 additions and 43 deletions
|
@ -1,48 +1,51 @@
|
|||
;;; editor/parinfer/config.el -*- lexical-binding: t; -*-
|
||||
|
||||
(if (not (featurep! +rust))
|
||||
(use-package! parinfer
|
||||
:hook ((emacs-lisp-mode
|
||||
clojure-mode
|
||||
scheme-mode
|
||||
lisp-mode
|
||||
racket-mode
|
||||
hy-mode) . parinfer-mode)
|
||||
:init
|
||||
(setq parinfer-extensions
|
||||
'(defaults
|
||||
pretty-parens
|
||||
smart-tab
|
||||
smart-yank))
|
||||
(when (featurep! :editor evil +everywhere)
|
||||
(push 'evil parinfer-extensions))
|
||||
:config
|
||||
(map! :map parinfer-mode-map
|
||||
"\"" nil ; smartparens handles this
|
||||
:i "<tab>" #'parinfer-smart-tab:dwim-right-or-complete
|
||||
:i "<backtab>" #'parinfer-smart-tab:dwim-left
|
||||
:localleader
|
||||
:desc "Toggle parinfer-mode" "m" #'parinfer-toggle-mode))
|
||||
(defvar parinfer-rust--doom-lib-name (cond ((eq system-type 'darwin)
|
||||
"parinfer-rust-darwin.so")
|
||||
((eq system-type 'gnu/linux)
|
||||
"parinfer-rust-linux.so")
|
||||
((eq system-type 'windows-nt)
|
||||
"parinfer-rust-windows.dll")))
|
||||
(use-package! parinfer-rust-mode
|
||||
:hook ((emacs-lisp-mode
|
||||
(use-package! parinfer
|
||||
:unless (featurep! +rust)
|
||||
:hook ((emacs-lisp-mode
|
||||
clojure-mode
|
||||
scheme-mode
|
||||
lisp-mode
|
||||
racket-mode
|
||||
hy-mode) . parinfer-rust-mode)
|
||||
:init
|
||||
(setq! parinfer-rust-library (concat user-emacs-directory
|
||||
".local/etc/parinfer-rust/"
|
||||
parinfer-rust--doom-lib-name))
|
||||
:config
|
||||
(map! :map parinfer-rust-mode-map
|
||||
:localleader
|
||||
:desc "Switch parinfer-rust-mode" "m" #'parinfer-rust-switch-mode
|
||||
:desc "Temporarily disable parinfer-rust-mode" "M"
|
||||
#'parinfer-rust-switch-mode)))
|
||||
hy-mode) . parinfer-mode)
|
||||
:init
|
||||
(setq parinfer-extensions
|
||||
'(defaults
|
||||
pretty-parens
|
||||
smart-tab
|
||||
smart-yank))
|
||||
(when (featurep! :editor evil +everywhere)
|
||||
(push 'evil parinfer-extensions))
|
||||
:config
|
||||
(map! :map parinfer-mode-map
|
||||
"\"" nil ; smartparens handles this
|
||||
:i "<tab>" #'parinfer-smart-tab:dwim-right-or-complete
|
||||
:i "<backtab>" #'parinfer-smart-tab:dwim-left
|
||||
:localleader
|
||||
"m" #'parinfer-toggle-mode))
|
||||
(use-package! parinfer-rust-mode
|
||||
:when (featurep! +rust)
|
||||
:when (bound-and-true-p module-file-suffix)
|
||||
:hook ((emacs-lisp-mode
|
||||
clojure-mode
|
||||
scheme-mode
|
||||
lisp-mode
|
||||
racket-mode
|
||||
hy-mode) . parinfer-rust-mode)
|
||||
:init
|
||||
(setq! parinfer-rust-library
|
||||
(concat user-emacs-directory
|
||||
".local/etc/parinfer-rust/"
|
||||
(cond ((eq system-type 'darwin) "parinfer-rust-darwin.so")
|
||||
((eq system-type 'gnu/linux) "parinfer-rust-linux.so")
|
||||
((eq system-type 'windows-nt) "parinfer-rust-windows.dll")
|
||||
((eq system-type 'berkeley-unix "libparinfer_rust.so"))))
|
||||
parinfer-rust-auto-download
|
||||
(if (eq system-type 'berkeley-unix)
|
||||
nil
|
||||
t))
|
||||
:config
|
||||
(map! :map parinfer-rust-mode-map
|
||||
:localleader
|
||||
"m" #'parinfer-rust-switch-mode
|
||||
"M" #'parinfer-rust-toggle-disable))
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue