aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYann Herklotz <git@yannherklotz.com>2020-03-16 18:22:33 +0000
committerYann Herklotz <git@yannherklotz.com>2020-03-16 18:25:42 +0000
commit6979b88787a03193422cc14322134bd2cda77754 (patch)
tree24d061fe7050db51625dbe59f10eb68b8c976ac5
parent82c8274ebcb257866ab177c3528fcdae1978c9c2 (diff)
downloaddotfiles-6979b88787a03193422cc14322134bd2cda77754.tar.gz
dotfiles-6979b88787a03193422cc14322134bd2cda77754.zip
Add doom config
-rw-r--r--doom/config.el230
-rw-r--r--doom/init.el178
-rw-r--r--doom/packages.el56
3 files changed, 464 insertions, 0 deletions
diff --git a/doom/config.el b/doom/config.el
new file mode 100644
index 0000000..b5ddb93
--- /dev/null
+++ b/doom/config.el
@@ -0,0 +1,230 @@
+;;; $DOOMDIR/config.el -*- lexical-binding: t; -*-
+
+;; Place your private configuration here! Remember, you do not need to run 'doom
+;; sync' after modifying this file!
+
+
+;; Some functionality uses this to identify you, e.g. GPG configuration, email
+;; clients, file templates and snippets.
+(setq user-full-name "Yann Herklotz"
+ user-mail-address "yann@yannherklotz.com")
+
+;; Doom exposes five (optional) variables for controlling fonts in Doom. Here
+;; are the three important ones:
+;;
+;; + `doom-font'
+;; + `doom-variable-pitch-font'
+;; + `doom-big-font' -- used for `doom-big-font-mode'; use this for
+;; presentations or streaming.
+;;
+;; They all accept either a font-spec, font string ("Input Mono-12"), or xlfd
+;; font string. You generally only need these two:
+(setq doom-font (font-spec :family "Iosevka" :size 16)
+ doom-variable-pitch-font (font-spec :family "Libre Baskerville")
+ doom-serif-font (font-spec :family "Libre Baskerville"))
+
+;; There are two ways to load a theme. Both assume the theme is installed and
+;; available. You can either set `doom-theme' or manually load a theme with the
+;; `load-theme' function. This is the default:
+(setq doom-theme 'sanityinc-tomorrow-night)
+
+;; 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 "~/Dropbox/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'.
+(setq display-line-numbers-type nil)
+
+;; Add some keybinding customisations.
+
+;; Stop emacs from freezing when trying to minimize it on a tiling WM.
+(global-unset-key (kbd "C-z"))
+(global-set-key (kbd "M-u") #'upcase-dwim)
+(global-set-key (kbd "M-l") #'downcase-dwim)
+(global-set-key (kbd "M-c") #'capitalize-dwim)
+(global-set-key (kbd "C-c z") #'quick-calc)
+(global-set-key (kbd "<f5>") #'revert-buffer)
+(global-set-key (kbd "C-.") #'other-window)
+(global-set-key (kbd "C-,") #'(lambda () (interactive) (other-window -1)))
+(global-set-key (kbd "C-c l") #'org-store-link)
+(global-set-key (kbd "C-c a") #'org-agenda)
+(global-set-key (kbd "C-c c") #'org-capture)
+
+;; Set undo-only correctly
+(global-set-key (kbd "C-\\") 'undo-only)
+
+;; Revert C-a and C-e to go to the beginning and end of line, not a fan of the
+;; default smart functions.
+(global-set-key (kbd "C-a") #'beginning-of-line)
+(global-set-key (kbd "C-e") #'end-of-line)
+
+;; Define functions to push and pop from mark.
+(defun push-mark-no-activate ()
+ "Pushes `point' to `mark-ring' and does not activate the region
+ Equivalent to \\[set-mark-command] when \\[transient-mark-mode] is disabled"
+ (interactive)
+ (push-mark (point) t nil)
+ (message "Pushed mark to ring"))
+
+(defun jump-to-mark ()
+ "Jumps to the local mark, respecting the `mark-ring' order.
+ This is the same as using \\[set-mark-command] with the prefix argument."
+ (interactive)
+ (set-mark-command 1))
+
+(global-set-key (kbd "C-`") #'push-mark-no-activate)
+(global-set-key (kbd "M-`") #'jump-to-mark)
+
+;; Delete an emacs client frame.
+(defun y/exit-emacs-client ()
+ "consistent exit emacsclient. If not in emacs client, echo a
+ message in minibuffer, don't exit emacs. If in server mode and
+ editing file, do C-x # server-edit else do C-x 5 0
+ delete-frame"
+ (interactive)
+ (if server-buffer-clients
+ (server-edit)
+ (delete-frame)))
+
+(global-set-key (kbd "C-c q") #'y/exit-emacs-client)
+
+;; Swap two window positions.
+(defun y/swap-windows ()
+ "Swaps two windows and leaves the cursor in the original one"
+ (interactive)
+ (ace-swap-window)
+ (aw-flip-window))
+
+;; Define a custom key map for other useful commands.
+(define-prefix-command 'y-map)
+(global-set-key (kbd "C-c y") 'y-map)
+
+(define-key y-map (kbd "s") 'y/swap-windows)
+(define-key y-map (kbd "p") 'password-store-copy)
+(define-key y-map (kbd "i") 'password-store-insert)
+(define-key y-map (kbd "g") 'password-store-generate)
+(define-key y-map (kbd "r") 'toggle-rot13-mode)
+
+(defun y/insert-date ()
+ "Insert a timestamp according to locale's date and time format."
+ (interactive)
+ (insert (format-time-string "%c" (current-time))))
+
+(define-key y-map (kbd "d") 'y/insert-date)
+
+;; Set backup directories into the tmp folder
+(setq backup-directory-alist
+ `((".*" . ,temporary-file-directory)))
+(setq auto-save-file-name-transforms
+ `((".*" ,temporary-file-directory t)))
+
+;; Automatically refresh files
+(global-auto-revert-mode 1)
+(setq auto-revert-verbose nil)
+
+;; Set up magit when C-c g is called
+(use-package! magit
+ :bind (("C-x g" . magit-status)))
+
+;; Configure activation for whitespace mode
+(use-package! whitespace
+ :bind (("C-x w" . whitespace-mode)))
+
+;; Configure expand-region mode.
+(use-package! expand-region
+ :bind ("M-o" . er/expand-region))
+
+;; Delete all whitespace until the first non-whitespace character.
+(use-package! hungry-delete
+ :config (global-hungry-delete-mode))
+
+;; Org configuration
+(use-package org
+ :mode ("\\.org\\'" . org-mode)
+ :init
+ (map! :map org-mode-map
+ "M-n" #'outline-next-visible-heading
+ "M-p" #'outline-previous-visible-heading)
+ (setq org-src-window-setup 'current-window
+ org-return-follows-link t
+ org-confirm-babel-evaluate nil
+ org-use-speed-commands t
+ org-structure-template-alist '(("a" . "export ascii")
+ ("c" . "center")
+ ("C" . "comment")
+ ("e" . "example")
+ ("E" . "export")
+ ("h" . "export html")
+ ("l" . "export latex")
+ ("q" . "quote")
+ ("s" . "src")
+ ("v" . "verse")
+ ("el" . "src emacs-lisp")
+ ("d" . "definition")
+ ("t" . "theorem"))))
+
+(use-package! org-id
+ :after org)
+
+;; Disable org indent mode and remove C-, from the org-mode-map.
+(after! org
+ (setq org-startup-indented nil)
+ (define-key org-mode-map (kbd "C-,") nil))
+
+;; Set agenda files, refile targets and todo keywords.
+(setq org-agenda-files (mapcar 'expand-file-name
+ (list "~/Dropbox/org/inbox.org"
+ "~/Dropbox/org/main.org"
+ "~/Dropbox/org/tickler.org"
+ (format-time-string "~/Dropbox/org/journals/%Y-%m.org")))
+ org-refile-targets `(("~/Dropbox/org/main.org" :maxlevel . 2)
+ ("~/Dropbox/org/someday.org" :level . 1)
+ ("~/Dropbox/org/tickler.org" :maxlevel . 2)
+ (,(format-time-string "~/Dropbox/org/journals/%Y-%m.org") :maxlevel . 2))
+ org-todo-keywords '((sequence "TODO(t)" "WAITING(w)" "|" "DONE(d)" "CANCELLED(c)")))
+
+;; Set custom agenda commands which can be activated in the agenda viewer.
+(setq org-agenda-custom-commands
+ '(("w" "At work" tags-todo "@work"
+ ((org-agenda-overriding-header "Work")))
+ ("h" "At home" tags-todo "@home"
+ ((org-agenda-overriding-header "Home")))
+ ("u" "At uni" tags-todo "@uni"
+ ((org-agenda-overriding-header "University")))))
+
+;; Set up org registers to quickly jump to files that I use often.
+(set-register ?l (cons 'file "~/.emacs.d/loader.org"))
+(set-register ?m (cons 'file "~/Dropbox/org/main.org"))
+(set-register ?i (cons 'file "~/Dropbox/org/inbox.org"))
+(set-register ?c (cons 'file (format-time-string "~/Dropbox/org/journals/%Y-%m.org")))
+
+;; Set up dictionaries
+(setq ispell-dictionary "en_GB")
+
+(use-package! flyspell
+ :config
+ (define-key flyspell-mode-map (kbd "C-.") nil)
+ (define-key flyspell-mode-map (kbd "C-,") nil))
+
+;; Set up zettelkasten mode
+(use-package! zettelkasten
+ :config
+ (zettelkasten-mode t))
+
+;; Here are some additional functions/macros that could help you configure Doom:
+;;
+;; - `load!' for loading external *.el files relative to this one
+;; - `use-package' for configuring packages
+;; - `after!' for running code after a package has loaded
+;; - `add-load-path!' for adding directories to the `load-path', relative to
+;; this file. Emacs searches the `load-path' when you load packages with
+;; `require' or `use-package'.
+;; - `map!' for binding new keys
+;;
+;; To get information about any of these functions/macros, move the cursor over
+;; the highlighted symbol at press 'K' (non-evil users must press 'C-c g k').
+;; This will open documentation for it, including demos of how they are used.
+;;
+;; You can also try 'gd' (or 'C-c g d') to jump to their definition and see how
+;; they are implemented.
diff --git a/doom/init.el b/doom/init.el
new file mode 100644
index 0000000..d257bc2
--- /dev/null
+++ b/doom/init.el
@@ -0,0 +1,178 @@
+;;; init.el -*- lexical-binding: t; -*-
+
+;; This file controls what Doom modules are enabled and what order they load in.
+;; Remember to run 'doom sync' after modifying it!
+
+;; NOTE Press 'SPC h d h' (or 'C-h d h' for non-vim users) to access Doom's
+;; documentation. There you'll find information about all of Doom's modules
+;; and what flags they support.
+
+;; NOTE Move your cursor over a module's name (or its flags) and press 'K' (or
+;; 'C-c g k' for non-vim users) to view its documentation. This works on
+;; flags as well (those symbols that start with a plus).
+;;
+;; Alternatively, press 'gd' (or 'C-c g d') on a module to browse its
+;; directory (for easy access to its source code).
+
+(doom! :input
+ ;;chinese
+ ;;japanese
+
+ :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
+
+ :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
+ ;;fill-column ; a `fill-column' indicator
+ hl-todo ; highlight TODO/FIXME/NOTE/DEPRECATED/HACK/REVIEW
+ hydra
+ ;;indent-guides ; highlighted indent columns
+ modeline ; snazzy, Atom-inspired modeline, plus API
+ ;;nav-flash ; blink the current line after jumping
+ ;;neotree ; a project drawer, like NERDTree for vim
+ ophints ; highlight the region an operation acts on
+ (popup +defaults) ; tame sudden yet inevitable temporary windows
+ ;;pretty-code ; replace bits of code with pretty symbols
+ ;;tabs ; an 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
+
+ :emacs
+ dired ; making dired pretty [functional]
+ electric ; smarter, keyword-based electric-indent
+ ;;ibuffer ; interactive buffer management
+ vc ; version-control and Emacs, sitting in a tree
+
+ :term
+ ;;eshell ; a consistent, cross-platform shell (WIP)
+ ;;shell ; a terminal REPL for Emacs
+ ;;term ; terminals in Emacs
+ ;;vterm ; another terminals in Emacs
+
+ :checkers
+ syntax ; tasing you for every semicolon you forget
+ (spell +hunspell) ; tasing you for misspelling mispelling
+ grammar ; tasing grammar mistake every you make
+
+ :tools
+ ;;ansible
+ ;;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
+ ;;lsp
+ ;;macos ; MacOS-specific commands
+ 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
+ ;;terraform ; infrastructure as code
+ ;;tmux ; an API for interacting with tmux
+ ;;upload ; map local to remote projects via ssh/ftp
+
+ :lang
+ ;;agda ; types of types of types of types...
+ ;;assembly ; assembly for fun or debugging
+ 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
+ data ; config/data formats
+ ;;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
+ ;;faust ; dsp, but you get to keep your soul
+ ;;fsharp ; ML stands for Microsoft's Language
+ ;;fstar ; (dependent) types and (monadic) effects and Z3
+ ;;go ; the hipster dialect
+ (haskell +dante) ; a language that's lazier than I am
+ ;;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
+ ;;kotlin ; a better, slicker Java(Script)
+ latex ; writing papers in Emacs has never been so fun
+ ;;lean
+ ;;factor
+ ;;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
+ nix ; I hereby declare "nix geht mehr!"
+ ocaml ; an objective camel
+ (org ; organize your plain life in plain text
+ +dragndrop ; drag & drop files/images into org buffers
+ ;;+hugo ; use Emacs for hugo blogging
+ ;;+jupyter ; ipython/jupyter support for babel
+ ;;+pandoc ; export-with-pandoc support
+ ;;+pomodoro ; be fruitful with the tomato technique
+ +present) ; using org-mode for presentations
+ ;;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 ; beautiful is better than ugly
+ ;;qt ; the 'cutest' gui framework ever
+ ;;racket ; a DSL for DSLs
+ ;;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 ; a fully conniving family of lisps
+ sh ; she sells {ba,z,fi}sh shells on the C xor
+ ;;solidity ; do you need a blockchain? No.
+ ;;swift ; who asked for emoji variables?
+ ;;terra ; Earth and Moon in alignment for performance.
+ ;;web ; the tubes
+
+ :email
+ (mu4e +gmail)
+ ;;notmuch
+ ;;(wanderlust +gmail)
+
+ :app
+ ;;calendar
+ ;;irc ; how neckbeards socialize
+ ;;(rss +org) ; emacs as an RSS reader
+ ;;twitter ; twitter client https://twitter.com/vnought
+
+ :config
+ ;;literate
+ (default +bindings +smartparens))
diff --git a/doom/packages.el b/doom/packages.el
new file mode 100644
index 0000000..8891894
--- /dev/null
+++ b/doom/packages.el
@@ -0,0 +1,56 @@
+;; -*- no-byte-compile: t; -*-
+;;; $DOOMDIR/packages.el
+
+;; To install a package with Doom you must declare them here, run 'doom sync' on
+;; the command line, then restart Emacs for the changes to take effect.
+;; Alternatively, use M-x doom/reload.
+;;
+;; WARNING: Disabling core packages listed in ~/.emacs.d/core/packages.el may
+;; have nasty side-effects and is not recommended.
+
+
+;; All of Doom's packages are pinned to a specific commit, and updated from
+;; release to release. To un-pin all packages and live on the edge, do:
+;(unpin! t)
+
+;; ...but to unpin a single package:
+;(unpin! pinned-package)
+;; Use it to unpin multiple packages
+;(unpin! pinned-package another-pinned-package)
+
+
+;; To install SOME-PACKAGE from MELPA, ELPA or emacsmirror:
+;(package! some-package)
+
+;; To install a package directly from a particular repo, you'll need to specify
+;; a `:recipe'. You'll find documentation on what `:recipe' accepts here:
+;; https://github.com/raxod502/straight.el#the-recipe-format
+;(package! another-package
+; :recipe (:host github :repo "username/repo"))
+
+;; If the package you are trying to install does not contain a PACKAGENAME.el
+;; file, or is located in a subdirectory of the repo, you'll need to specify
+;; `:files' in the `:recipe':
+;(package! this-package
+; :recipe (:host github :repo "username/repo"
+; :files ("some-file.el" "src/lisp/*.el")))
+
+;; If you'd like to disable a package included with Doom, for whatever reason,
+;; you can do so here with the `:disable' property:
+;(package! builtin-package :disable t)
+
+;; You can override the recipe of a built in package without having to specify
+;; all the properties for `:recipe'. These will inherit the rest of its recipe
+;; from Doom or MELPA/ELPA/Emacsmirror:
+;(package! builtin-package :recipe (:nonrecursive t))
+;(package! builtin-package-2 :recipe (:repo "myfork/package"))
+
+;; Specify a `:branch' to install a package from a particular branch or tag.
+;; This is required for some packages whose default branch isn't 'master' (which
+;; our package manager can't deal with; see raxod502/straight.el#279)
+;(package! builtin-package :recipe (:branch "develop"))
+
+(package! hungry-delete)
+(package! color-theme-sanityinc-tomorrow)
+(package! zettelkasten
+ :recipe (:host github :repo "ymherklotz/emacs-zettelkasten"))