Various deferred loading improvements

parent 582e4377
......@@ -203,7 +203,7 @@ in
propagatedBuildInputs = builtins.filter isNotUcsUtils drv.propagatedBuildInputs;
propagatedUserEnvPkgs = builtins.filter isNotUcsUtils drv.propagatedUserEnvPkgs;
});
defer = 1;
defer = 2;
diminish = [ "back-button-mode" ];
command = [ "back-button-mode" ];
config = ''
......@@ -478,7 +478,7 @@ in
which-key = {
enable = true;
command = [ "which-key-mode" ];
command = [ "which-key-mode" "which-key-add-major-mode-key-based-replacements" ];
diminish = [ "which-key-mode" ];
defer = 3;
config = "(which-key-mode)";
......@@ -762,7 +762,7 @@ in
lsp-mode = {
enable = true;
command = [ "lsp" ];
after = [ "flycheck" ];
after = [ "company" "flycheck" ];
hook = [ "(lsp-mode . lsp-enable-which-key-integration)" ];
bindLocal = {
lsp-mode-map = {
......@@ -1127,7 +1127,7 @@ in
enable = true;
defer = 3;
diminish = [ "yas-minor-mode" ];
command = [ "yas-global-mode" "yas-minor-mode" ];
command = [ "yas-global-mode" "yas-minor-mode" "yas-expand-snippet" ];
hook = [
# Yasnippet interferes with tab completion in ansi-term.
"(term-mode . (lambda () (yas-minor-mode -1)))"
......@@ -1232,7 +1232,7 @@ in
projectile = {
enable = true;
diminish = [ "projectile-mode" ];
command = [ "projectile-mode" ];
command = [ "projectile-mode" "projectile-project-root" ];
bindKeyMap = {
"C-c p" = "projectile-command-map";
};
......@@ -1259,7 +1259,8 @@ in
company = {
enable = true;
diminish = [ "company-mode" ];
hook = [ "(after-init . global-company-mode)" ];
command = [ "company-mode" "company-doc-buffer" "global-company-mode" ];
defer = 1;
extraConfig = ''
:bind (:map company-mode-map
([remap completion-at-point] . company-complete-common)
......@@ -1272,6 +1273,8 @@ in
company-tooltip-minimum-width 20
; Allow me to keep typing even if company disapproves.
company-require-match nil)
(global-company-mode)
'';
};
......@@ -1285,6 +1288,7 @@ in
company-yasnippet = {
enable = true;
after = [ "company" "yasnippet" ];
bind = {
"M-/" = "company-yasnippet";
};
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment