Merge branch 'master' of git.2li.ch:Nebucatnetzer/nixos

home-manager/modules/programs/emacs/emacs.d/lib/az_evil.el

@@ -1,9 +1,9 @@
 ;; evil-mode allows to use vim keybindings
 (use-package evil
   :init
-  (setq evil-undo-system 'undo-redo)
-  (setq evil-want-integration t) ;; required by evil-collection
-  (setq evil-want-keybinding nil) ;; required by evil-collection
+  (setq evil-undo-system 'undo-redo
+        evil-want-integration t ;; required by evil-collection
+        evil-want-keybinding nil) ;; required by evil-collection
   :config
   ;; Start these modes in emacs mode
   (add-to-list 'evil-emacs-state-modes 'helpful-mode 'mu4e-headers)
@@ -97,6 +97,6 @@
   (global-evil-surround-mode 1))
 
 (use-package evil-collection
-  :after evil
+  :after (evil magit)
   :config
   (evil-collection-init))

home-manager/modules/programs/emacs/emacs.d/lib/az_magit.el

@@ -1,5 +1,6 @@
 ;; enable magit a great git porcelain.
 (use-package magit
+  :demand t
   :commands magit-status
   :bind
   ("<f10>" . magit-status)

home-manager/modules/programs/emacs/emacs.d/lib/az_vterm.el

@@ -3,8 +3,10 @@
   :bind
   ([f2] . projectile-run-vterm)
   :config
-  (add-to-list 'vterm-tramp-shells '("sshx" "/usr/bin/env bash") '("ssh" "/usr/bin/env bash"))
+  (add-to-list 'vterm-tramp-shells '("ssh" "/usr/bin/env bash"))
+  (add-to-list 'vterm-tramp-shells '("sshx" "/usr/bin/env bash"))
   (setq vterm-kill-buffer-on-exit t
+        vterm-shell "/usr/bin/env bash"
         vterm-disable-bold t)
   (evil-set-initial-state 'vterm-mode 'emacs)
   (add-hook 'vterm-mode-hook (lambda() (display-line-numbers-mode -1))))

home-manager/modules/services/espanso/default.nix

@@ -12,7 +12,7 @@ in
       enable = true;
       configs.default = {
         undo_backspace = false;
-        search_trigger = false;
+        search_trigger = "off";
       };
       matches.default.matches = [
         {