Browse Source

[emacs] Reorg and move some things around

Colin Powell 2 years ago
parent
commit
94ce3187ca
3 changed files with 19 additions and 85 deletions
  1. 9 9
      emacs/.config/doom/config.org
  2. 2 1
      emacs/.config/doom/custom.el
  3. 8 75
      emacs/.config/doom/init.el

+ 9 - 9
emacs/.config/doom/config.org

@@ -207,9 +207,9 @@ a serif font when I’m writing a lot of words.
                       org-id)))
                       org-id)))
 
 
 ;; Refiling
 ;; Refiling
-;;(setq org-refile-targets '(("~/var/org/index.org" :maxlevel . 9))
-;;      org-outline-path-complete-in-steps nil           ; Refile in a single go
-;;      org-refile-use-outline-path t)                  ; Show full paths for refiling
+(setq org-refile-targets '(("~/var/org/index.org" :maxlevel . 9)))
+(setq org-outline-path-complete-in-steps nil)         ; Refile in a single go
+(setq org-refile-use-outline-path t)                  ; Show full paths for refiling
 #+END_SRC
 #+END_SRC
 
 
 ** Key bindings
 ** Key bindings
@@ -237,12 +237,12 @@ easier. I just need to level up with Zettels and web publishing of my notes.
 (setq org-roam-directory "~/var/org/")
 (setq org-roam-directory "~/var/org/")
 (setq org-roam-dailies-directory "")
 (setq org-roam-dailies-directory "")
 
 
-;;(setq org-roam-dailies-capture-templates
-;;      '(("d" "default" entry
-;;         #'org-roam-capture--get-point
-;;         "* %?"
-;;         :file-name "%<%Y-%m-%d>"
-;;         :head "#+title: %<%Y-%m-%d>\n\n")))
+(setq org-roam-dailies-capture-templates
+      '(("d" "default" entry
+         #'org-roam-capture--get-point
+         "* %?"
+         :file-name "%<%Y-%m-%d>"
+         :head "#+title: %<%Y-%m-%d>\n\n")))
 #+END_SRC
 #+END_SRC
 
 
 * Novel
 * Novel

+ 2 - 1
emacs/.config/doom/custom.el

@@ -9,7 +9,8 @@
  ;; If you edit it by hand, you could mess it up, so be careful.
  ;; If you edit it by hand, you could mess it up, so be careful.
  ;; Your init file should contain only one such instance.
  ;; Your init file should contain only one such instance.
  ;; If there is more than one, they won't work right.
  ;; If there is more than one, they won't work right.
- '(package-selected-packages '(org-fancy-priorities hackernews selectrum))
+ '(package-selected-packages
+   '(exec-path-from-shell org-fancy-priorities hackernews selectrum))
  '(when
  '(when
       (or
       (or
        (not
        (not

+ 8 - 75
emacs/.config/doom/init.el

@@ -20,131 +20,74 @@
 
 
        :completion
        :completion
        company          ; the ultimate code completion backend
        company          ; the ultimate code completion backend
-       ;;helm            ; the *other* search engine for love and life
-       ;;ido             ; the other *other* search engine...
-       ;(ivy              ; a search engine for love and life
-       ; +fuzzy
-       ; +presient
-       ; +icons)
        (vertico +icons)
        (vertico +icons)
 
 
        :ui
        :ui
-       ;;deft              ; notational velocity for Emacs
        doom              ; what makes DOOM look the way it does
        doom              ; what makes DOOM look the way it does
        doom-dashboard    ; a nifty splash screen for Emacs
        doom-dashboard    ; a nifty splash screen for Emacs
-       doom-quit         ; DOOM quit-message prompts when you quit Emacs
        (emoji +github +unicode)  ;
        (emoji +github +unicode)  ;
-       ;;fill-column     ; a `fill-column' indicator
        hl-todo           ; highlight TODO/FIXME/NOTE/DEPRECATED/HACK/REVIEW
        hl-todo           ; highlight TODO/FIXME/NOTE/DEPRECATED/HACK/REVIEW
-       ;;hydra
-       ;;indent-guides   ; highlighted indent columns
        ligatures         ;
        ligatures         ;
-       ;;minimap         ; show a map of the code on the side
        modeline          ; snazzy, Atom-inspired modeline, plus API
        modeline          ; snazzy, Atom-inspired modeline, plus API
        nav-flash         ; blink cursor line after big motions
        nav-flash         ; blink cursor line after big motions
-       ;;neotree         ; a project drawer, like NERDTree for vim
        ophints           ; highlight the region an operation acts on
        ophints           ; highlight the region an operation acts on
        (popup +defaults) ; tame sudden yet inevitable temporary windows
        (popup +defaults) ; tame sudden yet inevitable temporary windows
-       ;;tabs            ; an tab bar for Emacs
-       ;;treemacs        ; a project drawer, like neotree but cooler
        unicode           ; extended unicode support for various languages
        unicode           ; extended unicode support for various languages
        vc-gutter         ; vcs diff in the fringe
        vc-gutter         ; vcs diff in the fringe
        vi-tilde-fringe   ; fringe tildes to mark beyond EOB
        vi-tilde-fringe   ; fringe tildes to mark beyond EOB
-       ;(window-select +numbers)    ; visually switch windows
        workspaces        ; tab emulation, persistence & separate workspaces
        workspaces        ; tab emulation, persistence & separate workspaces
-       ;zen               ; distraction-free coding or writing
 
 
        :editor
        :editor
        (evil +everywhere); come to the dark side, we have cookies
        (evil +everywhere); come to the dark side, we have cookies
        file-templates    ; auto-snippets for empty files
        file-templates    ; auto-snippets for empty files
        fold              ; (nigh) universal code folding
        fold              ; (nigh) universal code folding
        (format +onsave)   ; automated prettiness
        (format +onsave)   ; automated prettiness
-       ;;god             ; run Emacs commands without modifier keys
-       ;;lispy           ; vim for lisp, for people who don't like vim
        multiple-cursors  ; editing in many places at once
        multiple-cursors  ; editing in many places at once
-       ;;objed           ; text object editing for the innocent
-       ;;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
        snippets          ; my elves. They type so I don't have to
-       word-wrap         ; soft wrapping with language-aware indent
 
 
        :emacs
        :emacs
        (dired +icons)    ; making dired pretty [functional]
        (dired +icons)    ; making dired pretty [functional]
        electric          ; smarter, keyword-based electric-indent
        electric          ; smarter, keyword-based electric-indent
-       (ibuffer +icons)  ; interactive buffer management
        (undo +tree)      ; persistent, smarter undo for your inevitable mistakes
        (undo +tree)      ; persistent, smarter undo for your inevitable mistakes
        vc                ; version-control and Emacs, sitting in a tree
        vc                ; version-control and Emacs, sitting in a tree
 
 
        :term
        :term
        eshell            ; the elisp shell that works everywhere
        eshell            ; the elisp shell that works everywhere
-       ;;shell             ; simple shell REPL for Emacs
-       ;;term              ; basic terminal emulator for Emacs
        vterm             ; the best terminal emulation in Emacs
        vterm             ; the best terminal emulation in Emacs
 
 
        :checkers
        :checkers
        syntax              ; tasing you for every semicolon you forget
        syntax              ; tasing you for every semicolon you forget
-       (spell +flyspell +aspell)  ; tasing you for misspelling mispelling
+       (spell +flyspell)  ; tasing you for misspelling mispelling
        grammar           ; tasing grammar mistake every you make
        grammar           ; tasing grammar mistake every you make
 
 
        :tools
        :tools
-       ;;ansible
+       ansible
        ;;debugger          ; FIXME stepping through code, to help you add bugs
        ;;debugger          ; FIXME stepping through code, to help you add bugs
        direnv
        direnv
-       ;;docker
+       docker
        editorconfig        ; let someone else argue about tabs vs spaces
        editorconfig        ; let someone else argue about tabs vs spaces
-       ;;ein               ; tame Jupyter notebooks with emacs
        (eval +overlay)     ; run code, run (also, repls)
        (eval +overlay)     ; run code, run (also, repls)
        gist                ; interacting with github gists
        gist                ; interacting with github gists
-       (lookup             ; navigate your code and its documentation
-        +dictionary
-        +docsets)
+       (lookup +dictionary +docsets)
        lsp
        lsp
        (magit +forge)      ; a git porcelain for Emacs
        (magit +forge)      ; a git porcelain for Emacs
        make                ; run make tasks from Emacs
        make                ; run make tasks from Emacs
        (pass +auth)        ; password manager for nerds
        (pass +auth)        ; password manager for nerds
        pdf                 ; pdf enhancements
        pdf                 ; pdf enhancements
-       ;;prodigy           ; FIXME managing external services & code builders
-       ;;rgb               ; creating color strings
-       ;;taskrunner        ; taskrunner for all your projects
-       ;;terraform         ; infrastructure as code
-       ;;tmux              ; an API for interacting with tmux
-       ;;upload            ; map local to remote projects via ssh/ftp
 
 
        :os
        :os
        (:if IS-MAC macos)  ; improve compatibility with macOS
        (:if IS-MAC macos)  ; improve compatibility with macOS
        tty               ; improve the terminal Emacs experience
        tty               ; improve the terminal Emacs experience
 
 
        :lang
        :lang
-       ;;agda              ; types of types of types of types...
-       ;;cc                ; C/C++/Obj-C madness
-       ;;clojure           ; java with a lisp
-       ;;common-lisp       ; if you've seen one lisp, you've seen them all
-       ;;coq               ; proofs-as-programs
-       crystal             ; ruby at the speed of c
-       ;;csharp            ; unity, .NET, and mono shenanigans
+       ;;crystal             ; ruby at the speed of c
        data              ; config/data formats
        data              ; config/data formats
        ;;(dart +flutter)   ; paint ui and not much else
        ;;(dart +flutter)   ; paint ui and not much else
        (elixir +lsp)       ; erlang done right
        (elixir +lsp)       ; erlang done right
-       ;;elm               ; care for a cup of TEA?
        emacs-lisp        ; drown in parentheses
        emacs-lisp        ; drown in parentheses
-       ;;erlang            ; an elegant language for a more civilized age
-       ;;ess               ; emacs speaks statistics
-       ;;faust             ; dsp, but you get to keep your soul
-       ;;fsharp           ; ML stands for Microsoft's Language
-       ;;fstar             ; (dependent) types and (monadic) effects and Z3
-       ;;gdscript          ; the language you waited for
        (go +lsp)                  ; the hipster dialect
        (go +lsp)                  ; the hipster dialect
-       ;;(haskell +dante)  ; a language that's lazier than I am
-       ;;hy                ; readability of scheme w/ speed of python
-       ;;idris             ;
-       ;;json              ; At least it ain't XML
-       ;;(java +meghanada) ; the poster child for carpal tunnel syndrome
+       json              ; At least it ain't XML
        (javascript +lsp)          ; all(hope(abandon(ye(who(enter(here))))))
        (javascript +lsp)          ; all(hope(abandon(ye(who(enter(here))))))
-       ;;julia             ; a better, faster MATLAB
-       ;;kotlin            ; a better, slicker Java(Script)
-       ;;latex             ; writing papers in Emacs has never been so fun
-       ;;lean
-       ;;factor
        ledger              ; an accounting system in Emacs
        ledger              ; an accounting system in Emacs
        lua               ; one-based indices? one-based indices
        lua               ; one-based indices? one-based indices
        markdown            ; writing docs for people to ignore
        markdown            ; writing docs for people to ignore
@@ -166,34 +109,24 @@
        ;;php               ; perl's insecure younger brother
        ;;php               ; perl's insecure younger brother
        plantuml            ; diagrams for confusing people more
        plantuml            ; diagrams for confusing people more
        ;;purescript        ; javascript, but functional
        ;;purescript        ; javascript, but functional
-       (python +lsp +pyright) ; beautiful is better than ugly
+       (python +poetry +lsp +pyright) ; beautiful is better than ugly
        ;;qt                ; the 'cutest' gui framework ever
        ;;qt                ; the 'cutest' gui framework ever
        ;;racket            ; a DSL for DSLs
        ;;racket            ; a DSL for DSLs
        rest                ; Emacs as a REST client
        rest                ; Emacs as a REST client
        rst                 ; ReST in peace
        rst                 ; ReST in peace
        (ruby +rails +lsp)  ; 1.step {|i| p "Ruby is #{i.even? ? 'love' : 'life'}"}
        (ruby +rails +lsp)  ; 1.step {|i| p "Ruby is #{i.even? ? 'love' : 'life'}"}
        (rust +lsp)         ; Fe2O3.unwrap().unwrap().unwrap().unwrap()
        (rust +lsp)         ; Fe2O3.unwrap().unwrap().unwrap().unwrap()
-       ;;scala             ; java, but good
-       ;;scheme            ; a fully conniving family of lisps
        sh                  ; she sells {ba,z,fi}sh shells on the C xor
        sh                  ; she sells {ba,z,fi}sh shells on the C xor
-       ;;sml
-       ;;solidity          ; do you need a blockchain? No.
-       ;;swift             ; who asked for emoji variables?
-       ;;terra             ; Earth and Moon in alignment for performance.
        (web +lsp)          ; the tubes
        (web +lsp)          ; the tubes
        yaml                ; JSON, but readable
        yaml                ; JSON, but readable
-       (zig +lsp)
+       ;;(zig +lsp)
 
 
        :email
        :email
-       ;;(mu4e +gmail)
        notmuch
        notmuch
-       ;;(wanderlust +gmail)
 
 
        :app
        :app
-       ;;calendar
        irc               ; how neckbeards socialize
        irc               ; how neckbeards socialize
        rss               ; emacs as an RSS reader
        rss               ; emacs as an RSS reader
-       ;;twitter         ; twitter client https://twitter.com/vnought
 
 
        :config
        :config
        literate
        literate