From f811cdade62af88307044632c10cba1db44ea25e Mon Sep 17 00:00:00 2001 From: Amin Bandali Date: Sun, 21 Oct 2018 11:50:44 -0400 Subject: [PATCH] [emacs] assimilate pdf-tools and deps anzu is not a dependency, but I noticed doom-modeline refers to it when using isearch (in pdf-view-mode swiper searches through binary contents of a pdf, so we'll fall back to isearch), resulting in a warning if it's not present. --- .gitignore | 15 --------------- .gitmodules | 16 ++++++++++++++++ init.org | 24 ++++++++++++++++++++++-- lib/anzu | 1 + lib/pdf-tools | 1 + lib/tablist | 1 + 6 files changed, 41 insertions(+), 17 deletions(-) create mode 160000 lib/anzu create mode 160000 lib/pdf-tools create mode 160000 lib/tablist diff --git a/.gitignore b/.gitignore index 385bb91..9c17b6d 100644 --- a/.gitignore +++ b/.gitignore @@ -1,18 +1,3 @@ -# mpd files -mpd/*/*/database -mpd/*/*/log -mpd/*/*/pid -mpd/*/*/state -mpd/*/*/sticker.sql - -# ranger files -ranger/*/*/history -ranger/*/*/bookmarks -ranger/*/*/tagged - -# ncmpcpp -ncmpcpp/*/error.log - # getmail oldmail file oldmail-* diff --git a/.gitmodules b/.gitmodules index ba77d0a..c7b0e27 100644 --- a/.gitmodules +++ b/.gitmodules @@ -7,6 +7,9 @@ [submodule "alloy-mode"] path = lib/alloy-mode url = git@github.com:dwwmmn/alloy-mode.git +[submodule "anzu"] + path = lib/anzu + url = git@github.com:syohex/emacs-anzu.git [submodule "async"] path = lib/async url = git@github.com:jwiegley/emacs-async.git @@ -194,6 +197,16 @@ [submodule "packed"] path = lib/packed url = git@github.com:emacscollective/packed.git +[submodule "pdf-tools"] + path = lib/pdf-tools + url = git@github.com:politza/pdf-tools.git + build-step = make + build-step = borg-byte-compile + build-step = borg-update-autoloads + # pdf-tools-install creates `lisp/epdfinfo', which makes git think + # that the submodule is dirty. so, let's ignore the untracked + # files of pdf-tools' submodule + ignore = untracked [submodule "pkg-info"] path = lib/pkg-info url = git@github.com:lunaryorn/pkg-info.el.git @@ -221,6 +234,9 @@ [submodule "smex"] # used by counsel-M-x path = lib/smex url = git@github.com:nonsequitur/smex.git +[submodule "tablist"] + path = lib/tablist + url = git@github.com:politza/tablist.git [submodule "treepy"] path = lib/treepy url = git@github.com:volrath/treepy.el.git diff --git a/init.org b/init.org index cfbeea8..4695635 100644 --- a/init.org +++ b/init.org @@ -833,8 +833,8 @@ There's no way I could top that, so I won't attempt to. #+begin_src emacs-lisp (use-package swiper - :bind (([remap isearch-forward] . swiper) - ([remap isearch-backward] . swiper))) + :bind (("C-s" . swiper) + ("C-r" . swiper))) #+end_src **** Counsel @@ -1503,6 +1503,26 @@ Also see [[https://www.emacswiki.org/emacs/rebox2][rebox2]]. (set-face-foreground 'highlight-indent-guides-top-character-face "grey40")) ; grey13 is nice too #+end_src +** pdf-tools + +#+begin_src emacs-lisp +(use-package pdf-tools + :magic ("%PDF" . pdf-view-mode) + :config (pdf-tools-install) + :bind + (:map pdf-view-mode-map + ("C-s" . isearch-forward) + ("C-r" . isearch-backward) + ("j" . pdf-view-next-line-or-next-page) + ("j" . pdf-view-previous-line-or-previous-page))) +#+end_src + +** anzu + +#+begin_src emacs-lisp +(use-package anzu) +#+end_src + * Email #+begin_src emacs-lisp diff --git a/lib/anzu b/lib/anzu new file mode 160000 index 0000000..e6c56ca --- /dev/null +++ b/lib/anzu @@ -0,0 +1 @@ +Subproject commit e6c56ca8b23ac433f7be58b6f3f50801dd4164e4 diff --git a/lib/pdf-tools b/lib/pdf-tools new file mode 160000 index 0000000..deb93df --- /dev/null +++ b/lib/pdf-tools @@ -0,0 +1 @@ +Subproject commit deb93df9b555b872db4595b6f47645a93eeb280f diff --git a/lib/tablist b/lib/tablist new file mode 160000 index 0000000..c834a84 --- /dev/null +++ b/lib/tablist @@ -0,0 +1 @@ +Subproject commit c834a84efb6efa32497efe1e73160fade741b836 -- 2.20.1