General, minor refactor/reformatting

This commit is contained in:
Henrik Lissner 2019-04-08 23:02:50 -04:00
parent 742687a51e
commit f9b6f6746f
No known key found for this signature in database
GPG key ID: 5F6C0EA160557395
6 changed files with 25 additions and 26 deletions

View file

@ -53,7 +53,6 @@ detected.")
(setq-hook! '(eshell-mode-hook term-mode-hook) hscroll-margin 0) (setq-hook! '(eshell-mode-hook term-mode-hook) hscroll-margin 0)
(defun doom*optimize-literal-mode-for-large-files (buffer) (defun doom*optimize-literal-mode-for-large-files (buffer)
"TODO"
(with-current-buffer buffer (with-current-buffer buffer
(when find-file-literally (when find-file-literally
(setq buffer-read-only t) (setq buffer-read-only t)
@ -233,7 +232,7 @@ savehist file."
`(("." . ,(concat doom-cache-dir "undo-tree-hist/")))) `(("." . ,(concat doom-cache-dir "undo-tree-hist/"))))
(global-undo-tree-mode +1) (global-undo-tree-mode +1)
;; compress undo history with xz ;; compress undo history with xz/gzip
(and (fset 'doom*undo-tree-make-history-save-file-name (and (fset 'doom*undo-tree-make-history-save-file-name
(cond ((executable-find "zstd") (lambda (file) (concat file ".zst"))) (cond ((executable-find "zstd") (lambda (file) (concat file ".zst")))
((executable-find "gzip") (lambda (file) (concat file ".gz"))))) ((executable-find "gzip") (lambda (file) (concat file ".gz")))))

View file

@ -59,11 +59,9 @@ session of Dooming. Will noop if used more than once, unless FORCE-P is
non-nil." non-nil."
(when (or force-p (not doom-init-modules-p)) (when (or force-p (not doom-init-modules-p))
(setq doom-init-modules-p t) (setq doom-init-modules-p t)
(load! "init" doom-private-dir t) (load! "init" doom-private-dir t)
(unless doom-modules (unless doom-modules
(setq doom-modules (make-hash-table :test 'equal))) (setq doom-modules (make-hash-table :test 'equal)))
(maphash (lambda (key plist) (maphash (lambda (key plist)
(let ((doom--current-module key) (let ((doom--current-module key)
(doom--current-flags (plist-get plist :flags))) (doom--current-flags (plist-get plist :flags)))

View file

@ -49,21 +49,22 @@ Emacs.")
"Purge projectile cache entries that: "Purge projectile cache entries that:
a) have too many files (see `doom-projectile-cache-limit'), a) have too many files (see `doom-projectile-cache-limit'),
b) represent blacklised directories that are too big, change too often or are b) represent blacklisted directories that are too big, change too often or are
private. (see `doom-projectile-cache-blacklist'), private. (see `doom-projectile-cache-blacklist'),
c) are not valid projectile projects." c) are not valid projectile projects."
(cl-loop with blacklist = (mapcar #'file-truename doom-projectile-cache-blacklist) (when (bound-and-true-p projectile-projects-cache)
for proot in (hash-table-keys projectile-projects-cache) (cl-loop with blacklist = (mapcar #'file-truename doom-projectile-cache-blacklist)
for len = (length (gethash proot projectile-projects-cache)) for proot in (hash-table-keys projectile-projects-cache)
if (or (>= len doom-projectile-cache-limit) for len = (length (gethash proot projectile-projects-cache))
(member (substring proot 0 -1) blacklist) if (or (>= len doom-projectile-cache-limit)
(and doom-projectile-cache-purge-non-projects (member (substring proot 0 -1) blacklist)
(not (doom-project-p proot)))) (and doom-projectile-cache-purge-non-projects
do (doom-log "Removed %S from projectile cache" proot) (not (doom-project-p proot))))
and do (remhash proot projectile-projects-cache) do (doom-log "Removed %S from projectile cache" proot)
and do (remhash proot projectile-projects-cache-time) and do (remhash proot projectile-projects-cache)
and do (remhash proot projectile-project-type-cache)) and do (remhash proot projectile-projects-cache-time)
(projectile-serialize-cache)) and do (remhash proot projectile-project-type-cache))
(projectile-serialize-cache)))
(add-hook 'kill-emacs-hook #'doom|cleanup-project-cache) (add-hook 'kill-emacs-hook #'doom|cleanup-project-cache)
;; It breaks projectile's project root resolution if HOME is a project (e.g. ;; It breaks projectile's project root resolution if HOME is a project (e.g.

View file

@ -68,11 +68,11 @@ immediately runs it on the current candidate (ending the ivy session)."
(after! yasnippet (after! yasnippet
(add-to-list 'yas-prompt-functions #'+ivy-yas-prompt nil #'eq)) (add-to-list 'yas-prompt-functions #'+ivy-yas-prompt nil #'eq))
(map! :map ivy-mode-map (define-key! ivy-mode-map
[remap switch-to-buffer] #'+ivy/switch-buffer [remap switch-to-buffer] #'+ivy/switch-buffer
[remap switch-to-buffer-other-window] #'+ivy/switch-buffer-other-window [remap switch-to-buffer-other-window] #'+ivy/switch-buffer-other-window
[remap persp-switch-to-buffer] #'+ivy/switch-workspace-buffer [remap persp-switch-to-buffer] #'+ivy/switch-workspace-buffer
[remap imenu-anywhere] #'ivy-imenu-anywhere) [remap imenu-anywhere] #'ivy-imenu-anywhere)
(ivy-mode +1) (ivy-mode +1)

View file

@ -8,7 +8,8 @@
:mode ("\\.\\(?:rb\\|rake\\|rabl\\|ru\\|builder\\|gemspec\\|jbuilder\\|thor\\)\\'" . +ruby|init) :mode ("\\.\\(?:rb\\|rake\\|rabl\\|ru\\|builder\\|gemspec\\|jbuilder\\|thor\\)\\'" . +ruby|init)
:mode ("/\\(?:Berks\\|Cap\\|Gem\\|Guard\\|Pod\\|Puppet\\|Rake\\|Thor\\|Vagrant\\)file\\'" . +ruby|init) :mode ("/\\(?:Berks\\|Cap\\|Gem\\|Guard\\|Pod\\|Puppet\\|Rake\\|Thor\\|Vagrant\\)file\\'" . +ruby|init)
:preface :preface
(after! ruby-mode (require 'enh-ruby-mode)) (after! ruby-mode
(require 'enh-ruby-mode))
(defun +ruby|init () (defun +ruby|init ()
"Enable `enh-ruby-mode' if ruby is available, otherwise `ruby-mode'." "Enable `enh-ruby-mode' if ruby is available, otherwise `ruby-mode'."
(if (executable-find "ruby") (if (executable-find "ruby")

View file

@ -27,7 +27,7 @@ To get LSP working, you'll need two things:
support, you'll have to configure your own (described in the Configuration support, you'll have to configure your own (described in the Configuration
section). section).
As of this writing, these Doom modules possess LSP support: As of this writing, this is the state of LSP support in Doom Emacs:
| Module | Major modes | Default language server | | Module | Major modes | Default language server |
|------------------+---------------------------------------------------------+---------------------------------------------------------------| |------------------+---------------------------------------------------------+---------------------------------------------------------------|
@ -53,8 +53,8 @@ This module provides no flags.
+ [[https://github.com/tigersoldier/company-lsp][company-lsp]]* + [[https://github.com/tigersoldier/company-lsp][company-lsp]]*
* Prerequisites * Prerequisites
This module has no direct prerequisites, but to get LSP working, you'll need to This module has no direct prerequisites, but major-modes require you to install
install language servers. language servers.
You'll find a table that lists available language servers and how to install You'll find a table that lists available language servers and how to install
them [[https://github.com/emacs-lsp/lsp-mode#supported-languages][in the lsp-mode project README]]. The documentation of the module for your them [[https://github.com/emacs-lsp/lsp-mode#supported-languages][in the lsp-mode project README]]. The documentation of the module for your