home

commit afb9bdecc2102bb19d22ebbef87e04cf458953f2
parent 4ee709225bb852b7580c916f4f7f16871325a3ef
Author: Vincent Demeester <vincent@sbr.pm>
Date:   Wed, 22 Jul 2020 12:46:35 +0200

tools/emacs: use more litterate 😛

… and add edit-indirect.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>

Diffstat:
M
tools/emacs/init.el
 | 
6
++++++
M
users/vincent/dev/emacs.nix
 | 
214
++++++++++++++++++++++++++++++++++++++++---------------------------------------

2 files changed, 114 insertions(+), 106 deletions(-)
diff --git a/tools/emacs/init.el b/tools/emacs/init.el
@@ -1,4 +1,7 @@
 ;; Initialization
+;; :PROPERTIES:
+;; :CUSTOM_ID: h:1bb5a9c1-0629-4428-bd2c-73a5fbd968b9
+;; :END:
 ;; 
 ;; I am using the [[https://archive.casouri.cat/note/2020/painless-transition-to-portable-dumper/index.html][portable dump]] feature (/to speed things up/) *but* I want to also start
 ;; without =pdump=, so I need to take both cases into account.
@@ -176,6 +179,9 @@
   (require 'use-package))
 
 ;; Early environment setup
+;; :PROPERTIES:
+;; :CUSTOM_ID: h:859c42d4-876d-43b7-b8c9-8ee2977efb01
+;; :END:
 ;; 
 ;; I want to *force* ==SSH_AUTH_SOCK= in Emacs to use my gpg-agent.
 
diff --git a/users/vincent/dev/emacs.nix b/users/vincent/dev/emacs.nix
@@ -6,8 +6,109 @@ let
     #!${pkgs.stdenv.shell}
     emacsclient -s /run/user/1000/emacs/org -n -F '((name . "capture") (width . 150) (height . 90))' -e '(org-capture)'
   '';
-in
-{
+  myExtraPackages = epkgs: with epkgs; [
+    ace-window
+    aggressive-indent
+    async
+    avy
+    bbdb
+    beginend
+    company
+    company-emoji
+    company-go
+    dash
+    delight
+    dired-collapse
+    dired-git-info
+    dired-narrow
+    dired-quick-sort
+    dired-rsync
+    dockerfile-mode
+    dumb-jump
+    easy-kill
+    edit-indirect
+    envrc
+    esh-autosuggest
+    eshell-prompt-extras
+    esup
+    expand-region
+    flimenu
+    flycheck
+    flycheck-golangci-lint
+    git-annex
+    git-commit
+    gitattributes-mode
+    gitconfig-mode
+    github-review
+    gitignore-mode
+    go-mode
+    gotest
+    goto-last-change
+    hardhat
+    helpful
+    highlight
+    highlight-indentation
+    highlight-numbers
+    ibuffer-vc
+    icomplete-vertical
+    iedit
+    json-mode
+    magit
+    magit-annex
+    magit-popup
+    magit-todos
+    markdown-mode
+    minions
+    modus-operandi-theme
+    moody
+    mwim
+    nix-buffer
+    nix-mode
+    nixpkgs-fmt
+    no-littering
+    ob-async
+    ob-go
+    ob-http
+    olivetti
+    orderless
+    org-capture-pop-frame
+    org-gcal
+    org-journal
+    org-plus-contrib
+    org-ql
+    org-ref
+    org-roam
+    org-super-agenda
+    org-superstar
+    org-tree-slide
+    org-web-tools
+    orgit
+    ox-pandoc
+    pandoc-mode
+    pdf-tools
+    pkgs.bookmark-plus
+    pkgs.dired-plus
+    projectile
+    python-mode
+    rainbow-delimiters
+    rainbow-mode
+    rg
+    ripgrep
+    smartparens
+    symbol-overlay
+    try
+    undo-tree
+    use-package
+    visual-fill-column
+    visual-regexp
+    vterm
+    web-mode
+    wgrep
+    with-editor
+    xterm-color
+    yaml-mode
+  ];
+in {
   home.file.".local/share/applications/org-protocol.desktop".source = ./emacs/org-protocol.desktop;
   home.file.".local/share/applications/ec.desktop".source = ./emacs/ec.desktop;
   home.file.".local/share/applications/capture.desktop".source = ./emacs/capture.desktop;
@@ -20,113 +121,14 @@ in
     # See if I can hide this under an option
     capture
   ];
-  home.sessionVariables = {
-    EDITOR = "et";
-    ALTERNATE_EDITOR = "et";
-  };
   programs.emacs = {
     enable = true;
     package = pkgs.my.emacs;
-    extraPackages = epkgs: with epkgs; [
-      ace-window
-      aggressive-indent
-      async
-      avy
-      bbdb
-      beginend
-      company
-      company-emoji
-      company-go
-      dash
-      delight
-      dired-collapse
-      dired-git-info
-      dired-narrow
-      dired-quick-sort
-      dired-rsync
-      dockerfile-mode
-      dumb-jump
-      easy-kill
-      envrc
-      esh-autosuggest
-      eshell-prompt-extras
-      esup
-      expand-region
-      flimenu
-      flycheck
-      flycheck-golangci-lint
-      git-annex
-      git-commit
-      gitattributes-mode
-      gitconfig-mode
-      github-review
-      gitignore-mode
-      go-mode
-      gotest
-      goto-last-change
-      hardhat
-      helpful
-      highlight
-      highlight-indentation
-      highlight-numbers
-      ibuffer-vc
-      icomplete-vertical
-      iedit
-      json-mode
-      magit
-      magit-annex
-      magit-popup
-      magit-todos
-      markdown-mode
-      minions
-      modus-operandi-theme
-      moody
-      mwim
-      nix-buffer
-      nix-mode
-      nixpkgs-fmt
-      no-littering
-      ob-async
-      ob-go
-      ob-http
-      orderless
-      org-capture-pop-frame
-      org-gcal
-      org-journal
-      org-plus-contrib
-      org-ql
-      org-ref
-      org-roam
-      org-super-agenda
-      org-super-agenda
-      org-tree-slide
-      org-web-tools
-      orgit
-      ox-pandoc
-      pandoc-mode
-      pdf-tools
-      pkgs.bookmark-plus
-      pkgs.dired-plus
-      projectile
-      python-mode
-      rainbow-delimiters
-      rainbow-mode
-      rg
-      ripgrep
-      smartparens
-      symbol-overlay
-      try
-      undo-tree
-      use-package
-      visual-fill-column
-      visual-regexp
-      vterm
-      web-mode
-      wgrep
-      with-editor
-      xterm-color
-      yaml-mode
-    ];
+    extraPackages = myExtraPackages;
+  };
+  home.sessionVariables = {
+    EDITOR = "et";
+    ALTERNATE_EDITOR = "et";
   };
   services.emacs-server = {
     enable = true;