pkgs/shells: move extensions to subdirs

These are not reaal shells and should go into their parent shell
directory.

19 files changed, 16 insertions, 16 deletions

diff --git a/pkgs/shells/bash-completion/default.nix b/pkgs/shells/bash/bash-completion/default.nix
index b5f600da8f7..b5f600da8f7 100644
--- a/pkgs/shells/bash-completion/default.nix
+++ b/pkgs/shells/bash/bash-completion/default.nix
diff --git a/pkgs/shells/nix-bash-completions/default.nix b/pkgs/shells/bash/nix-bash-completions/default.nix
index 739dbd538a6..739dbd538a6 100644
--- a/pkgs/shells/nix-bash-completions/default.nix
+++ b/pkgs/shells/bash/nix-bash-completions/default.nix
diff --git a/pkgs/shells/fish-foreign-env/default.nix b/pkgs/shells/fish/fish-foreign-env/default.nix
index 445e961c649..445e961c649 100644
--- a/pkgs/shells/fish-foreign-env/default.nix
+++ b/pkgs/shells/fish/fish-foreign-env/default.nix
diff --git a/pkgs/shells/fish-foreign-env/suppress-harmless-warnings.patch b/pkgs/shells/fish/fish-foreign-env/suppress-harmless-warnings.patch
index 5e4569f0a15..5e4569f0a15 100644
--- a/pkgs/shells/fish-foreign-env/suppress-harmless-warnings.patch
+++ b/pkgs/shells/fish/fish-foreign-env/suppress-harmless-warnings.patch
diff --git a/pkgs/shells/antigen/default.nix b/pkgs/shells/zsh/antigen/default.nix
index cf22207ef09..cf22207ef09 100644
--- a/pkgs/shells/antigen/default.nix
+++ b/pkgs/shells/zsh/antigen/default.nix
diff --git a/pkgs/shells/grml-zsh-config/default.nix b/pkgs/shells/zsh/grml-zsh-config/default.nix
index e516393a23c..e516393a23c 100644
--- a/pkgs/shells/grml-zsh-config/default.nix
+++ b/pkgs/shells/zsh/grml-zsh-config/default.nix
diff --git a/pkgs/shells/lambda-mod-zsh-theme/default.nix b/pkgs/shells/zsh/lambda-mod-zsh-theme/default.nix
index 6dea51a487e..6dea51a487e 100644
--- a/pkgs/shells/lambda-mod-zsh-theme/default.nix
+++ b/pkgs/shells/zsh/lambda-mod-zsh-theme/default.nix
diff --git a/pkgs/shells/nix-zsh-completions/default.nix b/pkgs/shells/zsh/nix-zsh-completions/default.nix
index 2bcff6b809d..2bcff6b809d 100644
--- a/pkgs/shells/nix-zsh-completions/default.nix
+++ b/pkgs/shells/zsh/nix-zsh-completions/default.nix
diff --git a/pkgs/shells/oh-my-zsh/default.nix b/pkgs/shells/zsh/oh-my-zsh/default.nix
index 5412f4ce896..5412f4ce896 100644
--- a/pkgs/shells/oh-my-zsh/default.nix
+++ b/pkgs/shells/zsh/oh-my-zsh/default.nix
diff --git a/pkgs/shells/zsh-autosuggestions/default.nix b/pkgs/shells/zsh/zsh-autosuggestions/default.nix
index 906301110e9..906301110e9 100644
--- a/pkgs/shells/zsh-autosuggestions/default.nix
+++ b/pkgs/shells/zsh/zsh-autosuggestions/default.nix
diff --git a/pkgs/shells/zsh-command-time/default.nix b/pkgs/shells/zsh/zsh-command-time/default.nix
index 453a5774407..453a5774407 100644
--- a/pkgs/shells/zsh-command-time/default.nix
+++ b/pkgs/shells/zsh/zsh-command-time/default.nix
diff --git a/pkgs/shells/zsh-completions/default.nix b/pkgs/shells/zsh/zsh-completions/default.nix
index 92a9d293e84..92a9d293e84 100644
--- a/pkgs/shells/zsh-completions/default.nix
+++ b/pkgs/shells/zsh/zsh-completions/default.nix
diff --git a/pkgs/shells/zsh-deer/default.nix b/pkgs/shells/zsh/zsh-deer/default.nix
index 735d6a2b761..735d6a2b761 100644
--- a/pkgs/shells/zsh-deer/default.nix
+++ b/pkgs/shells/zsh/zsh-deer/default.nix
diff --git a/pkgs/shells/zsh-deer/realpath.patch b/pkgs/shells/zsh/zsh-deer/realpath.patch
index 03850d7e5c1..03850d7e5c1 100644
--- a/pkgs/shells/zsh-deer/realpath.patch
+++ b/pkgs/shells/zsh/zsh-deer/realpath.patch
diff --git a/pkgs/shells/zsh-git-prompt/default.nix b/pkgs/shells/zsh/zsh-git-prompt/default.nix
index 7318da83d17..7318da83d17 100644
--- a/pkgs/shells/zsh-git-prompt/default.nix
+++ b/pkgs/shells/zsh/zsh-git-prompt/default.nix
diff --git a/pkgs/shells/zsh-powerlevel9k/default.nix b/pkgs/shells/zsh/zsh-powerlevel9k/default.nix
index 2babf35f2b6..2babf35f2b6 100644
--- a/pkgs/shells/zsh-powerlevel9k/default.nix
+++ b/pkgs/shells/zsh/zsh-powerlevel9k/default.nix
diff --git a/pkgs/shells/zsh-prezto/default.nix b/pkgs/shells/zsh/zsh-prezto/default.nix
index 7bef904081e..7bef904081e 100644
--- a/pkgs/shells/zsh-prezto/default.nix
+++ b/pkgs/shells/zsh/zsh-prezto/default.nix
diff --git a/pkgs/shells/zsh-syntax-highlighting/default.nix b/pkgs/shells/zsh/zsh-syntax-highlighting/default.nix
index b7b44098fd7..b7b44098fd7 100644
--- a/pkgs/shells/zsh-syntax-highlighting/default.nix
+++ b/pkgs/shells/zsh/zsh-syntax-highlighting/default.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 44e6877090f..6b0423de0f4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1424,7 +1424,7 @@ with pkgs;
     utillinux = utillinuxMinimal;
   };
 
-  antigen = callPackage ../shells/antigen { };
+  antigen = callPackage ../shells/zsh/antigen { };
 
   apparix = callPackage ../tools/misc/apparix { };
 
@@ -1888,7 +1888,7 @@ with pkgs;
 
   debootstrap = callPackage ../tools/misc/debootstrap { };
 
-  deer = callPackage ../shells/zsh-deer { };
+  deer = callPackage ../shells/zsh/zsh-deer { };
 
   detox = callPackage ../tools/misc/detox { };
 
@@ -4026,7 +4026,7 @@ with pkgs;
 
   offlineimap = callPackage ../tools/networking/offlineimap { };
 
-  oh-my-zsh = callPackage ../shells/oh-my-zsh { };
+  oh-my-zsh = callPackage ../shells/zsh/oh-my-zsh { };
 
   ola = callPackage ../applications/misc/ola { };
 
@@ -5790,17 +5790,17 @@ with pkgs;
 
   zsh-autoenv = callPackage ../tools/misc/zsh-autoenv { };
 
-  zsh-git-prompt = callPackage ../shells/zsh-git-prompt { };
+  zsh-git-prompt = callPackage ../shells/zsh/zsh-git-prompt { };
 
   zsh-navigation-tools = callPackage ../tools/misc/zsh-navigation-tools { };
 
-  zsh-syntax-highlighting = callPackage ../shells/zsh-syntax-highlighting { };
+  zsh-syntax-highlighting = callPackage ../shells/zsh/zsh-syntax-highlighting { };
 
-  zsh-autosuggestions = callPackage ../shells/zsh-autosuggestions { };
+  zsh-autosuggestions = callPackage ../shells/zsh/zsh-autosuggestions { };
 
-  zsh-powerlevel9k = callPackage ../shells/zsh-powerlevel9k { };
+  zsh-powerlevel9k = callPackage ../shells/zsh/zsh-powerlevel9k { };
 
-  zsh-command-time = callPackage ../shells/zsh-command-time { };
+  zsh-command-time = callPackage ../shells/zsh/zsh-command-time { };
 
   zssh = callPackage ../tools/networking/zssh { };
 
@@ -5827,9 +5827,9 @@ with pkgs;
     interactive = true;
   });
 
-  bash-completion = callPackage ../shells/bash-completion { };
+  bash-completion = callPackage ../shells/bash/bash-completion { };
 
-  nix-bash-completions = callPackage ../shells/nix-bash-completions { };
+  nix-bash-completions = callPackage ../shells/bash/nix-bash-completions { };
 
   dash = callPackage ../shells/dash { };
 
@@ -5837,7 +5837,7 @@ with pkgs;
 
   fish = callPackage ../shells/fish { };
 
-  fish-foreign-env = callPackage ../shells/fish-foreign-env { };
+  fish-foreign-env = callPackage ../shells/fish/fish-foreign-env { };
 
   ion = callPackage ../shells/ion { };
 
@@ -5859,13 +5859,13 @@ with pkgs;
 
   zsh = callPackage ../shells/zsh { };
 
-  nix-zsh-completions = callPackage ../shells/nix-zsh-completions { };
+  nix-zsh-completions = callPackage ../shells/zsh/nix-zsh-completions { };
 
-  zsh-completions = callPackage ../shells/zsh-completions { };
+  zsh-completions = callPackage ../shells/zsh/zsh-completions { };
 
-  zsh-prezto = callPackage ../shells/zsh-prezto { };
+  zsh-prezto = callPackage ../shells/zsh/zsh-prezto { };
 
-  grml-zsh-config = callPackage ../shells/grml-zsh-config { };
+  grml-zsh-config = callPackage ../shells/zsh/grml-zsh-config { };
 
 
   ### DEVELOPMENT / COMPILERS
@@ -11278,7 +11278,7 @@ with pkgs;
     haskellLib = haskell.lib;
   };
 
-  lambda-mod-zsh-theme = callPackage ../shells/lambda-mod-zsh-theme/default.nix { };
+  lambda-mod-zsh-theme = callPackage ../shells/zsh/lambda-mod-zsh-theme { };
 
   leksah = callPackage ../development/tools/haskell/leksah {
     inherit (haskellPackages) ghcWithPackages;