瀏覽代碼

Updates to doom-emacs #emacs

Colin Powell 6 年之前
父節點
當前提交
7454eecc57
共有 6 個文件被更改,包括 26 次插入30 次删除
  1. 1 1
      .gitignore
  2. 14 5
      emacs/.config/doom/+org.el
  3. 3 3
      emacs/.config/doom/+ui.el
  4. 2 7
      emacs/.config/doom/config.el
  5. 4 4
      emacs/.config/doom/init.el
  6. 2 10
      emacs/.config/doom/packages.el

+ 1 - 1
.gitignore

@@ -1,3 +1,3 @@
 config/fish/functions/fish_prompt.fish
 emacs/.config/doom/+org-gcal.el
-
+*.elc

+ 14 - 5
emacs/.config/doom/+org.el

@@ -53,8 +53,10 @@
           org-agenda-custom-commands
               '(("N" "List all next tasks" ((agenda "" ((org-agenda-span 1)))
                                             (tags "@errand/-DONE") ; should generaly be pretty empty
-                                            (tags "@home/NEXT")
+                                            (tags "@book/NEXT") ; should generaly be pretty empty
                                             (tags "@work/NEXT")
+                                            (tags "@home/NEXT")
+                                            (tags "@night/NEXT")
                                             (tags "@selectp/NEXT")))
                 ("R" "Weekly Review"
                   ((agenda "" ((org-agenda-span 7)))
@@ -71,6 +73,7 @@
 
           org-tag-alist '(("PROJECT" . ?p)
                           ("@home" . ?h)
+                          ("@night" . ?n)
                           ("@selectp" . ?s)
                           ("@errand" . ?e)
                           ("@read" . ?r)
@@ -125,8 +128,14 @@
 
 
 (map! :leader
-      (:prefix "o"
-        :desc "Org Agenda" "A" #'org-agenda-list
-        :desc "Org Agenda" "a" #'org-agenda
+      (:prefix "a"
+        :desc "Org Agenda" "o" #'org-agenda
         :desc "Org open link" "l" #'org-open-at-point
-        :desc "Org set tags" "t" #'org-set-tags-command))
+        :desc "Sync gcal with org" "g" #'org-gcal-sync
+        :desc "Set task deadline" "d" #'org-deadline
+        :desc "Schedule task" "s" #'org-schedule
+        :desc "New journal entry" "j" #'org-journal-new-entry
+        :desc "Org set property" "p" #'org-set-progerty
+        :desc "Save all org buffers" "a" #'org-save-all-org-buffers
+        :desc "Org todo" "t" #'org-todo
+        :desc "Org set tags" "T" #'org-set-tags-command))

+ 3 - 3
emacs/.config/doom/+ui.el

@@ -1,10 +1,10 @@
 ;;;  -*- lexical-binding: t; -*-
 
-(setq doom-theme 'doom-Iosvkem)
+(setq doom-theme 'doom-dracula)
 
 ;; Fonts
-(setq doom-font (font-spec :family "Iosevka" :size 14))
-(setq doom-big-font (font-spec :family "Iosevka" :size 20))
+(setq doom-font (font-spec :family "Iosevka" :size 15))
+(setq doom-big-font (font-spec :family "Iosevka" :size 21))
 ;; Dash highlighting
 ;; (after! dash (dash-enable-font-lock))
 

+ 2 - 7
emacs/.config/doom/config.el

@@ -42,16 +42,11 @@
      :desc "Find file in dotfiles" :n "t" #'+hlissner/find-in-dotfiles
      :desc "Browse dotfiles"       :n "T" #'+hlissner/browse-dotfiles)
    (:prefix "t"
+     :desc "Toggle visual line mode" :n "v" #'visual-line-mode
+     :desc "Toggle auto fill mode" :n "a" #'auto-fill-mode
      :desc "Switch themes" :n "t" #'counsel-load-theme)
    (:prefix "o"
      :desc "Elfeed feed reader" :n "f" #'elfeed)
-   (:prefix "a"
-     :desc "Save all org buffers" :n "a" #'org-save-all-org-buffers
-     :desc "Set task deadline" :n "d" #'org-deadline
-     :desc "New journal entry" :n "j" #'org-journal-new-entry
-     :desc "Sync gcal with org" :n "g" #'org-gcal-sync
-     :desc "Open agenda" :n "o" #'org-agenda-list
-     :desc "Schedule task" :n "s" #'org-schedule)
    (:prefix "p"
      :desc "Black buffer" :n "b" #'blacken-buffer)
    (:prefix "y"

+ 4 - 4
emacs/.config/doom/init.el

@@ -70,7 +70,7 @@
        gist              ; interacting with github gists
        macos             ; MacOS-specific commands
        make              ; run make tasks from Emacs
-       magit             ; a git porcelain for Emacs
+       (magit +forge)             ; a git porcelain for Emacs
        password-store    ; password manager for nerds
        pdf               ; pdf enhancements
        ;;prodigy           ; FIXME managing external services & code builders
@@ -91,7 +91,7 @@
        data              ; config/data formats
        erlang            ; an elegant language for a more civilized age
        elixir            ; erlang done right
-       elm               ; care for a cup of TEA?
+       ;;elm               ; care for a cup of TEA?
        emacs-lisp        ; drown in parentheses
        ;;ess               ; emacs speaks statistics
        go                ; the hipster dialect
@@ -102,7 +102,7 @@
        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
+       ;;ledger            ; an accounting system in Emacs
        ;;lua               ; one-based indices? one-based indices
        markdown          ; writing docs for people to ignore
        ;;nim               ; python + lisp at the speed of c
@@ -117,7 +117,7 @@
         +journal
         +present)        ; Emacs for presentations
        ;;perl              ; write code no one else can comprehend
-       php               ; perl's insecure younger brother
+       ;;php               ; perl's insecure younger brother
        ;;plantuml          ; diagrams for confusing people more
        ;;purescript        ; javascript, but functional
        python            ; beautiful is better than ugly

+ 2 - 10
emacs/.config/doom/packages.el

@@ -16,14 +16,9 @@
   :recipe (:fetcher github
            :repo "titaniumbones/ox-slack"))
 
-(package! counsel-spotify
+(package! evil-matchit
   :recipe (:fetcher github
-           :repo "Lautaro-Garcia/counsel-spotify"))
-
-;;(package! org-daypage
-;;  :recipe (:fetcher github
-;;           :repo "almost/org-daypage"))
-
+           :repo "redguardtoo/evil-matchit"))
 
 ;; python stuffs
 (package! w3m)
@@ -50,12 +45,9 @@
 (package! auth-source-pass)
 (package! ivy-todo)
 (package! ivy-explorer)
-(package! counsel-spotify)
 (package! ivy-lobsters)
 
 ;; modes!
 (package! terraform-mode)
 
-
 (package! exec-path-from-shell :disable t)
-(package! evil-matchit :recipe (:fetcher github :repo "redguardtoo/evil-matchit" :commit "7d65b4167b1f0086c2b42b3aec805e47a0d355c4"))