From 659521c2476b07101c10a7d227edc9d49fdf7386 Mon Sep 17 00:00:00 2001 From: JaeYoo-Im Date: Wed, 7 Jun 2023 20:58:18 +0900 Subject: [PATCH] emacs : diff-hl, pdf-tools windows --- .config/emacs/lisp/init-dired.el | 5 -- .config/emacs/lisp/init-edit.el | 4 +- .config/emacs/lisp/init-general.el | 1 + .config/emacs/lisp/init-highlight.el | 9 +--- .config/emacs/lisp/init-reader.el | 71 ++++++++++++++-------------- 5 files changed, 39 insertions(+), 51 deletions(-) diff --git a/.config/emacs/lisp/init-dired.el b/.config/emacs/lisp/init-dired.el index 33df98e..133e261 100644 --- a/.config/emacs/lisp/init-dired.el +++ b/.config/emacs/lisp/init-dired.el @@ -53,11 +53,6 @@ (use-package dired-single :commands (dired dired-jump)) - (use-package diff-hl - :hook ((dired-mode . diff-hl-dired-mode-unless-remote) - (magit-post-refresh . diff-hl-magit-post-refresh)) - :config - (diff-hl-margin-mode)) (use-package dired-hide-dotfiles :hook (dired-mode) ;; hide default when dired-mode enabled. :config diff --git a/.config/emacs/lisp/init-edit.el b/.config/emacs/lisp/init-edit.el index f551241..041c683 100644 --- a/.config/emacs/lisp/init-edit.el +++ b/.config/emacs/lisp/init-edit.el @@ -67,9 +67,7 @@ ("M-v" pager-page-up "↖") ("M-<" beginning-of-buffer "⭶") ("M->" end-of-buffer "⭸")))) - :bind (:map hs-minor-mode-map - ("C-~" . hideshow-hydra/body) - ("C-S-" . hideshow-hydra/body)) + :bind ("C-~" . hideshow-hydra/body) :hook (prog-mode . hs-minor-mode) :config ;; More functions diff --git a/.config/emacs/lisp/init-general.el b/.config/emacs/lisp/init-general.el index 238a4cf..4e1ec7c 100644 --- a/.config/emacs/lisp/init-general.el +++ b/.config/emacs/lisp/init-general.el @@ -99,6 +99,7 @@ "o a r" '(my/org-roam-refresh-agenda-list :which-key "Org agenda refresh list") "o a c" '((lambda () (interactive) (find-file (expand-file-name "agenda/agenda.org" org-directory))) :which-key "org agenda file") "o c" '(cfw:open-org-calendar :which-key "org calendar") + "o t" '(org-insert-structure-template :which-key "org insert structure template") ;; Project-el "p" '(:ignore t :which-key "project") "p ." '(project-switch-project :which-key "switch project") diff --git a/.config/emacs/lisp/init-highlight.el b/.config/emacs/lisp/init-highlight.el index e0ac17c..2a0b30f 100644 --- a/.config/emacs/lisp/init-highlight.el +++ b/.config/emacs/lisp/init-highlight.el @@ -109,18 +109,13 @@ (dolist (keyword '("DEPRECATED")) (add-to-list 'hl-todo-keyword-faces `(,keyword . "#8d9eaf")))) -;;(use-package diff-hl -;; :config -;; (diff-hl-margin-mode)) - (use-package diff-hl :hook ((after-init . global-diff-hl-mode) (magit-post-refresh . diff-hl-magit-post-refresh) (dired-mode . diff-hl-dired-mode-unless-remote)) - ;;(dired-mode . diff-hl-dired-mode)) :config ;; Highlight on-the-fly - (diff-hl-flydiff-mode 1) + (diff-hl-flydiff-mode t) ;; Set fringe style (setq-default fringes-outside-margins nil) @@ -129,7 +124,7 @@ (defun my-diff-hl-fringe-bmp-function (_type _pos) "Fringe bitmap function for use as `diff-hl-fringe-bmp-function'." (define-fringe-bitmap 'my-diff-hl-bmp - (vector (if sys/linuxp #b11111100 #b11100000)) + (vector (if ON-LINUX #b11111100 #b11100000)) 1 8 '(center t))) (setq diff-hl-fringe-bmp-function #'my-diff-hl-fringe-bmp-function) diff --git a/.config/emacs/lisp/init-reader.el b/.config/emacs/lisp/init-reader.el index 78fa628..a493633 100644 --- a/.config/emacs/lisp/init-reader.el +++ b/.config/emacs/lisp/init-reader.el @@ -1,41 +1,40 @@ ;;; init-reader.el -*- lexical-binding: t -*- -(when (and ON-LINUX (display-graphic-p)) - (use-package pdf-view - :ensure pdf-tools - :diminish (pdf-view-themed-minor-mode - pdf-view-midnight-minor-mode - pdf-view-printer-minor-mode) - :defines pdf-annot-activate-created-annotations - :hook ((pdf-tools-enabled . pdf-view-auto-slice-minor-mode) - (pdf-tools-enabled . pdf-isearch-minor-mode) - (pdf-tools-enabled . pdf-view-themed-minor-mode)) - :mode ("\\.[pP][dD][fF]\\'" . pdf-view-mode) - :magic ("%PDF" . pdf-view-mode) - :bind (:map pdf-view-mode-map - ("C-s" . isearch-forward)) - :init (setq pdf-view-use-scaling t - pdf-view-use-imagemagick nil - pdf-annot-activate-created-annotations t - pdf-view-display-size 'fit-page) +(use-package pdf-view + :ensure pdf-tools + :diminish (pdf-view-themed-minor-mode + pdf-view-midnight-minor-mode + pdf-view-printer-minor-mode) + :defines pdf-annot-activate-created-annotations + :hook ((pdf-tools-enabled . pdf-view-auto-slice-minor-mode) + (pdf-tools-enabled . pdf-isearch-minor-mode) + (pdf-tools-enabled . pdf-view-themed-minor-mode)) + :mode ("\\.[pP][dD][fF]\\'" . pdf-view-mode) + :magic ("%PDF" . pdf-view-mode) + :bind (:map pdf-view-mode-map + ("C-s" . isearch-forward)) + :init (setq pdf-view-use-scaling t + pdf-view-use-imagemagick nil + pdf-annot-activate-created-annotations t + pdf-view-display-size 'fit-page) + :config + ;; install manually + ;;(pdf-tools-install t nil t nil) + ;; my funtion + (defun my/pdf-view-open-in-zathura () + (interactive) + (save-window-excursion + (let ((current-file (buffer-file-name)) + (current-page (number-to-string (pdf-view-current-page)))) + (async-shell-command + (format "zathura -P %s \"%s\"" current-page current-file)))) + (message "Sent to zathura")) + ;; Recover last viewed position + (use-package pdf-view-restore + :defer t + :hook (pdf-view-mode . pdf-view-restore-mode) :config - ;; Activate the package - (pdf-tools-install t nil t nil) - ;; my funtion - (defun my/pdf-view-open-in-zathura () - (interactive) - (save-window-excursion - (let ((current-file (buffer-file-name)) - (current-page (number-to-string (pdf-view-current-page)))) - (async-shell-command - (format "zathura -P %s \"%s\"" current-page current-file)))) - (message "Sent to zathura")) - ;; Recover last viewed position - (use-package pdf-view-restore - :defer t - :hook (pdf-view-mode . pdf-view-restore-mode) - :config - (setq pdf-view-restore-filename - (expand-file-name "pdf-view-restore" user-emacs-directory))))) + (setq pdf-view-restore-filename + (expand-file-name "pdf-view-restore" user-emacs-directory)))) ;; Epub reader