From ddaea6ac77177c91576568af4b6f6d85195559af Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Tue, 17 Apr 2018 14:03:07 -0500 Subject: [PATCH] pkgs/shells: move extensions to subdirs These are not reaal shells and should go into their parent shell directory. --- .../{ => bash}/bash-completion/default.nix | 0 .../nix-bash-completions/default.nix | 0 .../{ => fish}/fish-foreign-env/default.nix | 0 .../suppress-harmless-warnings.patch | 0 pkgs/shells/{ => zsh}/antigen/default.nix | 0 .../{ => zsh}/grml-zsh-config/default.nix | 0 .../lambda-mod-zsh-theme/default.nix | 0 .../{ => zsh}/nix-zsh-completions/default.nix | 0 pkgs/shells/{ => zsh}/oh-my-zsh/default.nix | 0 .../{ => zsh}/zsh-autosuggestions/default.nix | 0 .../{ => zsh}/zsh-command-time/default.nix | 0 .../{ => zsh}/zsh-completions/default.nix | 0 pkgs/shells/{ => zsh}/zsh-deer/default.nix | 0 pkgs/shells/{ => zsh}/zsh-deer/realpath.patch | 0 .../{ => zsh}/zsh-git-prompt/default.nix | 0 .../{ => zsh}/zsh-powerlevel9k/default.nix | 0 pkgs/shells/{ => zsh}/zsh-prezto/default.nix | 0 .../zsh-syntax-highlighting/default.nix | 0 pkgs/top-level/all-packages.nix | 32 +++++++++---------- 19 files changed, 16 insertions(+), 16 deletions(-) rename pkgs/shells/{ => bash}/bash-completion/default.nix (100%) rename pkgs/shells/{ => bash}/nix-bash-completions/default.nix (100%) rename pkgs/shells/{ => fish}/fish-foreign-env/default.nix (100%) rename pkgs/shells/{ => fish}/fish-foreign-env/suppress-harmless-warnings.patch (100%) rename pkgs/shells/{ => zsh}/antigen/default.nix (100%) rename pkgs/shells/{ => zsh}/grml-zsh-config/default.nix (100%) rename pkgs/shells/{ => zsh}/lambda-mod-zsh-theme/default.nix (100%) rename pkgs/shells/{ => zsh}/nix-zsh-completions/default.nix (100%) rename pkgs/shells/{ => zsh}/oh-my-zsh/default.nix (100%) rename pkgs/shells/{ => zsh}/zsh-autosuggestions/default.nix (100%) rename pkgs/shells/{ => zsh}/zsh-command-time/default.nix (100%) rename pkgs/shells/{ => zsh}/zsh-completions/default.nix (100%) rename pkgs/shells/{ => zsh}/zsh-deer/default.nix (100%) rename pkgs/shells/{ => zsh}/zsh-deer/realpath.patch (100%) rename pkgs/shells/{ => zsh}/zsh-git-prompt/default.nix (100%) rename pkgs/shells/{ => zsh}/zsh-powerlevel9k/default.nix (100%) rename pkgs/shells/{ => zsh}/zsh-prezto/default.nix (100%) rename pkgs/shells/{ => zsh}/zsh-syntax-highlighting/default.nix (100%) diff --git a/pkgs/shells/bash-completion/default.nix b/pkgs/shells/bash/bash-completion/default.nix similarity index 100% rename from pkgs/shells/bash-completion/default.nix rename to 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 similarity index 100% rename from pkgs/shells/nix-bash-completions/default.nix rename to 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 similarity index 100% rename from pkgs/shells/fish-foreign-env/default.nix rename to 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 similarity index 100% rename from pkgs/shells/fish-foreign-env/suppress-harmless-warnings.patch rename to 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 similarity index 100% rename from pkgs/shells/antigen/default.nix rename to 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 similarity index 100% rename from pkgs/shells/grml-zsh-config/default.nix rename to 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 similarity index 100% rename from pkgs/shells/lambda-mod-zsh-theme/default.nix rename to 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 similarity index 100% rename from pkgs/shells/nix-zsh-completions/default.nix rename to 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 similarity index 100% rename from pkgs/shells/oh-my-zsh/default.nix rename to 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 similarity index 100% rename from pkgs/shells/zsh-autosuggestions/default.nix rename to 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 similarity index 100% rename from pkgs/shells/zsh-command-time/default.nix rename to 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 similarity index 100% rename from pkgs/shells/zsh-completions/default.nix rename to pkgs/shells/zsh/zsh-completions/default.nix diff --git a/pkgs/shells/zsh-deer/default.nix b/pkgs/shells/zsh/zsh-deer/default.nix similarity index 100% rename from pkgs/shells/zsh-deer/default.nix rename to pkgs/shells/zsh/zsh-deer/default.nix diff --git a/pkgs/shells/zsh-deer/realpath.patch b/pkgs/shells/zsh/zsh-deer/realpath.patch similarity index 100% rename from pkgs/shells/zsh-deer/realpath.patch rename to 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 similarity index 100% rename from pkgs/shells/zsh-git-prompt/default.nix rename to 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 similarity index 100% rename from pkgs/shells/zsh-powerlevel9k/default.nix rename to pkgs/shells/zsh/zsh-powerlevel9k/default.nix diff --git a/pkgs/shells/zsh-prezto/default.nix b/pkgs/shells/zsh/zsh-prezto/default.nix similarity index 100% rename from pkgs/shells/zsh-prezto/default.nix rename to 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 similarity index 100% rename from pkgs/shells/zsh-syntax-highlighting/default.nix rename to 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;