Enabling a company backend for a specific mode was a tedious tasks with code scattered at different locations, one for local variable definitions, one for company hook function definitions and another where the backends were pushed to the local variables (which was problematic, since we ended up pushing the same backends over and over again with `SPC f e R`, pushes have been replaced by add-to-list calls in the new macro). All these steps are now put together at one place with the new macro spacemacs|add-company-backends, check its docstring for more info on its arguments. This macro also allows to define arbitrary buffer local variables to tune company for specific modes (similar to layer variables via a keyword :variables) The code related to company backends management has been moved to the auto-completion layer in the funcs.el file. A nice side effect of this move is that it enforces correct encapsulation of company backends related code. We can now easily detect if there is some configuration leakage when the auto-completion layer is not used. But we loose macro expansion at file loading time (not sue it is a big concern though). The function spacemacs|enable-auto-complete was never used so it has been deleted which led to the deletion of the now empty file core-auto-completion.el. The example in LAYERS.org regarding auto-completion is now out of date and has been deleted. An example to setup auto-completion is provided in the README.org file of the auto-completion layer.
35 lines
1 KiB
EmacsLisp
35 lines
1 KiB
EmacsLisp
(setq nixos-packages
|
|
'(
|
|
company
|
|
(company-nixos-options :toggle
|
|
(configuration-layer/package-usedp 'company))
|
|
(helm-nixos-options :toggle (configuration-layer/package-usedp 'helm))
|
|
nix-mode
|
|
nixos-options
|
|
))
|
|
|
|
(defun nixos/post-init-company ()
|
|
(let ((backends '(company-capf)))
|
|
(when (configuration-layer/package-usedp 'company-nixos-options)
|
|
(add-to-list 'backends 'company-nixos-options t))
|
|
(eval `(spacemacs|add-company-backends
|
|
:backends ,backends
|
|
:modes nix-mode))))
|
|
|
|
(defun nixos/init-company-nixos-options ()
|
|
(use-package company-nixos-options
|
|
:defer t))
|
|
|
|
(defun nixos/init-helm-nixos-options ()
|
|
(use-package helm-nixos-options
|
|
:config
|
|
(spacemacs/set-leader-keys
|
|
"h>" 'helm-nixos-options)))
|
|
|
|
(defun nixos/init-nix-mode ()
|
|
(use-package nix-mode)
|
|
(add-to-list 'spacemacs-indent-sensitive-modes 'nix-mode))
|
|
|
|
(defun nixos/init-nixos-options ()
|
|
(use-package nixos-options))
|