diff --git a/users/alice/home/doom/.gitmodules b/users/alice/home/doom/.gitmodules new file mode 100644 index 0000000..271f662 --- /dev/null +++ b/users/alice/home/doom/.gitmodules @@ -0,0 +1,3 @@ +[submodule "snippets/cc-mode"] + path = snippets/cc-mode + url = https://github.com/insertProfessionalUsernameHere/cc-doxy.git diff --git a/users/alice/home/doom/config.el b/users/alice/home/doom/config.el new file mode 100644 index 0000000..cb29913 --- /dev/null +++ b/users/alice/home/doom/config.el @@ -0,0 +1,139 @@ +;;; $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 "Alice Huston" + user-mail-address "aliceghuston@gmail.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. +;; - `doom-unicode-font' -- for unicode glyphs +;; - `doom-serif-font' -- for the `fixed-pitch-serif' face +;; +;; 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 "monospace" :size 12 :weight 'semi-light) +;; doom-variable-pitch-font (font-spec :family "sans" :size 13)) +(setq doom-font (font-spec :family "FiraCode Nerd Font Mono" :size 18) + doom-variable-pitch-font (font-spec :family "DejaVu Sans" :size 20) + doom-big-font (font-spec :family "FiraCode Nerd Font Mono" :size 30)) + +;; 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 'doom-dark+) + +(after! doom-themes + (setq doom-themes-enable-bold t + doom-themes-enable-italic t)) + +(custom-set-faces! + '(font-lock-comment-face :slant italic) + '(font-lock-keyword-face :slant italic)) + +;; 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/") + +;; 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 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 c k'). +;; This will open documentation for it, including demos of how they are used. +;; +;; You can also try 'gd' (or 'C-c c d') to jump to their definition and see how +;; they are implemented. + +;; Resolves BSPWM/Emacs issue where BSPWM won't tile Emacs to the appropriate +;; size on opening unless this is set + +(setq frame-resize-pixelwise t) + +;; CCLS config stuff +;;(after! ccls +;; (setq ccls-initialization-options '(:index (:comments 2) :completion (:detailedLabel t))) +;; (set-lsp-priority! 'ccls 2)) + +;; clangd config +;; (setq lsp-clients-clangd-args '("-j=3" +;; "--background-index" +;; "--clang-tidy" +;; "--completion-style=detailed" +;; "--header-insertion=never" +;; "--header-insertion-decorators=0")) +;; (after! lsp-clangd (set-lsp-priority! 'clangd 2)) + +;; Prevents large # of files from loading in +;; (setq lsp-file-watch-threshold 300) + +;; set rust analyzer to default +;; (after! lsp-rust +;; (setq rustic-lsp-server 'rust-analyzer)) +;; (setq grip-preview-use-webkit t) + +;; set up doxygen generation +;; (use-package! gendoxy +;; :hook (cc-mode)) + +;; Disable automatic minibuffer popups for snippets and functions +;; (setq lsp-signature-auto-activate 'nil) + +;; local configuration for TeX modes +;; (defun my-latex-mode-setup () +;; (setq-local company-backends +;; (append '((company-math-symbols-latex company-latex-commands)) +;; company-backends))) + +;; (add-hook 'tex-mode-hook 'my-latex-mode-setup) + +;; set erlang formatter +;; (set-formatter! 'erlfmt "rebar3 fmt" :modes '(erlang-mode)) + +;; Recommended config for company-tabnine +;;(after! company +;; (setq +lsp-company-backends '(company-tabnine :separate company-capf company-yasnippet)) +;; (setq company-show-quick-access t) +;; (setq company-idle-delay 0) +;;) + +;; enable wakatime globally + (global-wakatime-mode) + +;; get tab working? +;;(define-key evil-insert-state-map (kbd "TAB") 'tab-to-tab-stop) + +;; TODO Figure out what this one does +;; (setq org-agenda-todo-list-sublevels 'nil) + +;; Promela mode configs +;; (require 'promela-mode) +;; (add-to-list 'auto-mode-alist '("\\.pml\\'" . promela-mode)) + +;; Use package tree-sitter +;; (use-package! tree-sitter +;; :config +;; (require 'tree-sitter-langs) +;; (global-tree-sitter-mode) +;; (add-hook 'tree-sitter-after-on-hook #'tree-sitter-hl-mode)) diff --git a/users/alice/home/doom/custom.el b/users/alice/home/doom/custom.el new file mode 100644 index 0000000..8c9db8c --- /dev/null +++ b/users/alice/home/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/alice/Documents/org-docs/"))) +(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. + '(font-lock-comment-face ((t (:slant italic)))) + '(font-lock-keyword-face ((t (:slant italic))))) diff --git a/users/alice/home/doom/default.nix b/users/alice/home/doom/default.nix new file mode 100644 index 0000000..f7843d2 --- /dev/null +++ b/users/alice/home/doom/default.nix @@ -0,0 +1,15 @@ +{ + config, + lib, + pkgs, + ... +}: + +{ + xdg.configFile."doom/config.el".source = "./doom/config.el"; + xdg.configFile."doom/custom.el".source = "./doom/custom.el"; + xdg.configFile."doom/init.el".source = "./doom/init.el"; + xdg.configFile."doom/packages.el".source = "./doom/packages.el"; + xdg.configFile."doom/snippets/cc-mode/cc-doxy".source = "./doom/snippets/cc-mode/cc-doxy"; + xdg.configFile."doom/snippets/cc-mode/README.md".source = "./doom/snippets/cc-mode/README.md"; +} diff --git a/users/alice/home/doom/init.el b/users/alice/home/doom/init.el new file mode 100644 index 0000000..814e367 --- /dev/null +++ b/users/alice/home/doom/init.el @@ -0,0 +1,205 @@ +;;; 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). + +(doom! :input + ;;bidi ; (tfel ot) thgir etirw uoy gnipleh + ;;chinese + ;;japanese + ;;layout ; auie,ctsrnm is the superior home row + + :completion + (company +tng) ; 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 + (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 +pretty) ; vcs diff in the fringe + vi-tilde-fringe ; fringe tildes to mark beyond EOB + ;;(window-select +numbers) ; 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 +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 +hunspell +everywhere) ; tasing you for misspelling mispelling + ;;grammar ; tasing grammar mistake every you make + + :tools + ;;ansible + ;;biblio ; Writes a PhD for you (citation needed) + ;;collab ; buffers with friends + ;;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 ; M-x vscode + 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 + tree-sitter ; syntax and parsing, sitting in a tree... + ;;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 +lsp) ; 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 +lsp) ; an elegant language for a more civilized age + ;;ess ; emacs speaks statistics + ;;factor + ;;faust ; dsp, but you get to keep your soul + ;;fortran ; 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 +tree-sitter) ; the hipster dialect + ;;(graphql +lsp) ; Give queries a REST + ;;(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 +lsp) ; the poster child for carpal tunnel syndrome + (javascript +lsp +tree-sitter) ; all(hope(abandon(ye(who(enter(here)))))) + ;;julia ; a better, faster MATLAB + ;;kotlin ; a better, slicker Java(Script) + (latex +lsp +fold +cdlatex) ; 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 +lsp +tree-sitter) ; 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 +lsp +pyright +tree-sitter) ; 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 +lsp +tree-sitter) ; 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 ; the tubes + (yaml +lsp +tree-sitter) ; JSON, but readable + ;;zig ; C, but simpler + + :email + ;;(mu4e +org +gmail) + ;;notmuch + ;;(wanderlust +gmail) + + :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 + + :config + ;;literate + (default +bindings +smartparens)) + + +;;; Fix for doom upgrade hanging +;; (after! comp +;; ;; HACK Disable native-compilation for some troublesome packages +;; (mapc (doom-partial #'add-to-list 'native-comp-deferred-compilation-deny-list) +;; (list "/emacs-jupyter.*\\.el\\'" +;; "/evil-collection-vterm\\.el\\'" +;; "/vterm\\.el\\'" +;; "/with-editor\\.el\\'"))) diff --git a/users/alice/home/doom/packages.el b/users/alice/home/doom/packages.el new file mode 100644 index 0000000..28546b6 --- /dev/null +++ b/users/alice/home/doom/packages.el @@ -0,0 +1,79 @@ +;; -*- no-byte-compile: t; -*- +;;; $DOOMDIR/packages.el + +;; To install a package with Doom you must declare them here and run 'doom sync' +;; on the command line, then restart Emacs for the changes to take effect -- or +;; use 'M-x doom/reload'. + + +;; To install SOME-PACKAGE from MELPA, ELPA or emacsmirror: +;(package! some-package) + +;; To install a package directly from a remote git repo, you must 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, 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")) + +;; Use `:pin' to specify a particular commit to install. +;(package! builtin-package :pin "1a2b3c4d5e") + + +;; Doom's packages are pinned to a specific commit and updated from release to +;; release. The `unpin!' macro allows you to unpin single packages... +;(unpin! pinned-package) +;; ...or multiple packages +;(unpin! pinned-package another-pinned-package) +;; ...Or *all* packages (NOT RECOMMENDED; will likely break things) +;(unpin! t) + +(package! gendoxy + :recipe (:host github :repo "mp81ss/gendoxy" :files ("gendoxy.el")) + :pin "ad470f5") + +;; Promela model checker +(package! promela-mode + :recipe (:host github :repo "g15ecb/promela-mode" :files ("promela-mode.el"))) + +;;(package! company-tabnine :recipe (:host github :repo "TommyX12/company-tabnine")) + +(package! wakatime-mode) + +;; vterm seg-fault fix +;; https://github.com/akermu/emacs-libvterm/issues/559 +;;(package! vterm :recipe +;; (:host github +;; :repo "blahgeek/emacs-libvterm" +;; :branch "fix-visibility")) + +;; Handlebars web format +(package! handlebars-mode + :recipe (:host github :repo "danielevans/handlebars-mode" :files ("handlebars-mode.el"))) + +;; Pinning due to doom getting locked in an error loop +;; (package! straight :pin "3eca39d") + +(package! pacdiff.el + :recipe (:host github :repo "fbrosda/pacdiff.el" :files ("pacdiff.el" "README.org" "LICENSE"))) diff --git a/users/alice/home/doom/snippets/cc-mode/README.md b/users/alice/home/doom/snippets/cc-mode/README.md new file mode 100644 index 0000000..a7d0ccc --- /dev/null +++ b/users/alice/home/doom/snippets/cc-mode/README.md @@ -0,0 +1,12 @@ +# cc-doxy +A short emacs yasnippet for automatic doxygen function comment generation + +Requirements: Emacs, Yasnippet, Semantic-mode. + +Simply place in "~/.emacs.d/el-get/yasnippet/snippets/cc-mode/" or your system equivalent, then "M-x yas-reload-all", and you're all set! + +This implementation was taken from here: + +https://emacs.stackexchange.com/questions/8006/is-there-a-yasnippet-producing-a-prepopulated-doxygen-comment + +and modified further to fix bugs I encountered and fit the output to my particular style. diff --git a/users/alice/home/doom/snippets/cc-mode/cc-doxy b/users/alice/home/doom/snippets/cc-mode/cc-doxy new file mode 100644 index 0000000..4036589 --- /dev/null +++ b/users/alice/home/doom/snippets/cc-mode/cc-doxy @@ -0,0 +1,36 @@ +# -*- mode: snippet -*- +# name: cc-doxy +# key: cc-doxy +# type: command +# contributors: Alex Murray , Thomas Cushman +# -- +(unless (and (fboundp 'semantic-current-tag) + semantic-mode) + (error "Semantic required to use dox snippet")) +(let ((tag (senator-next-tag))) + (while (or (null tag) + (not (semantic-tag-of-class-p tag 'function))) + (setq tag (senator-next-tag))) + (let* ((name (semantic-tag-name tag)) + (attrs (semantic-tag-attributes tag)) + (args (plist-get attrs :arguments)) + (return-name (plist-get attrs :type)) + (idx 1)) + (if (listp return-name) + (setq return-name (car return-name))) + (yas/expand-snippet + (format + "/** +* @brief %s - $1%s%s +**/ +" + name + (mapconcat + (lambda (x) + (format "\n* @param %s - ${%d:Description of %s}" + (car x) (incf idx) (car x))) + args + "\n") + (if (and return-name (not (string-equal "void" return-name))) + (format "\n* @return ${%d:%s}" (incf idx) return-name) + "")))))