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