diff --git a/home/default.nix b/home/default.nix index dd419fd4..f411c534 100644 --- a/home/default.nix +++ b/home/default.nix @@ -4,7 +4,6 @@ imports = [ ./accounts.nix ./alacritty.nix - ./emacs.nix ./firefox.nix ./fzf.nix ./git.nix @@ -15,6 +14,7 @@ ./tmux.nix ./zathura.nix ./hyprland/default.nix + ./emacs/default.nix ]; home.packages = with pkgs; [ dig silver-searcher gnumake rink ]; programs = { diff --git a/home/emacs.nix b/home/emacs/default.nix similarity index 95% rename from home/emacs.nix rename to home/emacs/default.nix index 0223bfa5..3bf0e70f 100644 --- a/home/emacs.nix +++ b/home/emacs/default.nix @@ -5,7 +5,10 @@ let DOOMPROFILELOADFILE = "${DOOMLOCALDIR}/load.el"; }; in { - xdg.configFile.emacs.source = doom-emacs; + xdg.configFile = { + emacs.source = doom-emacs; + doom.source = ./doom; + }; systemd.user = { inherit sessionVariables; }; programs.emacs = { enable = true; diff --git a/home/emacs/doom/config.el b/home/emacs/doom/config.el new file mode 100644 index 00000000..0e468333 --- /dev/null +++ b/home/emacs/doom/config.el @@ -0,0 +1,106 @@ +;;; $DOOMDIR/config.el -*- lexical-binding: t; -*- + +;; Place your private configuration here! Remember, you do not need to run 'doom +;; sync' after modifying this file! + +;; UTF-8 support +(prefer-coding-system 'utf-8) +(set-default-coding-systems 'utf-8) +(set-terminal-coding-system 'utf-8) +(set-keyboard-coding-system 'utf-8) +(setq x-select-request-type '(UTF8_STRING COMPOUND_TEXT TEXT STRING)) + +(setq user-full-name "Evelyn Litherland-Smith" + user-mail-address "e.litherlandsmith@proton.me" + doom-font (font-spec :family "FiraCode Nerd Font" :size 16 :weight 'regular) + doom-theme 'catppuccin + catppuccin-flavor 'macchiato + display-line-numbers-type 'relative + org-directory "~/Notes/" + +latex-viewers '(pdf-tools) + +format-with-lsp nil) +(+global-word-wrap-mode +1) +(load-theme 'catppuccin t t) +(catppuccin-reload) + +;; elfeed RSS sources +(after! elfeed + (setq elfeed-feeds + '("https://systemcrafters.net/rss/news.xml" + "https://www.zotero.org/blog/feed/")) + (add-hook! 'elfeed-search-mode-hook #'elfeed-update)) + +;; projectile auto-discover projects +(after! projectile + (setq projectile-auto-discover t) + (setq projectile-project-search-path '("~/Projects/"))) + +(after! (magit magit-delta) + (add-hook 'magit-mode-hook (lambda () (magit-delta-mode +1)))) + +;; mail settings +(after! mu4e + (setq mu4e-get-mail-command "true" + mu4e-update-interval 60 + mu4e-sent-messages-behavior 'delete + mu4e-attachment-dir "~/Downloads" + mu4e-change-filenames-when-moving t + sendmail-program (executable-find "msmtp") + send-mail-function #'smtpmail-send-it + message-sendmail-f-is-evil t + message-sendmail-extra-arguments '("--read-envelope-from") + message-send-mail-function #'message-send-mail-with-sendmail) + + ;; Add accounts with contexts + (set-email-account! "proton.me" + '((user-mail-address . "e.litherlandsmith@proton.me") + (mu4e-sent-folder . "/Proton/Sent") + (mu4e-drafts-folder . "/Proton/Drafts") + (mu4e-trash-folder . "/Proton/Trash") + (mu4e-refile-folder . "/Proton/Archive")) + t) + (set-email-account! "icloud.com" + '((user-mail-address . "e.litherlandsmith@icloud.com") + (mu4e-sent-folder . "/iCloud/Sent Messages") + (mu4e-drafts-folder . "/iCloud/Drafts") + (mu4e-trash-folder . "/iCloud/Trash") + (mu4e-refile-folder . "/iCloud/Archive")) + nil) + (set-email-account! "ukaea.uk" + '((user-mail-address . "evie.litherland-smith@ukaea.uk") + (mu4e-sent-folder . "/UKAEA/Sent") + (mu4e-drafts-folder . "/UKAEA/Drafts") + (mu4e-trash-folder . "/UKAEA/Trash") + (mu4e-refile-folder . "/UKAEA/Archive")) + nil) + ) + +;; Calendar settings +(defun open-calendar-all () + (interactive) + (cfw:open-calendar-buffer + :contents-sources + (list + (cfw:org-create-source "Green") ; org-agenda source + (cfw:ical-create-source "Personal" "~/.calendars/nextcloud/personal.ics" "Red") + (cfw:ical-create-source "Birthdays" "~/.calendars/nextcloud/contact_birthdays.ics" "Grey") + ;; (cfw:ical-create-source "UKAEA" "~/.calendars/ukaea/calendar.ics" "Blue") + ))) + +;; Org-mode settings +(after! org + (setq org-agenda-files + '("~/Notes/" + "~/Notes/roam/" + "~/Notes/roam/daily/")) + (setq org-agenda-prefix-format + '((agenda . " %i %-12:c%-12t") + (todo . " %i %-24:c") + (tags . " %i %-24:c") + (search . " %i %-24:c")))) + +;; Set org-roam capture templates +(after! org-roam + (setq org-roam-capture-templates + '(("d" "default" plain "%?" + :target (file+head "${slug}.org" "#+title: ${title}\n"))))) diff --git a/home/emacs/doom/custom.el b/home/emacs/doom/custom.el new file mode 100644 index 00000000..87bac1d3 --- /dev/null +++ b/home/emacs/doom/custom.el @@ -0,0 +1,12 @@ +(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. + '(auth-source-save-behavior nil)) +(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. + '(ts-fold-replacement-face ((t (:foreground unspecified :box nil :inherit font-lock-comment-face :weight light))))) diff --git a/home/emacs/doom/init.el b/home/emacs/doom/init.el new file mode 100644 index 00000000..9e45e48b --- /dev/null +++ b/home/emacs/doom/init.el @@ -0,0 +1,193 @@ +;;; 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 a "Module Index" link where you'll find +;; a comprehensive list 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 c 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 c d') on a module to browse its +;; directory (for easy access to its source code). + +;;; Code: +(doom! :input + ;; chinese + ;; japanese + ;; 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 +fuzzy +icons) ; a search engine for love and life + (vertico +icons) ; the search engine of the future + + :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) ; 🙂 + 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 + + :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 +icons) ; making dired pretty [functional] + electric ; smarter, keyword-based electric-indent + (ibuffer +icons) ; 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 + + :checkers + syntax ; tasing you for every semicolon you forget + (spell +flyspell) ; tasing you for misspelling mispelling + ;; grammar ; tasing grammar mistake every you make + + :tools + ;; ansible + ;; biblio ; Writes a PhD for you (citation needed) + ;; debugger ; FIXME stepping through code, to help you add bugs + direnv + (docker +lsp) + ;; 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 +eglot) ; M-x vscode + magit ; a git porcelain for Emacs + make ; run make tasks from Emacs + (pass +auth) ; 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 + tree-sitter ; Better syntax highlighting + ;; 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 + + :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 + ;; dhall + ;; 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 + (fortran +lsp) ; in FORTRAN, GOD is REAL (unless declared INTEGER) + ;; 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 +lsp) ; 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 +lsp) ; writing papers in Emacs has never been so fun + ;; lean ; for folks with too much to prove + ;; ledger ; be audit you can be + (lua +lsp +tree-sitter) ; one-based indices? one-based indices + markdown ; writing docs for people to ignore + ;; nim ; python + lisp at the speed of c + (nix +lsp +tree-sitter) ; I hereby declare "nix geht mehr!" + ;; ocaml ; an objective camel + (org +roam2 +noter +pretty +present +pandoc) ; organize your plain life in plain text + ;; php ; perl's insecure younger brother + ;; plantuml ; diagrams for confusing people more + ;; purescript ; javascript, but functional + (python +lsp +tree-sitter +pyright +cython) ; 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 +lsp +tree-sitter) ; 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 +tree-sitter) ; the tubes + (yaml +lsp +tree-sitter) ; JSON, but readable + ;; zig ; C, but simpler + + :email + (mu4e +org +gmail) + ;; (notmuch +afew +org) + ;; (wanderlust +gmail) + + :app + calendar + emms + ;; everywhere ; *leave* Emacs!? You must be joking + ;; irc ; how neckbeards socialize + rss ; emacs as an RSS reader + ;; twitter ; twitter client https://twitter.com/vnought + + :config + ;; literate + (default +bindings +smartparens)) diff --git a/home/emacs/doom/packages.el b/home/emacs/doom/packages.el new file mode 100644 index 00000000..1c0b1bc5 --- /dev/null +++ b/home/emacs/doom/packages.el @@ -0,0 +1,6 @@ +;; -*- no-byte-compile: t; -*- +;;; $DOOMDIR/packages.el + +(package! catppuccin-theme) +(package! pocket-reader) +(package! magit-delta) diff --git a/home/emacs/doom/snippets/python-mode/salclient b/home/emacs/doom/snippets/python-mode/salclient new file mode 100644 index 00000000..356f3874 --- /dev/null +++ b/home/emacs/doom/snippets/python-mode/salclient @@ -0,0 +1,22 @@ +# -*- mode: snippet -*- +# name: sal = SALClient(...) +# key: salclient +# -- +from socket import getfqdn +from sal.client import SALClient +from sal.core.exception import AuthenticationFailed + +SAL_HOST = getfqdn("sal") +SAL_BACKUP_HOST = "sal.jet.uk" + +try: + sal = SALClient("https://{}".format(SAL_HOST if SAL_HOST != "sal" else SAL_BACKUP_HOST)) +except ConnectionError: + sal = SALClient("https://{}".format(SAL_BACKUP_HOST)) + +try: + sal.list("/") +except AuthenticationFailed: + sal.authenticate() + +$0 \ No newline at end of file