From c9da101ffdd8c4add76e08b949a65cbdfa13de93 Mon Sep 17 00:00:00 2001
From: Infinidoge <infinidoge@inx.moe>
Date: Tue, 28 May 2024 10:59:04 -0400
Subject: [PATCH] global/emacs: move some packages to global/packages

---
 modules/global/packages.nix    |  4 ++++
 users/modules/global/emacs.nix | 13 -------------
 2 files changed, 4 insertions(+), 13 deletions(-)

diff --git a/modules/global/packages.nix b/modules/global/packages.nix
index 3c8f2ac..88fad09 100644
--- a/modules/global/packages.nix
+++ b/modules/global/packages.nix
@@ -36,6 +36,7 @@
     moreutils
     nmap
     openssl
+    pandoc
     parallel
     parted
     pciutils
@@ -58,6 +59,7 @@
     yq
     zip
   ] ++ (lib.optionals config.info.graphical (with pkgs; [
+    graphviz
     yt-dlp
   ]));
 
@@ -81,5 +83,7 @@
     arandr
     ffmpeg-full
     mpv
+    xclip
+    xdotool
   ]));
 }
diff --git a/users/modules/global/emacs.nix b/users/modules/global/emacs.nix
index c4a9314..a6156f2 100644
--- a/users/modules/global/emacs.nix
+++ b/users/modules/global/emacs.nix
@@ -23,9 +23,6 @@ lib.mkIf main.info.graphical {
 
     packages = with pkgs; lib.flatten [
       # --- Doom Emacs ---
-      fd
-      ripgrep
-      fzf
       mlocate
 
       gnumake
@@ -35,11 +32,6 @@ lib.mkIf main.info.graphical {
       editorconfig-core-c
       editorconfig-checker
 
-      # --- :app ---
-      # :app everywhere
-      xdotool
-      xclip
-
       # --- :editor ---
       # :editor format
       nodePackages.prettier
@@ -50,7 +42,6 @@ lib.mkIf main.info.graphical {
       ## +gnuplot
       gnuplot
       ## +roam2
-      graphviz
 
       # :lang common-lisp
       sbcl
@@ -95,7 +86,6 @@ lib.mkIf main.info.graphical {
       ])
 
       # :lang markdown
-      pandoc
       # python3Packages.grip
       python-grip
 
@@ -103,9 +93,6 @@ lib.mkIf main.info.graphical {
       shellcheck
       shfmt
 
-      # :lang json
-      jq
-
       # :lang data
       libxml2