From 76263c70082c1c7b247e3a9922866685165b39eb Mon Sep 17 00:00:00 2001
From: shirui <1229408499@qq.com>
Date: Tue, 15 May 2018 18:22:04 +0800
Subject: [PATCH] Update init.el

---
 init.el | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/init.el b/init.el
index 16f7b04..f14669e 100644
--- a/init.el
+++ b/init.el
@@ -1,9 +1,6 @@
 ;;; private/shirui/init.el -*- lexical-binding: t; -*-
 
 (doom! :feature
-       (popup            ; tame sudden yet inevitable temporary windows
-        +all             ; catch all popups that start with an asterix
-        +defaults)       ; default popup rules
       ;debugger          ; FIXME stepping through code, to help you add bugs
        eval              ; run code, run (also, repls)
       ;evil              ; come to the dark side, we have cookies
@@ -15,7 +12,7 @@
        snippets          ; my elves. They type so I don't have to
        spellcheck        ; tasing you for misspelling mispelling
        (syntax-checker   ; tasing you for every semicolon you forget
-        +childframe)
+        +childframe)     ; use childframes for error popups (Emacs 26+ only)
        version-control   ; remember, remember that commit in November
        workspaces        ; tab emulation, persistence & separate workspaces
 
@@ -30,6 +27,9 @@
         )
 
        :ui
+       (popup            ; tame sudden yet inevitable temporary windows
+        +all             ; catch all popups that start with an asterix
+        +defaults)       ; default popup rules
        doom              ; what makes DOOM look the way it does
       ;doom-dashboard    ; a nifty splash screen for Emacs
        doom-modeline     ; a snazzy Atom-inspired mode-line
@@ -37,8 +37,10 @@
       ;evil-goggles      ; display visual hints when editing in evil
        hl-todo           ; highlight TODO/FIXME/NOTE tags
        nav-flash         ; blink the current line after jumping
+       neotree           ; a project drawer, like NERDTree for vim
       ;tabbar            ; FIXME an (incomplete) tab bar for Emacs
-      ;vi-tilde-fringe   ; fringe tildes to mark beyond EOB
+      ;unicode           ; extended unicode support for various languages
+       vi-tilde-fringe   ; fringe tildes to mark beyond EOB
        window-select     ; visually switch windows
 
        :tools
@@ -49,11 +51,9 @@
        eshell            ; a consistent, cross-platform shell (WIP)
       ;gist              ; interacting with github gists
        imenu             ; an imenu sidebar and searchable code index
-      ;impatient-mode    ; show off code over HTTP
       ;macos             ; MacOS-specific commands
        make              ; run make tasks from Emacs
        magit             ;
-       neotree           ; a project drawer, like NERDTree for vim
       ;password-store    ; password manager for nerds
        pdf               ; pdf enhancements
        rgb               ; creating color strings
@@ -120,6 +120,9 @@
       ; +wordnut         ; wordnet (wn) search
       ; +langtool)       ; a proofreader (grammar/style check) for Emacs
 
+       :collab
+      ;impatient-mode    ; show off code over HTTP
+
        :config
        ;; The default module set reasonable defaults for Emacs. It also provides
        ;; a Spacemacs-inspired keybinding scheme, a custom yasnippet library,