Splitting jq,yq,xq off.

lib/common/default.nix

@@ -33,6 +33,7 @@ in {
     ../pkgs/attic-client.nix
     ../pkgs/nvim.nix
     ../pkgs/tmux.nix
+    ../pkgs/jq.nix
     ./nix.nix
     ./identities/users.nix
     ./identities/known_hosts.nix
@@ -177,12 +178,6 @@ in {
         # Basic CLI downloader
         wget
 
-        # useful for CLI based yaml processing
-        yq
-
-        # Useful for CLI based json processing
-        jq
-
         # checking temps and basics
         lm_sensors
 

lib/common/desktop/default.nix

@@ -42,7 +42,6 @@ in {
     ../../pkgs/kiwix-serve.nix
     ../../pkgs/s3.nix
     ../../pkgs/zeal
-    ../../pkgs/jq.nix
   ];
 
   stylix = {

lib/pkgs/jq.nix

@@ -1,31 +1,26 @@
 {pkgs, ...}: {
   environment.systemPackages = with pkgs; [
     gojq
+    yq
+    xq
   ];
 
-  home-manager.users.atropos = {
-    programs = {
-      atuin.enableZshIntegration = true;
-      # kitty.shellIntegration.enableZshIntegration = true;
+  home-manager.users.atropos.programs = {
+    zsh = {
+      plugins = [
+        {
+          name = "fzf-jq";
+          src = pkgs.fetchFromGitHub {
+            owner = "reegnz";
+            repo = "jq-zsh-plugin";
+            rev = "48befbcd91229e48171d4aac5215da205c1f497e";
+            sha256 = "sha256-q/xQZ850kifmd8rCMW+aAEhuA43vB9ZAW22sss9e4SE=";
+          };
+          file = "jq.plugin.zsh";
+        }
+      ];
 
-      zsh = {
-        plugins = [
-          {
-            name = "fzf-jq";
-            src = pkgs.fetchFromGitHub {
-              owner = "reegnz";
-              repo = "jq-zsh-plugin";
-              rev = "48befbcd91229e48171d4aac5215da205c1f497e";
-              sha256 = "sha256-q/xQZ850kifmd8rCMW+aAEhuA43vB9ZAW22sss9e4SE=";
-            };
-            file = "jq.plugin.zsh";
-          }
-        ];
-
-        shellAliases = {
-          # general
-        };
-      };
+      shellAliases.jq = "gojq";
     };
   };
 }

lib/pkgs/zsh/default.nix

@@ -40,16 +40,6 @@ in {
         # INFO: These file paths are found by installing it first with bogus file
         # and then going to ~/.config/zsh/plugins and finding the plugin we want within which we have share/... path that we should put here.
         plugins = [
-          {
-            name = "fzf-jq";
-            src = pkgs.fetchFromGitHub {
-              owner = "reegnz";
-              repo = "jq-zsh-plugin";
-              rev = "48befbcd91229e48171d4aac5215da205c1f497e";
-              sha256 = "sha256-q/xQZ850kifmd8rCMW+aAEhuA43vB9ZAW22sss9e4SE=";
-            };
-            file = "jq.plugin.zsh";
-          }
           {
             name = "fzf-tab";
             src = pkgs.zsh-fzf-tab;