From af0a776fa5c1fecf177ce226cd9adf67dbceaeb9 Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Mon, 6 Jun 2016 19:42:00 -0400 Subject: [PATCH] General cleanup --- Cask | 2 +- README.md | 3 --- core/core-flycheck.el | 2 -- core/core.el | 2 ++ core/defuns/defuns-ivy.el | 2 +- ext/Makefile | 8 ++++---- modules/extra-demo.el | 4 ++-- modules/extra-write.el | 25 +++++++++++++------------ modules/module-web.el | 1 - private/my-bindings.el | 5 +---- 10 files changed, 24 insertions(+), 30 deletions(-) diff --git a/Cask b/Cask index adc968de3..8c1948fe6 100644 --- a/Cask +++ b/Cask @@ -61,8 +61,8 @@ (depends-on "evil-visualstar") ;; Editor --- core/core-editor.el -(depends-on "ace-window") (depends-on "ace-link") +(depends-on "ace-window") (depends-on "avy") (depends-on "dumb-jump") (depends-on "editorconfig") diff --git a/README.md b/README.md index 132df67e9..a2ca5655a 100644 --- a/README.md +++ b/README.md @@ -32,8 +32,6 @@ make snippets # install hlissner/emacs-snippets into private/snippets For a more comprehensive byte compile, run `:bc!` (`:bc` will compile the current *.el file). - - ## Features To get a picture of what's in here, check out: @@ -87,4 +85,3 @@ To get a picture of what's in here, check out: ![py/rb version in modeline](https://raw.githubusercontent.com/hlissner/.emacs.d/screenshots/version.png?raw=true) - diff --git a/core/core-flycheck.el b/core/core-flycheck.el index 196ca270c..0a02c1697 100644 --- a/core/core-flycheck.el +++ b/core/core-flycheck.el @@ -10,8 +10,6 @@ flycheck-disabled-checkers '(emacs-lisp emacs-lisp-checkdoc make)) :config - ;; Display warning symbol unicode better - (doom-fix-unicode "DejaVu Sans Mono" '(?⚠) 18) (def-popup! " ?\\*Flycheck.+\\*" :align below :size 14 :noselect t :regexp t) (unless (> emacs-major-version 24) diff --git a/core/core.el b/core/core.el index 73a2ca927..80e0fdfb1 100644 --- a/core/core.el +++ b/core/core.el @@ -85,7 +85,9 @@ ("melpa" . "http://melpa.org/packages/") ("org" . "http://orgmode.org/elpa/")) + byte-compile-warnings nil ad-redefinition-action 'accept ; silence the advised function warnings + apropos-do-all t compilation-always-kill t ; kill compl. process before spawning another compilation-ask-about-save nil ; save all buffers before compiling compilation-scroll-output t ; scroll with output while compiling diff --git a/core/defuns/defuns-ivy.el b/core/defuns/defuns-ivy.el index 64e1b76a8..9190e07b6 100644 --- a/core/defuns/defuns-ivy.el +++ b/core/defuns/defuns-ivy.el @@ -18,7 +18,7 @@ buffers." (interactive) (ivy-read "Kill ring:" (--filter (not (or (< (length it) 3) (string-match-p "\\`[\n[:blank:]]+\\'" it))) - (remove-duplicates kill-ring :test' equal)))) + (remove-duplicates kill-ring :test 'equal)))) ;;;###autoload (autoload 'doom:ivy-recentf "defuns-ivy" nil t) (evil-define-command doom:ivy-recentf (&optional bang) diff --git a/ext/Makefile b/ext/Makefile index 7ec30ff68..2390586a4 100644 --- a/ext/Makefile +++ b/ext/Makefile @@ -6,19 +6,19 @@ LLVM="clang+llvm-$(LLVMV)-x86_64-apple-darwin" # -all: rust csharp +all: rust csharp js sh cc rust: @echo "Installing Rust dependencies" - git clone --depth 1 --recursive https://github.com/rust-lang/rust.git rust - git clone --depth 1 --recursive https://github.com/phildawes/racer.git racer-src + git clone --depth 1 --recursive "https://github.com/rust-lang/rust.git" rust + git clone --depth 1 --recursive "https://github.com/phildawes/racer.git" racer-src cd racer-src && cargo build --release mv racer-src/target/release/racer ./racer rm -rf racer-src csharp: @echo "Installing C# dependencies" - git clone --depth 1 --recursive https://github.com/OmniSharp/omnisharp-server omnisharp + git clone --depth 1 --recursive "https://github.com/OmniSharp/omnisharp-server" omnisharp cd omnisharp && xbuild mv omnisharp/bin/Debug/OmniSharp.exe ./OmniSharp.exe rm -rf omnisharp diff --git a/modules/extra-demo.el b/modules/extra-demo.el index 0bd188421..3cce498a8 100644 --- a/modules/extra-demo.el +++ b/modules/extra-demo.el @@ -9,8 +9,8 @@ ;; + TODO peer programming collab ;; Big-mode settings -(defconst big-mode-font (font-spec :family "Inconsolata" :size 18)) -(defconst big-mode-line-spacing 1) +(defconst big-mode-font (font-spec :family "Inconsolata" :size 16)) +(defconst big-mode-line-spacing 0) (defconst big-mode-modeline-height 35) ;; diff --git a/modules/extra-write.el b/modules/extra-write.el index e209be6d6..fd25c33e4 100644 --- a/modules/extra-write.el +++ b/modules/extra-write.el @@ -15,18 +15,19 @@ (defconst write-mode--last-theme doom-current-theme) (defconst write-mode--last-line-spacing line-spacing) -(spaceline-compile - 'write - '(((*macro-recording *anzu *iedit *evil-substitute *flycheck) - :skip-alternate t - :tight t) - *buffer-path - *buffer-modified) - '((*selection-info :when active) - *buffer-encoding-abbrev - (global :when active) - *buffer-position - *pad)) +(after! spaceline + (spaceline-compile + 'write + '(((*macro-recording *anzu *iedit *evil-substitute *flycheck) + :skip-alternate t + :tight t) + *buffer-path + *buffer-modified) + '((*selection-info :when active) + *buffer-encoding-abbrev + (global :when active) + *buffer-position + *pad))) ;; (defun write-mode|org-hook () diff --git a/modules/module-web.el b/modules/module-web.el index 0c6769d8e..43496aa6a 100644 --- a/modules/module-web.el +++ b/modules/module-web.el @@ -15,7 +15,6 @@ (use-package web-mode :mode ("\\.p?html?$" "\\.\\(tpl\\|blade\\)\\(\\.php\\)?$" - "\\.tsx$" "\\.erb$" "\\.jsp$" "\\.as[cp]x$" diff --git a/private/my-bindings.el b/private/my-bindings.el index 4d407f506..18a7a339c 100644 --- a/private/my-bindings.el +++ b/private/my-bindings.el @@ -211,9 +211,6 @@ "C-k" 'evil-window-up "C-l" 'evil-window-right "C-w" 'ace-window - ;; Jump to new splits - "s" 'doom/evil-window-split - "v" 'doom/evil-window-vsplit ;; Swapping windows "H" 'doom/evil-window-move-l "J" 'doom/evil-window-move-d @@ -303,7 +300,7 @@ ;; help-mode (:after help-mode (:map help-map - "e" 'view-echo-area-messages) + "e" 'doom/popup-messages) (:map help-mode-map :n "]]" 'help-go-forward :n "[[" 'help-go-back