diff --git a/home/alex/default.nix b/home/alex/default.nix index 9147169..d3db935 100644 --- a/home/alex/default.nix +++ b/home/alex/default.nix @@ -1,7 +1,7 @@ { config, lib, pkgs, inputs, ... }: let electron-overlay = final: prev: { electron = final.electron_25; }; in { - imports = [{ nixpkgs.overlays = [ inputs.emacs.overlay ]; }]; + imports = [ ]; users.users."alex" = { isNormalUser = true; diff --git a/home/alex/home.nix b/home/alex/home.nix index d60cabe..204bc75 100644 --- a/home/alex/home.nix +++ b/home/alex/home.nix @@ -6,8 +6,6 @@ home = { homeDirectory = "/home/alex"; stateVersion = "21.05"; - sessionPath = [ "$HOME/.local/bin" "$HOME/.emacs.d/bin" ]; - shellAliases = { e = "emacsclient -c $@"; }; language.base = "en_US.UTF-8"; diff --git a/home/alex/programs/emacs/default.nix b/home/alex/programs/emacs/default.nix new file mode 100644 index 0000000..ecc6d6e --- /dev/null +++ b/home/alex/programs/emacs/default.nix @@ -0,0 +1,26 @@ +{ inputs, config, lib, pkgs, ... }: + +{ + nixpkgs.overlays = [ inputs.emacs.overlay ]; + + home = { + sessionPath = [ "$HOME/.emacs.d/bin" ]; + shellAliases = { e = "emacsclient -c $@"; }; + }; + + programs.emacs = { + enable = true; + extraPackages = epkgs: with epkgs; [ vterm ]; + }; + + services.emacs = { + enable = true; + defaultEditor = true; + startWithUserSession = true; + }; + + xdg.configFile.doom = { + target = "doom"; + source = ./doom; + }; +} diff --git a/home/alex/programs/emacs/doom/config.el b/home/alex/programs/emacs/doom/config.el new file mode 100644 index 0000000..9832c9a --- /dev/null +++ b/home/alex/programs/emacs/doom/config.el @@ -0,0 +1,300 @@ +;;; $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 "Alexander Kobjolke" + user-mail-address "me@failco.de") + +;; 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)) + +;; 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-gruvbox) + +(require 're-builder) +(setq reb-re-syntax 'string) + +;; 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/" + org-roam-directory (file-truename "~/org/notes")) + +;; do not create a new workspace for each emacsclient +(after! persp-mode +   (setq persp-emacsclient-init-frame-behaviour-override "main")) + +(defun my/org-id-update-org-roam-files () + "Update Org-ID locations for all Org-roam files." + (interactive) + (org-id-update-id-locations (org-roam-list-files))) + +(defun my/org-id-update-id-current-file () + "Scan the current buffer for Org-ID locations and update them." + (interactive) + (org-id-update-id-locations (list (buffer-file-name (current-buffer))))) + +(setq undo-limit 80000000 ; Raise undo-limit to 80Mb + evil-want-fine-undo t ; By default while in insert all changes are one big blob. Be more granular + auto-save-default t ; Nobody likes to loose work, I certainly don't + ) + +;; 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) + +;; mouse +;; enable mouse reporting for terminal emulators +(unless window-system + (xterm-mouse-mode 1) + (global-set-key [mouse-4] (lambda () + (interactive) + (scroll-down 1))) + (global-set-key [mouse-5] (lambda () + (interactive) + (scroll-up 1)))) + +;; disable highlight lines + ;(remove-hook 'doom-first-buffer-hook #'global-hl-line-mode) + +(setq haskell-process-type 'cabal-new-repl) + +(setq evil-snipe-override-evil-repeat-keys nil) +(setq doom-localleader-key ",") +(setq doom-localleader-alt-key "M-,") + +(use-package! org + :config + (setq org-log-into-drawer t + org-tags-column -58 + org-todo-keywords '( + (sequence "NEXT(n)" "TODO(t)" "WAIT(w@/!)" "|" "DONE(d!)" "CNCL(k@)") + (sequence "[ ](T)" "[-](S)" "[?](W)" "|" "[X](D)") + )) + (require 'org-attach-git) + ) + +(setq ak/bibliography (list (concat org-directory "references.bib"))) + ;(setq org-cite-global-bibliography (list (concat org-directory "references.bib"))) +(setq! bibtex-completion-bibliography ak/bibliography) +(setq! citar-bibliography ak/bibliography) + +;; Use an ISO date format for ledger entries +(setq ledger-default-date-format "%Y-%m-%d" + ledger-binary-path "hledger" + ledger-report-auto-width nil + ledger-mode-should-check-version nil + ledger-init-file-name " " + ledger-post-amount-alignment-column 58 + ledger-report-native-highlighting-arguments '("--color=always") + ledger-highlight-xact-under-point t) + +(setq ledger-reports + '(("bal" "%(binary) -f %(ledger-file) bal -B") + ("reg" "%(binary) -f %(ledger-file) reg -B") + ("payee" "%(binary) -f %(ledger-file) reg -B @%(payee)") + ("account" "%(binary) -f %(ledger-file) reg -B %(account)"))) + +;; (use-package! ormolu +;; :hook (haskell-mode . ormolu-format-on-save-mode) +;; :bind +;; (:map haskell-mode-map + +(after! lsp-haskell + (setq lsp-haskell-formatting-provider "fourmolu")) + +;; tweak some VI defaults +(after! evil + (setq evil-ex-substitute-global t ; I like my s/../.. to by global by default + evil-move-cursor-back nil ; Don't move the block cursor when toggling insert mode + evil-kill-on-visual-paste nil)) ; Don't put overwritten text in the kill ring + +(setq org-gtd-update-ack "3.0.0") + +;; Org GTD support +(use-package! org-gtd + :after org + :demand t + :config + (setq org-gtd-directory "~/org") + (setq org-gtd-default-file-name "actionable") + (setq org-edna-use-inheritance t) + ;(setq org-gtd-areas-of-focus '("house" "haskell" "foss")) + ;(setq org-gtd-organize-hooks '(org-gtd-set-area-of-focus org-set-tags-command)) + (org-edna-mode) + (map! :leader + :desc "Capture" "X" #'org-gtd-capture + (:prefix ("d" . "org-gtd") + :desc "Capture" "c" #'org-gtd-capture + :desc "Engage" "e" #'org-gtd-engage-grouped-by-context + :desc "Process inbox" "p" #'org-gtd-process-inbox + :desc "Show all next" "n" #'org-gtd-show-all-next + (:prefix ("r" . "Review") + :desc "Stuck projects" "p" #'org-gtd-review-stuck-projects + :desc "Stuck actions" "a" #'org-gtd-review-stuck-single-action-items + :desc "Stuck habits" "h" #'org-gtd-review-stuck-habit-items + ) + )) + (map! :map org-gtd-clarify-map + :desc "Organize this item" "C-c C-c" #'org-gtd-organize) + :bind + (("C-c d c" . #'org-gtd-capture) + ("C-c d e" . #'org-gtd-engage-grouped-by-context) + ("C-c d p" . #'org-gtd-process-inbox) + ("C-c d n" . #'org-gtd-show-all-next) + ("C-c d r p" . #'org-gtd-review-stuck-projects)) + ) + +(use-package! org-review + :after org + :demand t) + +;; (setq org-agenda-custom-commands +;; '(("R" "Review projects" tags-todo "-CANCELLED/" +;; ((org-agenda-overriding-header "Reviews Scheduled") +;; (org-agenda-skip-function 'org-review-agenda-skip) +;; (org-agenda-cmp-user-defined 'org-review-compare) +;; (org-agenda-sorting-strategy '(user-defined-down)))))) +;; +;; (add-hook 'org-agenda-mode-hook +;; (lambda () +;; (local-set-key (kbd "C-c C-r") +;; 'org-review-insert-last-review))) + + + +(defun ak/org-roam-node-insert-immediate (arg &rest args) + (interactive "P") + (let ((args (cons arg args)) + (org-roam-capture-templates (list (append (car org-capture-templates) '(:immediate-finish t)))) + ) + (apply #'org-roam-node-insert args))) + +(use-package! org-habit + :after org + :config (setq org-habit-show-habits t + org-habit-preceding-days 35 + org-habit-following-days 7 + ) + + ) + +(use-package! org-edna + :after org-gtd + :init + (setq org-edna-use-inheritance t) + :config + (org-edna-mode 1) + ) + +(use-package! emacsql-sqlite3 + :custom + (org-roam-database-connector 'sqlite3)) + +(use-package! nov + :mode ("\\.epub\\'" . nov-mode) + :config + (setq nov-save-place-file (concat doom-cache-dir "nov-places"))) + +(use-package! org-present + :after org) + +(use-package! denote + :after org + :config + (setq denote-directory (concat org-directory "/notes") + + ) + (map! :leader + (:prefix ("n" . "notes") + :desc "Denote" "d" #'denote-open-or-create-with-command + )) + :bind + (("C-c n d" . #'denote-open-or-create-with-command)) + ) + +(use-package! org-super-agenda + :after org-agenda + :init + (setq org-agenda-skip-deadline-if-done t + org-agenda-skip-scheduled-if-done t + org-agenda-include-deadlines t + org-agenda-block-separator nil + org-agenda-compact-blocks t + org-agenda-start-day nil + org-agenda-span 1 + org-agenda-start-on-weekday nil + ) + (setq org-agenda-custom-commands + '(("a" "Getting Things done" + ((agenda "" ((org-agenda-overriding-header "") + (org-super-agenda-groups + '((:name "Today" + :time-grid t + :date today + :order 1))))) + (alltodo "" ((org-agenda-overriding-header "") + (org-super-agenda-groups + '(;(:log t) + (:name "Waiting for..." + :todo "WAIT" + :order 1) + (:discard (:not (:todo ("NEXT" "START")))) + (:name "Next actions" + :auto-parent (:todo ("NEXT" "STRT")) + :order 2 + ) + (:discard (:anything t) + :order 99) + )))) + )))) + :config + (org-super-agenda-mode) + ) + +(use-package! org-fc + :after org + :init + (setq org-fc-directories (concat org-directory "/cards")) + ) + +(use-package! vterm + :config + (setq vterm-min-window-width 50) + ) + +(map! :desc "Move workspace to the left" :leader :n "TAB <" #'+workspace/swap-left) +(map! :desc "Move workspace to the left" :leader :n "TAB >" #'+workspace/swap-right) +(map! :desc "Denote" :leader :n "n d" #'denote) + +;; 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. diff --git a/home/alex/programs/emacs/doom/custom.el b/home/alex/programs/emacs/doom/custom.el new file mode 100644 index 0000000..731fe62 --- /dev/null +++ b/home/alex/programs/emacs/doom/custom.el @@ -0,0 +1,51 @@ +(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. + '(ansi-color-names-vector + ["#282c34" "#ff6c6b" "#98be65" "#ECBE7B" "#51afef" "#c678dd" "#46D9FF" "#bbc2cf"]) + '(custom-safe-themes + '("c4063322b5011829f7fdd7509979b5823e8eea2abf1fe5572ec4b7af1dd78519" "835868dcd17131ba8b9619d14c67c127aa18b90a82438c8613586331129dda63" "7eea50883f10e5c6ad6f81e153c640b3a288cd8dc1d26e4696f7d40f754cc703" default)) + '(exwm-floating-border-color "#191b20") + '(fci-rule-color "#5B6268") + '(highlight-tail-colors + ((("#333a38" "#99bb66" "green") + . 0) + (("#2b3d48" "#46D9FF" "brightcyan") + . 20))) + '(jdee-db-active-breakpoint-face-colors (cons "#1B2229" "#51afef")) + '(jdee-db-requested-breakpoint-face-colors (cons "#1B2229" "#98be65")) + '(jdee-db-spec-breakpoint-face-colors (cons "#1B2229" "#3f444a")) + '(objed-cursor-color "#ff6c6b") + '(pdf-view-midnight-colors (cons "#bbc2cf" "#282c34")) + '(rustic-ansi-faces + ["#282c34" "#ff6c6b" "#98be65" "#ECBE7B" "#51afef" "#c678dd" "#46D9FF" "#bbc2cf"]) + '(vc-annotate-background "#282c34") + '(vc-annotate-color-map + (list + (cons 20 "#98be65") + (cons 40 "#b4be6c") + (cons 60 "#d0be73") + (cons 80 "#ECBE7B") + (cons 100 "#e6ab6a") + (cons 120 "#e09859") + (cons 140 "#da8548") + (cons 160 "#d38079") + (cons 180 "#cc7cab") + (cons 200 "#c678dd") + (cons 220 "#d974b7") + (cons 240 "#ec7091") + (cons 260 "#ff6c6b") + (cons 280 "#cf6162") + (cons 300 "#9f585a") + (cons 320 "#6f4e52") + (cons 340 "#5B6268") + (cons 360 "#5B6268"))) + '(vc-annotate-very-old-color 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. + ) diff --git a/home/alex/programs/emacs/doom/init.el b/home/alex/programs/emacs/doom/init.el new file mode 100644 index 0000000..814545e --- /dev/null +++ b/home/alex/programs/emacs/doom/init.el @@ -0,0 +1,197 @@ +;;; 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 +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 +github +ascii) ; 🙂 + hl-todo ; highlight TODO/FIXME/NOTE/DEPRECATED/HACK/REVIEW + ;;hydra + ;;indent-guides ; highlighted indent columns + ;(ligatures +extra) ; 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 +all) ; 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 +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 +ranger +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 +everywhere +aspell) ; tasing you for misspelling mispelling + ;;grammar ; tasing grammar mistake every you make + + :tools + ansible + biblio ; Writes a PhD for you (citation needed) + (debugger +lsp) ; 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 +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 + tree-sitter + ;;upload ; map local to remote projects via ssh/ftp + + :os + (:if IS-MAC macos) ; improve compatibility with macOS + (tty +osc) ; 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 +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 + ;;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 + (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 +tree-sitter) ; 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!" + ;; A + ;;ocaml ; an objective camel + (org +roam2 +pandoc +present +gnuplot +noter) ; 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 +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 ; 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)) + +(setq native-comp-deferred-compilation nil) +(after! (doom-packages straight) + (setq straight--native-comp-available t)) diff --git a/home/alex/programs/emacs/doom/packages.el b/home/alex/programs/emacs/doom/packages.el new file mode 100644 index 0000000..b0005e2 --- /dev/null +++ b/home/alex/programs/emacs/doom/packages.el @@ -0,0 +1,69 @@ +;; -*- 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! this-package + ; :recipe (:host github :repo "username/repo" + ; :files ("some-file.el" "src/lisp/*.el"))) + +(package! ormolu) +(package! org-gtd + :recipe (:host github :repo "Trevoke/org-gtd.el" :branch "master")) +(package! org-fc + :recipe (:host sourcehut :repo "l3kn/org-fc" :branch "main")) +(package! org-edna) +(package! org-review + :recipe (:host github :repo "jakalx/org-review" :branch "master")) +(package! sqlite3) +(package! emacsql-sqlite3) +(package! nov) +(package! org-present) +(package! denote) +(package! org-super-agenda) diff --git a/home/alex/programs/emacs/doom/snippets/org-mode/__ b/home/alex/programs/emacs/doom/snippets/org-mode/__ new file mode 100644 index 0000000..f221edc --- /dev/null +++ b/home/alex/programs/emacs/doom/snippets/org-mode/__ @@ -0,0 +1,3 @@ +# -*- mode: snippet -*- +# name: Org Template file +# -- diff --git a/home/cli.nix b/home/cli.nix index 4ab3dd3..4ac8f6f 100644 --- a/home/cli.nix +++ b/home/cli.nix @@ -10,13 +10,13 @@ let myEza = if builtins.hasAttr "eza" pkgs then "eza" else "exa"; in { - imports = [ ./alex/programs/neovim/default.nix ]; + imports = + [ ./alex/programs/neovim/default.nix ./alex/programs/emacs/default.nix ]; programs.home-manager.enable = true; home = { stateVersion = "21.05"; - sessionPath = [ "$HOME/.local/bin" "$HOME/.emacs.d/bin" ]; - shellAliases = { e = "emacsclient -c $@"; }; + sessionPath = [ "$HOME/.local/bin" ]; }; # do not show home-manager notifications @@ -140,11 +140,6 @@ in { enableBashIntegration = true; }; - emacs = { - enable = true; - extraPackages = epkgs: with epkgs; [ vterm ]; - }; - gh = { enable = true; settings.git_protocol = "ssh"; @@ -187,12 +182,6 @@ in { defaultCacheTtlSsh = 300; }; - services.emacs = { - enable = true; - defaultEditor = true; - startWithUserSession = true; - }; - home.file.".local" = { recursive = true; source = ./local; diff --git a/hosts/dregil/default.nix b/hosts/dregil/default.nix index e569170..a7c278f 100644 --- a/hosts/dregil/default.nix +++ b/hosts/dregil/default.nix @@ -1,10 +1,7 @@ { lib, config, pkgs, inputs, ... }: { imports = [ ({ inputs, lib, ... }: { - nixpkgs = { - config.allowUnfree = true; - overlays = with inputs; [ emacs.overlay ]; - }; + nixpkgs = { config.allowUnfree = true; }; nix.registry = lib.mapAttrs (_: value: { flake = value; }) inputs; }) ../../modules/security.nix