浏览代码

Update doom emacs with new init

Colin Powell 6 年之前
父节点
当前提交
f641d1ad86
共有 4 个文件被更改,包括 42 次插入34 次删除
  1. 5 3
      emacs/.config/doom/+mail.el
  2. 6 0
      emacs/.config/doom/config.el
  3. 28 31
      emacs/.config/doom/init.el
  4. 3 0
      emacs/.config/doom/packages.el

+ 5 - 3
emacs/.config/doom/+mail.el

@@ -27,6 +27,9 @@
         notmuch-message-headers-visible nil
         message-kill-buffer-on-exit t
         message-send-mail-function 'message-send-mail-with-sendmail
+        mail-specify-envelope-from t
+        message-sendmail-envelope-from 'header
+        mail-envelope-from 'header
         notmuch-search-oldest-first nil
         send-mail-function 'sendmail-send-it
         ;; sendmail-program "/usr/local/bin/msmtp"
@@ -40,7 +43,7 @@
         notmuch-hello-sections '(notmuch-hello-insert-saved-searches
                                  notmuch-hello-insert-alltags)
         notmuch-saved-searches '(
-                                 (:name "inbox"   :query "tag:inbox not tag:trash"                            :key "i")
+                                 (:name "inbox"   :query "tag:inbox not tag:deleted"                            :key "i")
                                  (:name "sent"    :query "tag:sent"                                           :key "s")
                                  (:name "archived":query "tag:archived"                                       :key "a")
                                  (:name "drafts"  :query "tag:draft"                                          :key "d"))
@@ -189,7 +192,7 @@
 (defun +mail/notmuch-search-delete ()
   (interactive)
   (notmuch-search-add-tag
-   (list "+trash" "-inbox" "-unread"))
+   (list "+deleted" "-inbox" "-unread"))
   (notmuch-search-next-thread))
 
 ;;;###autoload
@@ -479,4 +482,3 @@ with `notmuch-hello-query-counts'."
 (setq message-default-mail-headers "Cc: \nBcc: \n")
 (setq message-auto-save-directory "~/Mail/colin@onec.me/Drafts/")
 (setq message-directory "~/Mail/colin@onec.me/")
-

+ 6 - 0
emacs/.config/doom/config.el

@@ -53,6 +53,8 @@
         "s-w" #'delete-window
         "s-W" #'delete-frame
         "s-n" #'+default/new-buffer
+        "s-j" #'org-move-subtree-down
+        "s-k" #'org-move-subtree-up
         "s-N" #'make-frame
         "s-q" (if (daemonp) #'delete-frame #'evil-quit-all)
                   ;; Restore OS undo, save, copy, & paste keys (without cua-mode, because
@@ -109,6 +111,10 @@
       +format-on-save-enabled-modes '(python-mode)
       +pretty-code-enabled-modes '(emacs-lisp-mode org-mode))
 
+;; app/mpdel
+;;
+(setq libmpdel-hostname "play.unbl.ink")
+
 ;; app/rss
 (add-hook! 'elfeed-show-mode-hook (text-scale-set 2))
 (setq rmh-elfeed-org-files (list "~/org/elfeed.org"))

+ 28 - 31
emacs/.config/doom/init.el

@@ -1,51 +1,46 @@
 ;;; init.el -*- lexical-binding: t; -*-
 ;; Copy me to ~/.doom.d/init.el or ~/.config/doom/init.el, then edit me!
 
-(doom! :feature
-       ;;debugger          ; FIXME stepping through code, to help you add bugs
-       eval              ; run code, run (also, repls)
-       (evil +everywhere); come to the dark side, we have cookies
-       file-templates    ; auto-snippets for empty files
-       (lookup +docsets)
-       snippets          ; my elves. They type so I don't have to
-       workspaces        ; tab emulation, persistence & separate workspaces
-
-       :completion
-       (ivy +fuzzy +childframe) ; a search engine for love and life
-       company           ; the ultimate code completion backend
+(doom! :completion
+       company          ; the ultimate code completion backend
        ;(helm +fuzzy)
        ;;ido             ; the other *other* search engine...
+       (ivy +fuzzy) ; a search engine for love and life
 
        :ui
        ;;deft              ; notational velocity for Emacs
        doom              ; what makes DOOM look the way it does
        doom-dashboard    ; a nifty splash screen for Emacs
        doom-quit         ; DOOM quit-message prompts when you quit Emacs
-       evil-goggles      ; display visual hints when editing in evil
-       ;;fill-column       ; a `fill-column' indicator
+       fill-column       ; a `fill-column' indicator
        hl-todo           ; highlight TODO/FIXME/NOTE tags
        modeline          ; snazzy, Atom-inspired modeline, plus API
        nav-flash         ; blink the current line after jumping
        ;;neotree           ; a project drawer, like NERDTree for vim
-       treemacs          ; a project drawer, like neotree but cooler
+       ophints ; display visual hints when editing in evil
        (popup +all +defaults)
-       pretty-code       ; replace bits of code with pretty symbols
+       ;;pretty-code       ; replace bits of code with pretty symbols
        ;;tabbar            ; FIXME an (incomplete) tab bar for Emacs
+       treemacs          ; a project drawer, like neotree but cooler
        unicode           ; extended unicode support for various languages
        vc-gutter         ; vcs diff in the fringe
        vi-tilde-fringe   ; fringe tildes to mark beyond EOB
        window-select     ; visually switch windows
+       workspaces        ; tab emulation, persistence & separate workspaces
 
        :editor
-       fold
+       (evil +everywhere); come to the dark side, we have cookies
+       file-templates    ; auto-snippets for empty files
+       ;;fold
        (format +onsave)  ; automated prettiness
        ;;lispy             ; vim for lisp, for people who dont like vim
        multiple-cursors  ; editing in many places at once
        ;;parinfer          ; turn lisp into python, sort of
        rotate-text       ; cycle region at point between text candidates
+       snippets          ; my elves. They type so I don't have to
 
        :emacs
-       (dired +ranger)
+       (dired +ranger +icons)
        electric          ; smarter, keyword-based electric-indent
        eshell            ; a consistent, cross-platform shell (WIP)
        imenu             ; an imenu sidebar and searchable code index
@@ -56,10 +51,12 @@
        ansible
        docker
        editorconfig      ; let someone else argue about tabs vs spaces
+       eval              ; run code, run (also, repls)
        ;;ein               ; tame Jupyter notebooks with emacs
        flycheck          ; tasing you for every semicolon you forget
        flyspell          ; tasing you for misspelling mispelling
        gist              ; interacting with github gists
+       (lookup +docsets)
        lsp
        macos             ; MacOS-specific commands
        make              ; run make tasks from Emacs
@@ -92,31 +89,31 @@
        ;;hy                ; readability of scheme w/ speed of python
        ;;idris             ;
        ;;(java +meghanada) ; the poster child for carpal tunnel syndrome
-       javascript        ; all(hope(abandon(ye(who(enter(here))))))
-       ;;julia             ; a better, faster MATLAB
-       ;;latex             ; writing papers in Emacs has never been so fun
+       javascript         ; all(hope(abandon(ye(who(enter(here))))))
+       julia               ; a better, faster MATLAB
+       latex               ; writing papers in Emacs has never been so fun
        ;;ledger            ; an accounting system in Emacs
        ;;lua               ; one-based indices? one-based indices
-       markdown          ; writing docs for people to ignore
+       markdown            ; writing docs for people to ignore
        ;;nim               ; python + lisp at the speed of c
        ;;nix               ; I hereby declare "nix geht mehr!"
        ;;ocaml             ; an objective camel
-       (org +attach +babel +capture +export +present)
+       (org +attach +babel +capture +export +present +habit +protocol)
        ;;perl              ; write code no one else can comprehend
        ;;php               ; perl's insecure younger brother
        ;;plantuml          ; diagrams for confusing people more
        ;;purescript        ; javascript, but functional
-       (python +lsp)            ; beautiful is better than ugly
+       (python +lsp)       ; beautiful is better than ugly
        ;;qt                ; the 'cutest' gui framework ever
-       ;;racket            ; a DSL for DSLs
-       rest              ; Emacs as a REST client
-       (ruby +lsp)              ; 1.step do {|i| p "Ruby is #{i.even? ? 'love' : 'life'}"}
-       ;;rust              ; Fe2O3.unwrap().unwrap().unwrap().unwrap()
+       racket              ; a DSL for DSLs
+       rest                ; Emacs as a REST client
+       (ruby +lsp)         ; 1.step do {|i| p "Ruby is #{i.even? ? 'love' : 'life'}"}
+       (rust +lsp)         ; Fe2O3.unwrap().unwrap().unwrap().unwrap()
        ;;scala             ; java, but good
-       (sh +fish)        ; she sells (ba|z|fi)sh shells on the C xor
+       (sh +fish)          ; she sells (ba|z|fi)sh shells on the C xor
        ;;solidity          ; do you need a blockchain? No.
        ;;swift             ; who asked for emoji variables?
-       web               ; the tubes
+       web                 ; the tubes
        ;;vala              ; GObjective-C
 
        ;; Applications are complex and opinionated modules that transform Emacs
@@ -134,7 +131,7 @@
 
        :collab
        ;;floobits          ; peer programming for a price
-       impatient-mode    ; show off code over HTTP
+       ;;impatient-mode    ; show off code over HTTP
 
        :config
        ;; For literate config users. This will tangle+compile a config.org

+ 3 - 0
emacs/.config/doom/packages.el

@@ -49,6 +49,9 @@
 (package! ivy-lobsters)
 (package! dumb-jump)
 (package! beacon)
+(package! web-search)
+(package! mpdel)
+(package! ivy-mpdel)
 
 ;; modes!
 (package! terraform-mode)