emacs: tweak config

diff --git a/home-manager/profiles/emacs.nix b/home-manager/profiles/emacs.nix
index 2056dac36dd159e615aff2ee93cc44e84de01fbd..df3c295db142a76851336c48a1fb3fc03b54ea8d 100644 (file)
--- a/home-manager/profiles/emacs.nix
+++ b/home-manager/profiles/emacs.nix
@@ -11,11 +11,17 @@ programs.doom-emacs = {
 };
 */
 services.emacs = {
-  enable = true;
-  package = config.programs.emacs.package;
+  enable = lib.mkDefault true;
+  package = config.programs.emacs.finalPackage;
   client.enable = true;
   socketActivation.enable = true;
 };
+programs.emacs = {
+  enable = lib.mkDefault true;
+  extraPackages = epkgs: [
+    epkgs.vterm
+  ];
+};
 fonts.fontconfig.enable = lib.mkDefault true;
 home.packages = with pkgs; [
   # DOOM Emacs dependencies
@@ -29,7 +35,6 @@ home.packages = with pkgs; [
   #nodePackages.javascript-typescript-langserver
   sqlite
   #editorconfig-core-c
-  emacs
   emacs-all-the-icons-fonts
 ];
 home.sessionPath = [ "${config.xdg.configHome}/emacs/bin" ];

diff --git a/home-manager/profiles/emacs/config.el b/home-manager/profiles/emacs/config.el
index 7276193749874b221d823797af5e594a23a4a18b..ddebd5e3b63e896767f6650e51621ffbc801abcd 100644 (file)
--- a/home-manager/profiles/emacs/config.el
+++ b/home-manager/profiles/emacs/config.el
@@ -6,6 +6,7 @@
 ;; Line numbers are pretty slow all around. The performance boost of
 ;; disabling them outweighs the utility of always keeping them on.
 (setq display-line-numbers-type nil)
+(global-visual-line-mode t)
 
 ;; Focus new window after splitting
 (setq evil-split-window-below t
@@ -182,6 +183,7 @@
       ; Only load lsp-clients to speed up loading
       ; See https://github.com/emacs-lsp/lsp-mode/pull/1498
       lsp-client-packages '(lsp-clients)
+      lsp-ui-sideline-show-code-actions t
       )
 
 ;; The modeline is not useful to me in the popup window.
@@ -193,7 +195,8 @@
 ;;(delq! t custom-theme-load-path)
 
 (setq auto-save-default t ; Nobody likes to loose work, I certainly don't
-      confirm-kill-emacs nil
+      confirm-kill-emacs t
+      confirm-kill-processes nil
       make-backup-files nil
       password-cache-expiry nil ; I can trust my computers ... can't I?
       scroll-margin 10
@@ -224,13 +227,22 @@
       split-width-threshold 160
       )
 
+;; vterm
+(after! vterm
+  (set-popup-rule! "*doom:vterm-popup:*" :side 'right :size 0.33 :vslot -4 :select t :quit nil :ttl 0)
+  )
+
 (after! flycheck
   ; flycheck-error-list-buffer
-  (set-popup-rule! (rx bos "*Flycheck errors*" eos) :side 'right :size 0.45)
+  (set-popup-rule! (rx bos "*Flycheck errors*" eos) :side 'right :size 0.33)
   ; M-x lsp-ui-flycheck-list
   (setq lsp-ui-flycheck-list-position 'right)
   (add-hook 'flycheck-error-list-mode-hook
             (lambda () (setq tabulated-list-sort-key (list "Level"))))
+  (setq
+    flycheck-relevant-error-other-file-minimum-level 'error
+    flycheck-relevant-error-other-file-show t
+    )
   )
 ;(add-hook 'flycheck-error-list-after-refresh-hook
 ;          (lambda ()
@@ -456,7 +468,7 @@
 (modify-syntax-entry ?_ "w")
 (defun swiper-all/search-word-at-point ()
   (interactive)
-  (swiper-all (format "%s" (thing-at-point 'word))))
+  (swiper-all (format "\\_<%s\\_>" (thing-at-point 'word))))
 ; Highlight without jumping to the next match
 ; See: https://emacs.stackexchange.com/questions/52411/evil-star-visualstar-without-moving-the-cursor
 (defun search-word-at-point ()
@@ -469,8 +481,20 @@
   (evil-search (progn (evil-ex-search-unbounded-word-forward)
                       (evil-ex-search-unbounded-word-previous)
                       )))
-(setq ivy-case-fold-search-default nil ; case-sensitive search by default
-      )
+
+(after! (ivy swiper)
+  (setq case-fold-search nil ; case-sensitive search by default
+        ivy-case-fold-search-default nil ; case-sensitive search by default
+        ;; Press C-p and Enter to select current input as candidate
+        ;; https://oremacs.com/2017/11/30/ivy-0.10.0/
+        ivy-use-selectable-prompt t
+        )
+  (add-to-list 'ivy-re-builders-alist `(swiper . ivy--regex))
+  (add-to-list 'ivy-re-builders-alist `(swiper-all . ivy--regex))
+  (add-to-list 'ivy-re-builders-alist `(read-file-name-internal . ivy--regex-fuzzy))
+  )
+
+
 (after! evil
   ;(general-define-key "C-s" '(counsel-grep-or-swiper :which-key "search"))
   ;(general-define-key :keymaps '(swiper-map) "C-u" '(lambda () (interactive) (kill-line 0)))
@@ -549,6 +573,8 @@
   (evil-define-key 'motion 'global
                    (kbd "<C-i>") 'evil-prev-buffer ; Does not work without the angles ('<' and '>')
                    (kbd "C-k") 'evil-next-buffer
+                   (kbd "C-x k") 'kill-current-buffer
+                   (kbd "C-m") 'counsel-switch-buffer
                    )
   ;(define-key evil-normal-state-map [tab] 'evil-prev-buffer)
 
@@ -557,6 +583,11 @@
                    (kbd "C-u") 'better-jumper-jump-backward
                    (kbd "C-o") 'better-jumper-jump-forward
                    )
+  ;; Jumping
+  (evil-define-key '(motion normal visual) 'global
+                   (kbd "C--") 'doom/decrease-font-size
+                   (kbd "C-=") 'doom/increase-font-size
+                   )
 
   ;; Moving with ijkl (instead of hjkl)
   (evil-define-key '(motion normal visual) 'global