diff --git a/emacs/.DS_Store b/emacs/.DS_Store new file mode 100644 index 0000000..8ea7a2d Binary files /dev/null and b/emacs/.DS_Store differ diff --git a/emacs/emacs-profiles.el b/emacs/emacs-profiles.el new file mode 100644 index 0000000..4133aaf --- /dev/null +++ b/emacs/emacs-profiles.el @@ -0,0 +1,2 @@ +(("default" . ((user-emacs-directory . "~/.doom-emacs"))) + ("legacy" . ((user-emacs-directory . "~/.emacs.default")))) diff --git a/emacs/emacs.doom/config.el b/emacs/emacs.doom/config.el new file mode 100644 index 0000000..f728bc5 --- /dev/null +++ b/emacs/emacs.doom/config.el @@ -0,0 +1,90 @@ +;;; $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 "Anthony Cicchetti" + user-mail-address "anthony@anthonycicchetti.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 "monospace" :size 12 :weight 'semi-light) +;; doom-variable-pitch-font (font-spec :family "sans" :size 13)) +(setq doom-font (font-spec :family "Iosevka Custom" :size 14 :weight 'medium) + doom-unicode-font (font-spec :family "Iosevka Custom" :size 14 :weight 'medium)) + +;; 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-one) + +;; Treemacs +(setq treemacs-git-mode 'deferred) + +;; 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-roam-directory "~/org-roam/") + +;; 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 'relative) + + +;; 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. +(map! :after avy + :leader + :desc "Avy - Go To Any Char" + :n "a" #'avy-goto-char-timer) + +(map! :after evil + :desc "Evil - Scroll Up" + :n "C-k" #'evil-scroll-up + :desc "Evil - Scroll Down" + :n "C-j" #'evil-scroll-down + :leader ( + :desc "Evil - Window Right" + :n "l" #'evil-window-right + :desc "Evil - Window Left" + :n "h" #'evil-window-left + :desc "Evil - Window Down" + :n "j" #'evil-window-down + :desc "Evil - Window Up" + :n "k" #'evil-window-up + :desc "Evil - Comment" + :n "g c" #'evilnc-comment-or-uncomment-lines + :desc "Visualize Undo Tree" + :n "u" #'undo-tree-visualize + :desc "Consult Buffer" + :n "b" #'consult-buffer)) + +(after! magit + (evil-define-key 'normal 'global (kbd "g") 'magit-file-dispatch) + (evil-define-key 'normal 'global (kbd "r") 'magit-status)) diff --git a/emacs/emacs.doom/init.el b/emacs/emacs.doom/init.el new file mode 100644 index 0000000..a85bd36 --- /dev/null +++ b/emacs/emacs.doom/init.el @@ -0,0 +1,191 @@ +;;; 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 + ;;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 ; a search engine for love and life + vertico ; 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 +github) ; 🙂 + hl-todo ; highlight TODO/FIXME/NOTE/DEPRECATED/HACK/REVIEW + ;;hydra + indent-guides ; highlighted indent columns + (ligatures +iosevka) ; 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 +lsp) ; 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 ; interactive buffer management + (undo +tree) ; 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 + 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 +peek) ; M-x vscode + (magit +forge) ; 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 + + :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 +lsp) ; erlang done right + (elm +lsp) ; 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 ; 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 +lsp) ; 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 +lsp) ; 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 +pandoc +pretty +roam2) ; 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 +poetry) ; beautiful is better than ugly + ;;qt ; the 'cutest' gui framework ever + (racket +lsp) ; a DSL for DSLs + ;;raku ; the artist formerly known as perl6 + ;;rest ; Emacs as a REST client + ;;rst ; ReST in peace + (ruby +lsp +rbenv) ; 1.step {|i| p "Ruby is #{i.even? ? 'love' : 'life'}"} + (rust +lsp) ; 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 +lsp) ; JSON, but readable + (zig +lsp) ; 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)) diff --git a/emacs/emacs.doom/packages.el b/emacs/emacs.doom/packages.el new file mode 100644 index 0000000..b80e9cc --- /dev/null +++ b/emacs/emacs.doom/packages.el @@ -0,0 +1,50 @@ +;; -*- 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) diff --git a/emacs/emacs.legacy/.DS_Store b/emacs/emacs.legacy/.DS_Store new file mode 100644 index 0000000..1df8974 Binary files /dev/null and b/emacs/emacs.legacy/.DS_Store differ diff --git a/emacs/custom/elfeed.el b/emacs/emacs.legacy/custom/elfeed.el similarity index 100% rename from emacs/custom/elfeed.el rename to emacs/emacs.legacy/custom/elfeed.el diff --git a/emacs/custom/lsp.el b/emacs/emacs.legacy/custom/lsp.el similarity index 100% rename from emacs/custom/lsp.el rename to emacs/emacs.legacy/custom/lsp.el diff --git a/emacs/early-init.el b/emacs/emacs.legacy/early-init.el similarity index 100% rename from emacs/early-init.el rename to emacs/emacs.legacy/early-init.el diff --git a/emacs/init.el b/emacs/emacs.legacy/init.el similarity index 100% rename from emacs/init.el rename to emacs/emacs.legacy/init.el diff --git a/playbooks/ansible.cfg b/playbooks/ansible.cfg index 66b37ce..3677de6 100644 --- a/playbooks/ansible.cfg +++ b/playbooks/ansible.cfg @@ -1,5 +1,5 @@ [defaults] -interpreter_python = auto +interpreter_python = auto_silent stdout_callback = yaml [galaxy] diff --git a/playbooks/input.yml b/playbooks/input.yml index 7142af3..8d7df39 100644 --- a/playbooks/input.yml +++ b/playbooks/input.yml @@ -16,7 +16,7 @@ private: no default: "no" - name: _emacs_plus - prompt: "Don you want emacs-plus?" + prompt: "Do you want emacs-plus?" private: no default: "no" tasks: diff --git a/playbooks/roles/emacs/defaults/main.yml b/playbooks/roles/emacs/defaults/main.yml index 3660559..f0e9013 100644 --- a/playbooks/roles/emacs/defaults/main.yml +++ b/playbooks/roles/emacs/defaults/main.yml @@ -1,2 +1,4 @@ --- dev_machine: yes +legacy_root: "~/.emacs.legacy" +doom_root: "~/.doom.d" diff --git a/playbooks/roles/emacs/tasks/main.yml b/playbooks/roles/emacs/tasks/main.yml index 6482907..e2b2976 100644 --- a/playbooks/roles/emacs/tasks/main.yml +++ b/playbooks/roles/emacs/tasks/main.yml @@ -1,27 +1,71 @@ --- -- name: Ensure emacs config directory exists +- name: "Clone chemacs" + git: + repo: "https://github.com/plexus/chemacs2" + dest: ~/.emacs.d + clone: yes + update: yes + +- name: "Write .emacs-profiles.el" file: - path: ~/.emacs.d + src: ~/.dotfiles/emacs/emacs-profiles.el + dest: ~/.emacs-profiles.el + state: link + force: yes + +- name: "Create Emacs Legacy" + file: + path: ~/.emacs.legacy state: directory -- name: Symlink init.el +- name: "[Emacs Legacy] - init.el" file: - src: ~/.dotfiles/emacs/init.el - dest: ~/.emacs.d/init.el + src: ~/.dotfiles/emacs/emacs.legacy/init.el + dest: "{{ legacy_root }}/init.el" state: link force: yes -- name: Symlink custom directory +- name: "[Emacs Legacy] - Symlink custom directory" file: - src: ~/.dotfiles/emacs/custom - dest: ~/.emacs.d/custom + src: ~/.dotfiles/emacs/emacs.legacy/custom + dest: "{{ legacy_root }}/custom" state: link force: yes -- name: Symlink early-init.el +- name: "[Emacs Legacy] - Symlink early-init.el" file: - src: ~/.dotfiles/emacs/early-init.el - dest: ~/.emacs.d/early-init.el + src: ~/.dotfiles/emacs/emacs.legacy/early-init.el + dest: "{{ legacy_root }}/early-init.el" state: link force: yes +- name: "[Doom Emacs] - Clone Doom" + git: + repo: "https://github.com/hlissner/doom-emacs" + dest: ~/.doom-emacs + clone: yes + +- name: "[Doom Emacs] - init.el" + file: + src: ~/.dotfiles/emacs/emacs.doom/init.el + dest: "{{ doom_root }}/init.el" + state: link + force: yes + +- name: "[Doom Emacs] - config.el" + file: + src: ~/.dotfiles/emacs/emacs.doom/config.el + dest: "{{ doom_root }}/config.el" + state: link + force: yes + +- name: "[Doom Emacs] - packages.el" + file: + src: ~/.dotfiles/emacs/emacs.doom/packages.el + dest: "{{ doom_root }}/packages.el" + state: link + force: yes + +- name: "[Doom Emacs] - Install" + ansible.builtin.shell: + cmd: "~/.doom-emacs/bin/doom -y install"