From 3abc0a2a9345a8bcf6390848866f127661761e8e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20Schr=C3=B6ter?= <dev@felschr.com>
Date: Mon, 26 Jun 2023 18:13:44 +0200
Subject: [PATCH] feat(shell): use nu_scripts from nixpkgs

---
 home/shell/nushell.nix | 35 ++++++++++++++---------------------
 1 file changed, 14 insertions(+), 21 deletions(-)

diff --git a/home/shell/nushell.nix b/home/shell/nushell.nix
index a06a48d..01ffa8f 100644
--- a/home/shell/nushell.nix
+++ b/home/shell/nushell.nix
@@ -4,13 +4,6 @@ let
   shellAliases = import ./aliases.nix;
   aliasesStr = builtins.concatStringsSep "\n"
     (pkgs.lib.mapAttrsToList (k: v: "alias ${k} = ${v}") shellAliases);
-
-  nu_scripts = pkgs.fetchFromGitHub {
-    owner = "nushell";
-    repo = "nu_scripts";
-    rev = "e8cda90b52e567ef0d85742ab44fc1cfe09a9917";
-    hash = "sha256-eGuROnSgjSWRve2krb+Nz/53Svi4lKrcDB4tdWAOG9M=";
-  };
 in {
   programs.nushell = {
     enable = true;
@@ -23,20 +16,20 @@ in {
 
       ${aliasesStr}
 
-      use ${nu_scripts}/ssh/ssh.nu *
-      use ${nu_scripts}/git/git.nu *
-      use ${nu_scripts}/docker/docker.nu *
-      use ${nu_scripts}/custom-completions/git/git-completions.nu *
-      use ${nu_scripts}/custom-completions/nix/nix-completions.nu *
-      use ${nu_scripts}/custom-completions/cargo/cargo-completions.nu *
-      use ${nu_scripts}/custom-completions/npm/npm-completions.nu *
-      use ${nu_scripts}/custom-completions/auto-generate/completions/wget.nu *
-      # use ${nu_scripts}/custom-completions/auto-generate/completions/tar.nu * # TODO broken
-      use ${nu_scripts}/custom-completions/auto-generate/completions/zstd.nu *
-      use ${nu_scripts}/custom-completions/auto-generate/completions/unzstd.nu *
-      use ${nu_scripts}/custom-completions/auto-generate/completions/npm.nu *
-      use ${nu_scripts}/custom-completions/auto-generate/completions/dotnet.nu *
-      use ${nu_scripts}/custom-completions/auto-generate/completions/terraform.nu *
+      use ${pkgs.unstable.nu_scripts}/share/nu_scripts/modules/network/ssh.nu *
+      use ${pkgs.unstable.nu_scripts}/share/nu_scripts/modules/git/git.nu *
+      use ${pkgs.unstable.nu_scripts}/share/nu_scripts/modules/docker/docker.nu *
+      use ${pkgs.unstable.nu_scripts}/share/nu_scripts/custom-completions/git/git-completions.nu *
+      use ${pkgs.unstable.nu_scripts}/share/nu_scripts/custom-completions/nix/nix-completions.nu *
+      use ${pkgs.unstable.nu_scripts}/share/nu_scripts/custom-completions/cargo/cargo-completions.nu *
+      use ${pkgs.unstable.nu_scripts}/share/nu_scripts/custom-completions/npm/npm-completions.nu *
+      use ${pkgs.unstable.nu_scripts}/share/nu_scripts/custom-completions/auto-generate/completions/wget.nu *
+      # use ${pkgs.unstable.nu_scripts}/share/nu_scripts/custom-completions/auto-generate/completions/tar.nu * # TODO broken
+      use ${pkgs.unstable.nu_scripts}/share/nu_scripts/custom-completions/auto-generate/completions/zstd.nu *
+      use ${pkgs.unstable.nu_scripts}/share/nu_scripts/custom-completions/auto-generate/completions/unzstd.nu *
+      use ${pkgs.unstable.nu_scripts}/share/nu_scripts/custom-completions/auto-generate/completions/npm.nu *
+      use ${pkgs.unstable.nu_scripts}/share/nu_scripts/custom-completions/auto-generate/completions/dotnet.nu *
+      use ${pkgs.unstable.nu_scripts}/share/nu_scripts/custom-completions/auto-generate/completions/terraform.nu *
     '';
     envFile.text = "";
   };