merge: sync with desktop

programs/emacs/default.nix

@@ -1,9 +1,12 @@
-{ pkgs, lib, ... }:
+{ pkgs, ... }:
 
 {
-  programs.emacs.enable = true;
-
   home.packages = with pkgs; [
+    # CORE
+    git
+    emacs
+    ripgrep
+
     # Optional for DOOM
     clang
     coreutils
@@ -16,37 +19,15 @@
         pt_BR
       ]
     )) # for flyspell
-    gnuplot # for plotting graphs
+    gnuplot_qt # for plotting graphs
     languagetool # for grammar
     ledger # for accounting and org-ledger
+    gzip # Otherwise random errors occur from the onChange script
   ];
 
   # Neatly place the configuration files for doom in their right place.
-  xdg.configFile."doom" =
-    let
-      # What DOOM needs to be able to install/sync.
-      packagesNeeded = with pkgs; [
-        git
-        emacs
-        ripgrep
-      ];
-    in
-    {
-      source = ./doom;
-      recursive = true;
-
-      onChange = # sh
-        ''
-          # Need to set this so DOOM can find all binaries.
-          export PATH="${lib.strings.concatMapStrings (x: x + "/bin:") packagesNeeded}$PATH"
-
-          if [ ! -d "$HOME/.emacs.d" ]; then
-            git clone https://github.com/hlissner/doom-emacs $HOME/.emacs.d
-            $HOME/.emacs.d/bin/doom install
-          else
-            # Needed to apply the configuration changes.
-            $HOME/.emacs.d/bin/doom sync
-          fi
-        '';
-    };
+  xdg.configFile."doom" = {
+    source = ./doom;
+    recursive = true;
+  };
 }

programs/emacs/doom/init.el

@@ -77,7 +77,7 @@
        :term
        ;;eshell            ; the elisp shell that works everywhere
        ;;shell             ; simple shell REPL for Emacs
-       ;;term              ; basic terminal emulator for Emacs
+       term              ; basic terminal emulator for Emacs
        ;;vterm             ; the best terminal emulation in Emacs
 
        :checkers