From 425362a43735597db0bd594d01d831794078b8e5 Mon Sep 17 00:00:00 2001
From: Moritz <mail@moritzboeh.me>
Date: Tue, 22 Jun 2021 23:12:25 +0200
Subject: [PATCH] added better ligatures and org mode

---
 .config/doom/config.el |  26 +---
 .config/doom/custom.el |  13 ++
 .config/doom/init.el   | 262 ++++++++++++++++++++---------------------
 3 files changed, 149 insertions(+), 152 deletions(-)
 create mode 100644 .config/doom/custom.el

diff --git a/.config/doom/config.el b/.config/doom/config.el
index 039a2a5..e0065ce 100644
--- a/.config/doom/config.el
+++ b/.config/doom/config.el
@@ -29,7 +29,7 @@
 
 ;; If you use `org' and don't want your org files in the default location below,
 ;; change `org-directory'. It must be set before org loads!
-(setq org-directory "~/org/")
+(setq org-directory "~/Documents/org")
 
 ;; This determines the style of line numbers in effect. If set to `nil', line
 ;; numbers are disabled. For relative line numbers, set this to `relative'.
@@ -62,24 +62,8 @@
 (interactive)
 (let* ((dic ispell-current-dictionary)
        (change (if (string= dic "deutsch") "english" "deutsch")))
-  (ispell-change-dictionary change)
-  (message "Dictionary switched from %s to %s" dic change)
-  ))
-(global-set-key (kbd "<f8>")   'fd-switch-dictionary)
+   (ispell-change-dictionary change)
+   (message "Dictionary switched from %s to %s" dic change)
+   ))
+ (global-set-key (kbd "<f8>")   'fd-switch-dictionary)
 
-;; ;; Enable the www ligature in every possible major mode
-(ligature-set-ligatures 't '("www"))
-
-;; Enable ligatures in programming modes
-(ligature-set-ligatures 'prog-mode '("www" "**" "***" "**/" "*>" "*/" "::"
-                                     ":::" ":=" "!!" "!=" "!==" "-->" "->" "->>"
-                                     "-<" "-<<" "-~" "#{" "#[" "##" "###" "####" "#(" "#?" "#_"
-                                     "#_(" ".-" ".=" ".." "..<" "..." "?=" "??" ";;" "/**"
-                                     "/=" "/==" "/>" "//" "///" "&&" "||" "||=" "|=" "|>" "^=" "$>"
-                                     "++" "+++" "+>" "=:=" "==" "===" "==>" "=>" "=>>" "<="
-                                     "=<<" "=/=" ">-" ">=" ">=>" ">>" ">>-" ">>=" ">>>" "<*"
-                                     "<*>" "<|" "<|>" "<$" "<$>" "<!--" "<-" "<--" "<->" "<+"
-                                     "<+>" "<=" "<==" "<=>" "<=<" "<>" "<<" "<<-" "<<=" "<<<"
-                                     "<~" "<~~" "</" "</>" "~@" "~-" "~>" "~~" "~~>" "%%"))
-
-(global-ligature-mode 't)
diff --git a/.config/doom/custom.el b/.config/doom/custom.el
new file mode 100644
index 0000000..170e3f3
--- /dev/null
+++ b/.config/doom/custom.el
@@ -0,0 +1,13 @@
+(custom-set-variables
+ ;; custom-set-variables was added by Custom.
+ ;; If you edit it by hand, you could mess it up, so be careful.
+ ;; Your init file should contain only one such instance.
+ ;; If there is more than one, they won't work right.
+ '(org-agenda-files
+   '("/home/moritz/Documents/org/wochen" "/home/moritz/Documents/org/")))
+(custom-set-faces
+ ;; custom-set-faces was added by Custom.
+ ;; If you edit it by hand, you could mess it up, so be careful.
+ ;; Your init file should contain only one such instance.
+ ;; If there is more than one, they won't work right.
+ )
diff --git a/.config/doom/init.el b/.config/doom/init.el
index 216283a..876e43d 100644
--- a/.config/doom/init.el
+++ b/.config/doom/init.el
@@ -17,158 +17,158 @@
 (doom! :input
        ;;chinese
        ;;japanese
-       ;;layout            ; auie,ctsrnm is the superior home row
+       ;;layout             ; auie,ctsrnm is the superior home row
 
        :completion
-       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
+       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
 
        :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
-       ;;(emoji +unicode)  ; 🙂
-       ;;fill-column       ; a `fill-column' indicator
-       hl-todo           ; highlight TODO/FIXME/NOTE/DEPRECATED/HACK/REVIEW
+       ;;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
+       (emoji +unicode)     ; 🙂
+       ;;fill-column        ; a `fill-column' indicator
+       hl-todo              ; highlight TODO/FIXME/NOTE/DEPRECATED/HACK/REVIEW
        ;;hydra
-       ;;indent-guides     ; highlighted indent columns
-       ;;ligatures         ; ligatures and symbols to make your code pretty again
-       ;;minimap           ; show a map of the code on the side
-       modeline          ; snazzy, Atom-inspired modeline, plus API
-       ;;nav-flash         ; blink cursor line after big motions
-       neotree           ; a project drawer, like NERDTree for vim
-       ophints           ; highlight the region an operation acts on
-       (popup +defaults)   ; tame sudden yet inevitable temporary windows
-       ;;tabs              ; a 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
-       ;;zen               ; distraction-free coding or writing
+       ;;indent-guides      ; highlighted indent columns
+       ligatures           ; ligatures and symbols to make your code pretty again
+       ;;minimap            ; show a map of the code on the side
+       modeline             ; snazzy, Atom-inspired modeline, plus API
+       ;;nav-flash          ; blink cursor line after big motions
+       neotree              ; a project drawer, like NERDTree for vim
+       ophints              ; highlight the region an operation acts on
+       (popup +defaults)    ; tame sudden yet inevitable temporary windows
+       ;;tabs               ; a 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
+       ;;zen                ; distraction-free coding or writing
 
        :editor
-       (evil +everywhere); come to the dark side, we have cookies
-       file-templates    ; auto-snippets for empty files
-       fold              ; (nigh) universal code folding
-       (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
-       ;;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
-       ;;word-wrap         ; soft wrapping with language-aware indent
+       (evil +everywhere)   ; come to the dark side, we have cookies
+       file-templates       ; auto-snippets for empty files
+       fold                 ; (nigh) universal code folding
+       (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
+       ;;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
+       ;;word-wrap          ; soft wrapping with language-aware indent
 
        :emacs
-       dired             ; making dired pretty [functional]
-       electric          ; smarter, keyword-based electric-indent
-       ;;ibuffer         ; interactive buffer management
-       undo              ; persistent, smarter undo for your inevitable mistakes
-       vc                ; version-control and Emacs, sitting in a tree
+       dired                ; making dired pretty [functional]
+       electric             ; smarter, keyword-based electric-indent
+       ;;ibuffer            ; interactive buffer management
+       undo                 ; persistent, smarter undo for your inevitable mistakes
+       vc                   ; version-control and Emacs, sitting in a tree
 
        :term
-       ;;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
+       ;;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
 
        :checkers
-       syntax              ; tasing you for every semicolon you forget
-       (spell +flyspell) ; tasing you for misspelling mispelling
-       ;;grammar           ; tasing grammar mistake every you make
+       syntax               ; tasing you for every semicolon you forget
+       (spell +flyspell)    ; tasing you for misspelling mispelling
+       ;;grammar            ; tasing grammar mistake every you make
 
        :tools
        ;;ansible
-       ;;debugger          ; FIXME stepping through code, to help you add bugs
+       ;;debugger           ; FIXME stepping through code, to help you add bugs
        ;;direnv
        ;;docker
-       ;;editorconfig      ; let someone else argue about tabs vs spaces
-       ;;ein               ; tame Jupyter notebooks with emacs
-       (eval +overlay)     ; run code, run (also, repls)
-       ;;gist              ; interacting with github gists
-       lookup              ; navigate your code and its documentation
+       ;;editorconfig       ; let someone else argue about tabs vs spaces
+       ;;ein                ; tame Jupyter notebooks with emacs
+       (eval +overlay)      ; run code, run (also, repls)
+       ;;gist               ; interacting with github gists
+       lookup               ; navigate your code and its documentation
        ;;lsp
-       magit             ; a git porcelain for Emacs
-       ;;make              ; run make tasks from Emacs
-       ;;pass              ; password manager for nerds
-       ;;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
+       magit                ; a git porcelain for Emacs
+       ;;make               ; run make tasks from Emacs
+       ;;pass               ; password manager for nerds
+       ;;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
-       (:if IS-MAC macos)  ; improve compatibility with macOS
-       tty               ; improve the terminal Emacs experience
+       (:if IS-MAC macos)   ; improve compatibility with macOS
+       tty                  ; improve the terminal Emacs experience
 
        :lang
-       ;;agda              ; types of types of types of types...
-       ;;beancount         ; mind the GAAP
-       cc                ; C > C++ == 1
-       ;;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
-       ;;data              ; config/data formats
-       ;;(dart +flutter)   ; paint ui and not much else
-       ;;elixir            ; erlang done right
-       ;;elm               ; care for a cup of TEA?
-       emacs-lisp        ; drown in parentheses
-       ;;erlang            ; an elegant language for a more civilized age
-       ;;ess               ; emacs speaks statistics
+       ;;agda               ; types of types of types of types...
+       ;;beancount          ; mind the GAAP
+       cc                   ; C > C++ == 1
+       ;;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
+       ;;data               ; config/data formats
+       ;;(dart +flutter)    ; paint ui and not much else
+       ;;elixir             ; erlang done right
+       ;;elm                ; care for a cup of TEA?
+       emacs-lisp           ; drown in parentheses
+       ;;erlang             ; an elegant language for a more civilized age
+       ;;ess                ; emacs speaks statistics
        ;;factor
-       ;;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
-       (haskell +dante)  ; a language that's lazier than I am
-       ;;hy                ; readability of scheme w/ speed of python
-       ;;idris             ; a language you can depend on
-       ;;json              ; At least it ain't XML
-       ;;(java +meghanada) ; the poster child for carpal tunnel syndrome
-       ;;javascript        ; 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              ; for folks with too much to prove
-       ;;ledger            ; be audit you can be
-       ;;lua               ; one-based indices? one-based indices
-       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               ; organize your plain life in plain text
-       ;;php               ; perl's insecure younger brother
-       ;;plantuml          ; diagrams for confusing people more
-       ;;purescript        ; javascript, but functional
-       ;;python            ; beautiful is better than ugly
-       ;;qt                ; the 'cutest' gui framework ever
-       ;;racket            ; a DSL for DSLs
-       ;;raku              ; the artist formerly known as perl6
-       ;;rest              ; Emacs as a REST client
-       ;;rst               ; ReST in peace
-       ;;(ruby +rails)     ; 1.step {|i| p "Ruby is #{i.even? ? 'love' : 'life'}"}
-       ;;rust              ; Fe2O3.unwrap().unwrap().unwrap().unwrap()
-       ;;scala             ; java, but good
-       ;;(scheme +guile)   ; a fully conniving family of lisps
-       sh                ; she sells {ba,z,fi}sh shells on the C xor
+       ;;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
+       (haskell +dante)     ; a language that's lazier than I am
+       ;;hy                 ; readability of scheme w/ speed of python
+       ;;idris              ; a language you can depend on
+       ;;json               ; At least it ain't XML
+       ;;(java +meghanada)  ; the poster child for carpal tunnel syndrome
+       ;;javascript         ; 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               ; for folks with too much to prove
+       ;;ledger             ; be audit you can be
+       ;;lua                ; one-based indices? one-based indices
+       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                  ; organize your plain life in plain text
+       ;;php                ; perl's insecure younger brother
+       ;;plantuml           ; diagrams for confusing people more
+       ;;purescript         ; javascript, but functional
+       ;;python             ; beautiful is better than ugly
+       ;;qt                 ; the 'cutest' gui framework ever
+       ;;racket             ; a DSL for DSLs
+       ;;raku               ; the artist formerly known as perl6
+       ;;rest               ; Emacs as a REST client
+       ;;rst                ; ReST in peace
+       ;;(ruby +rails)      ; 1.step {|i| p "Ruby is #{i.even? ? 'love' : 'life'}"}
+       ;;rust               ; Fe2O3.unwrap().unwrap().unwrap().unwrap()
+       ;;scala              ; java, but good
+       ;;(scheme +guile)    ; a fully conniving family of lisps
+       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               ; the tubes
-       ;;yaml              ; JSON, but readable
-       ;;zig               ; C, but simpler
+       ;;solidity           ; do you need a blockchain? No.
+       ;;swift              ; who asked for emoji variables?
+       ;;terra              ; Earth and Moon in alignment for performance.
+       ;;web                ; the tubes
+       ;;yaml               ; JSON, but readable
+       ;;zig                ; C, but simpler
 
        :email
        ;;(mu4e +gmail)
@@ -178,10 +178,10 @@
        :app
        ;;calendar
        ;;emms
-       ;;everywhere        ; *leave* Emacs!? You must be joking
-       ;;irc               ; how neckbeards socialize
-       ;;(rss +org)        ; emacs as an RSS reader
-       ;;twitter           ; twitter client https://twitter.com/vnought
+       ;;everywhere         ; *leave* Emacs!? You must be joking
+       ;;irc                ; how neckbeards socialize
+       ;;(rss +org)         ; emacs as an RSS reader
+       ;;twitter            ; twitter client https://twitter.com/vnought
 
        :config
        ;;literate