From c2959b633b25d24caeff1ac04d2ee31c960321aa Mon Sep 17 00:00:00 2001
From: Charlie Root <charlie@charlieroot.dev>
Date: Sun, 15 Sep 2024 21:01:17 +0200
Subject: [PATCH] =?UTF-8?q?nushell:=20sl=E1=B9=95lit=20up=20configuration?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 parts/pkgs/default.nix                        |  2 +-
 parts/pkgs/extraPackages/nushell-wrapped.nix  | 61 -------------------
 parts/pkgs/extraPackages/nushell/default.nix  |  4 +-
 parts/pkgs/extraPackages/nushell/packages.nix |  1 -
 4 files changed, 2 insertions(+), 66 deletions(-)
 delete mode 100644 parts/pkgs/extraPackages/nushell-wrapped.nix

diff --git a/parts/pkgs/default.nix b/parts/pkgs/default.nix
index 0c4cc6d..8959595 100644
--- a/parts/pkgs/default.nix
+++ b/parts/pkgs/default.nix
@@ -20,7 +20,7 @@
     overlayAttrs = config.packages;
 
     packages = {
-      nushell = import ./extraPackages/nushell-wrapped.nix {inherit inputs lib pkgs;};
+      nushell = import ./extraPackages/nushell {inherit inputs lib pkgs;};
       helix = import ./extraPackages/helix-wrapped.nix {inherit inputs inputs' lib pkgs;};
     };
   };
diff --git a/parts/pkgs/extraPackages/nushell-wrapped.nix b/parts/pkgs/extraPackages/nushell-wrapped.nix
deleted file mode 100644
index 0fc793a..0000000
--- a/parts/pkgs/extraPackages/nushell-wrapped.nix
+++ /dev/null
@@ -1,61 +0,0 @@
-{
-  inputs,
-  lib,
-  pkgs,
-  ...
-}: let
-
-  nushell-wrapped = inputs.wrapper-manager.lib.build {
-    inherit pkgs;
-    modules = [
-      {
-        wrappers.nushell-wrapped = {
-          basePackage = pkgs.nushell;
-          pathAdd = with pkgs; [
-            # better cd
-            zoxide
-            #better ls
-            eza
-
-            # better grep
-            ripgrep
-
-            # better dig
-            dogdns
-
-            # simply the best fetch tool out there
-            microfetch
-
-            fzf
-
-iputils
-            gnumake
-            gping
-            asciinema
-            inetutils
-            scc
-            onefetch
-            wget
-            cpufetch
-            yt-dlp
-            tealdeer
-            glow
-            hyperfine
-            imagemagick
-            ffmpeg-full
-            catimg
-            nmap
-            wget
-            fd
-            jq
-            rsync
-            figlet
-            unzip
-            zip
-          ];
-        };
-      }
-    ];
-  };
-in
-  nushell-wrapped
diff --git a/parts/pkgs/extraPackages/nushell/default.nix b/parts/pkgs/extraPackages/nushell/default.nix
index 27b88d6..cf299e7 100644
--- a/parts/pkgs/extraPackages/nushell/default.nix
+++ b/parts/pkgs/extraPackages/nushell/default.nix
@@ -18,9 +18,7 @@
       {
         wrappers.nushell-wrapped = {
           basePackage = pkgs.nushell;
-          pathAdd = [
-            packages
-          ];
+          pathAdd = packages;
         };
       }
     ];
diff --git a/parts/pkgs/extraPackages/nushell/packages.nix b/parts/pkgs/extraPackages/nushell/packages.nix
index 976af48..39778ca 100644
--- a/parts/pkgs/extraPackages/nushell/packages.nix
+++ b/parts/pkgs/extraPackages/nushell/packages.nix
@@ -18,7 +18,6 @@
 
   fzf
 
-  cpc
   difftastic
   hexyl
   gitui