diff --git a/parts/default.nix b/parts/default.nix index 9e3cfa2..b70d183 100644 --- a/parts/default.nix +++ b/parts/default.nix @@ -1,8 +1,9 @@ -_: { +{ imports = [ ./fmt.nix ./shell.nix ./templates ./lib + ./pkgs ]; } diff --git a/parts/pkgs/default.nix b/parts/pkgs/default.nix index e082795..b61a878 100644 --- a/parts/pkgs/default.nix +++ b/parts/pkgs/default.nix @@ -8,7 +8,6 @@ pkgs, ... }: { - # Attributes to add to overlays.default. # The overlays.default overlay will re-evaluate perSystem with the “prev” (or “super”) overlay argument value # as the pkgs module argument. The easyOverlay module also adds the final module argument, for the result of applying the overlay. @@ -17,12 +16,10 @@ # This requires Nixpkgs to be re-evaluated, which is more expensive than setting # pkgs to a Nixpkgs that already includes the necessary overlays that are required # for the flake itself. - overlayAttrs = config.extraPackages; + overlayAttrs = config.packages; - # https://noogle.dev/f/lib/filesystem/packagesFromDirectoryRecursive - extraPackages = lib.packagesFromDirectoryRecursive { - inherit (pkgs) callPackage; - directory = ./extraPackages; + packages = { + nushell = import ./extraPackages/nushell-wrapped.nix {inherit inputs lib pkgs;}; }; }; } diff --git a/parts/pkgs/extraPackages/nushell-wrapped.nix b/parts/pkgs/extraPackages/nushell-wrapped.nix new file mode 100644 index 0000000..920cc6e --- /dev/null +++ b/parts/pkgs/extraPackages/nushell-wrapped.nix @@ -0,0 +1,61 @@ +{ + 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 + oefetch + wget + cpufetch + yt-dlp + tealdeer + glow + hyperfine + imagemagick + ffmpeg-full + catimg + nmap + wget + fd + jq + rsync + figlet + unzip + zip + ]; + }; + } + ]; + }; +in + nushell-wrapped