A directory-category for terminal emulators

This is a mostly cosmetical commit, in the sense it doesn't change the contents
of any package, but reorganizes the overall Nixpkgs expressions.

Terminal emulators are an ubiquitous tool for any Unix user; even the beginners
are routinely familiarized to it. And, manifestly, there are many
implementations of terminal emulators out there, from those traditionally made
in C and C++ to those written in Haskell and Go.

Terminal emulators deserve more highlight. This commit does that by creating a
category for them.

60 files changed, 48 insertions, 38 deletions

diff --git a/doc/contributing/coding-conventions.xml b/doc/contributing/coding-conventions.xml
index fcb6501f615..e587275a638 100644
--- a/doc/contributing/coding-conventions.xml
+++ b/doc/contributing/coding-conventions.xml
@@ -524,6 +524,16 @@ args.stdenv.mkDerivation (args // {
        </varlistentry>
        <varlistentry>
         <term>
+         If it’s a <emphasis>terminal emulator</emphasis>:
+        </term>
+        <listitem>
+         <para>
+          <filename>applications/terminal-emulators</filename> (e.g. <filename>alacritty</filename> or <filename>rxvt</filename> or <filename>termite</filename>)
+         </para>
+        </listitem>
+       </varlistentry>
+       <varlistentry>
+        <term>
          If it’s for <emphasis>video playback / editing</emphasis>:
         </term>
         <listitem>
diff --git a/pkgs/applications/misc/alacritty/default.nix b/pkgs/applications/terminal-emulators/alacritty/default.nix
index 72e00cb15a7..72e00cb15a7 100644
--- a/pkgs/applications/misc/alacritty/default.nix
+++ b/pkgs/applications/terminal-emulators/alacritty/default.nix
diff --git a/pkgs/applications/misc/aminal/default.nix b/pkgs/applications/terminal-emulators/aminal/default.nix
index 7f04a93d6a3..7f04a93d6a3 100644
--- a/pkgs/applications/misc/aminal/default.nix
+++ b/pkgs/applications/terminal-emulators/aminal/default.nix
diff --git a/pkgs/applications/misc/cool-retro-term/default.nix b/pkgs/applications/terminal-emulators/cool-retro-term/default.nix
index 739ad07adbf..739ad07adbf 100644
--- a/pkgs/applications/misc/cool-retro-term/default.nix
+++ b/pkgs/applications/terminal-emulators/cool-retro-term/default.nix
diff --git a/pkgs/applications/misc/eterm/default.nix b/pkgs/applications/terminal-emulators/eterm/default.nix
index b51acd9fa72..b51acd9fa72 100644
--- a/pkgs/applications/misc/eterm/default.nix
+++ b/pkgs/applications/terminal-emulators/eterm/default.nix
diff --git a/pkgs/applications/misc/evilvte/default.nix b/pkgs/applications/terminal-emulators/evilvte/default.nix
index 7a5284a527a..7a5284a527a 100644
--- a/pkgs/applications/misc/evilvte/default.nix
+++ b/pkgs/applications/terminal-emulators/evilvte/default.nix
diff --git a/pkgs/applications/misc/foot/default.nix b/pkgs/applications/terminal-emulators/foot/default.nix
index 3d95f7c5772..3d95f7c5772 100644
--- a/pkgs/applications/misc/foot/default.nix
+++ b/pkgs/applications/terminal-emulators/foot/default.nix
diff --git a/pkgs/applications/misc/guake/default.nix b/pkgs/applications/terminal-emulators/guake/default.nix
index d403ddc8b26..d403ddc8b26 100644
--- a/pkgs/applications/misc/guake/default.nix
+++ b/pkgs/applications/terminal-emulators/guake/default.nix
diff --git a/pkgs/applications/misc/havoc/default.nix b/pkgs/applications/terminal-emulators/havoc/default.nix
index a6d5278fc3c..a6d5278fc3c 100644
--- a/pkgs/applications/misc/havoc/default.nix
+++ b/pkgs/applications/terminal-emulators/havoc/default.nix
diff --git a/pkgs/applications/misc/hyper/default.nix b/pkgs/applications/terminal-emulators/hyper/default.nix
index 1535b1a2568..1535b1a2568 100644
--- a/pkgs/applications/misc/hyper/default.nix
+++ b/pkgs/applications/terminal-emulators/hyper/default.nix
diff --git a/pkgs/applications/misc/iterm2/default.nix b/pkgs/applications/terminal-emulators/iterm2/default.nix
index e273eda45c3..e273eda45c3 100644
--- a/pkgs/applications/misc/iterm2/default.nix
+++ b/pkgs/applications/terminal-emulators/iterm2/default.nix
diff --git a/pkgs/applications/misc/iterm2/disable_updates.patch b/pkgs/applications/terminal-emulators/iterm2/disable_updates.patch
index e717c58f30f..e717c58f30f 100644
--- a/pkgs/applications/misc/iterm2/disable_updates.patch
+++ b/pkgs/applications/terminal-emulators/iterm2/disable_updates.patch
diff --git a/pkgs/applications/misc/kitty/default.nix b/pkgs/applications/terminal-emulators/kitty/default.nix
index e2eda846d60..e2eda846d60 100644
--- a/pkgs/applications/misc/kitty/default.nix
+++ b/pkgs/applications/terminal-emulators/kitty/default.nix
diff --git a/pkgs/applications/misc/kitty/fix-paths.patch b/pkgs/applications/terminal-emulators/kitty/fix-paths.patch
index 380f6d74914..380f6d74914 100644
--- a/pkgs/applications/misc/kitty/fix-paths.patch
+++ b/pkgs/applications/terminal-emulators/kitty/fix-paths.patch
diff --git a/pkgs/applications/misc/lilyterm/default.nix b/pkgs/applications/terminal-emulators/lilyterm/default.nix
index 28f9625b5b6..28f9625b5b6 100644
--- a/pkgs/applications/misc/lilyterm/default.nix
+++ b/pkgs/applications/terminal-emulators/lilyterm/default.nix
diff --git a/pkgs/applications/misc/lxterminal/default.nix b/pkgs/applications/terminal-emulators/lxterminal/default.nix
index 8c002bd14b0..8c002bd14b0 100644
--- a/pkgs/applications/misc/lxterminal/default.nix
+++ b/pkgs/applications/terminal-emulators/lxterminal/default.nix
diff --git a/pkgs/applications/misc/lxterminal/respect-xml-catalog-files-var.patch b/pkgs/applications/terminal-emulators/lxterminal/respect-xml-catalog-files-var.patch
index 598f506118f..598f506118f 100644
--- a/pkgs/applications/misc/lxterminal/respect-xml-catalog-files-var.patch
+++ b/pkgs/applications/terminal-emulators/lxterminal/respect-xml-catalog-files-var.patch
diff --git a/pkgs/applications/misc/microcom/default.nix b/pkgs/applications/terminal-emulators/microcom/default.nix
index 8377505ec1c..8377505ec1c 100644
--- a/pkgs/applications/misc/microcom/default.nix
+++ b/pkgs/applications/terminal-emulators/microcom/default.nix
diff --git a/pkgs/applications/misc/mlterm/default.nix b/pkgs/applications/terminal-emulators/mlterm/default.nix
index 7c7906fc841..7c7906fc841 100644
--- a/pkgs/applications/misc/mlterm/default.nix
+++ b/pkgs/applications/terminal-emulators/mlterm/default.nix
diff --git a/pkgs/applications/misc/mrxvt/default.nix b/pkgs/applications/terminal-emulators/mrxvt/default.nix
index 4dc70133ec4..4dc70133ec4 100644
--- a/pkgs/applications/misc/mrxvt/default.nix
+++ b/pkgs/applications/terminal-emulators/mrxvt/default.nix
diff --git a/pkgs/applications/misc/nimmm/default.nix b/pkgs/applications/terminal-emulators/nimmm/default.nix
index 383057ca655..383057ca655 100644
--- a/pkgs/applications/misc/nimmm/default.nix
+++ b/pkgs/applications/terminal-emulators/nimmm/default.nix
diff --git a/pkgs/applications/misc/roxterm/default.nix b/pkgs/applications/terminal-emulators/roxterm/default.nix
index d02296f0e16..d02296f0e16 100644
--- a/pkgs/applications/misc/roxterm/default.nix
+++ b/pkgs/applications/terminal-emulators/roxterm/default.nix
diff --git a/pkgs/applications/misc/rxvt-unicode-plugins/default.nix b/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/default.nix
index 74bfbe83e91..74bfbe83e91 100644
--- a/pkgs/applications/misc/rxvt-unicode-plugins/default.nix
+++ b/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/default.nix
diff --git a/pkgs/applications/misc/rxvt-unicode-plugins/urxvt-autocomplete-all-the-things/default.nix b/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-autocomplete-all-the-things/default.nix
index a4e03fa347f..a4e03fa347f 100644
--- a/pkgs/applications/misc/rxvt-unicode-plugins/urxvt-autocomplete-all-the-things/default.nix
+++ b/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-autocomplete-all-the-things/default.nix
diff --git a/pkgs/applications/misc/rxvt-unicode-plugins/urxvt-bidi/default.nix b/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-bidi/default.nix
index 4b6b4eb8184..4b6b4eb8184 100644
--- a/pkgs/applications/misc/rxvt-unicode-plugins/urxvt-bidi/default.nix
+++ b/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-bidi/default.nix
diff --git a/pkgs/applications/misc/rxvt-unicode-plugins/urxvt-font-size/default.nix b/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-font-size/default.nix
index f81709b9739..f81709b9739 100644
--- a/pkgs/applications/misc/rxvt-unicode-plugins/urxvt-font-size/default.nix
+++ b/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-font-size/default.nix
diff --git a/pkgs/applications/misc/rxvt-unicode-plugins/urxvt-perl/default.nix b/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-perl/default.nix
index 0c95acd7205..0c95acd7205 100644
--- a/pkgs/applications/misc/rxvt-unicode-plugins/urxvt-perl/default.nix
+++ b/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-perl/default.nix
diff --git a/pkgs/applications/misc/rxvt-unicode-plugins/urxvt-perls/default.nix b/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-perls/default.nix
index 53bb938c333..53bb938c333 100644
--- a/pkgs/applications/misc/rxvt-unicode-plugins/urxvt-perls/default.nix
+++ b/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-perls/default.nix
diff --git a/pkgs/applications/misc/rxvt-unicode-plugins/urxvt-resize-font/default.nix b/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-resize-font/default.nix
index a056e603f00..a056e603f00 100644
--- a/pkgs/applications/misc/rxvt-unicode-plugins/urxvt-resize-font/default.nix
+++ b/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-resize-font/default.nix
diff --git a/pkgs/applications/misc/rxvt-unicode-plugins/urxvt-tabbedex/default.nix b/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-tabbedex/default.nix
index 71a55f9293c..71a55f9293c 100644
--- a/pkgs/applications/misc/rxvt-unicode-plugins/urxvt-tabbedex/default.nix
+++ b/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-tabbedex/default.nix
diff --git a/pkgs/applications/misc/rxvt-unicode-plugins/urxvt-theme-switch/default.nix b/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-theme-switch/default.nix
index 5a84a9b472a..5a84a9b472a 100644
--- a/pkgs/applications/misc/rxvt-unicode-plugins/urxvt-theme-switch/default.nix
+++ b/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-theme-switch/default.nix
diff --git a/pkgs/applications/misc/rxvt-unicode-plugins/urxvt-vtwheel/default.nix b/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-vtwheel/default.nix
index aebbedacef6..aebbedacef6 100644
--- a/pkgs/applications/misc/rxvt-unicode-plugins/urxvt-vtwheel/default.nix
+++ b/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-vtwheel/default.nix
diff --git a/pkgs/applications/misc/rxvt-unicode/default.nix b/pkgs/applications/terminal-emulators/rxvt-unicode/default.nix
index 6512f402ffb..6512f402ffb 100644
--- a/pkgs/applications/misc/rxvt-unicode/default.nix
+++ b/pkgs/applications/terminal-emulators/rxvt-unicode/default.nix
diff --git a/pkgs/applications/misc/rxvt-unicode/patches/256-color-resources.patch b/pkgs/applications/terminal-emulators/rxvt-unicode/patches/256-color-resources.patch
index c8d2acfbdc5..c8d2acfbdc5 100644
--- a/pkgs/applications/misc/rxvt-unicode/patches/256-color-resources.patch
+++ b/pkgs/applications/terminal-emulators/rxvt-unicode/patches/256-color-resources.patch
diff --git a/pkgs/applications/misc/rxvt-unicode/patches/9.06-font-width.patch b/pkgs/applications/terminal-emulators/rxvt-unicode/patches/9.06-font-width.patch
index 636083218fa..636083218fa 100644
--- a/pkgs/applications/misc/rxvt-unicode/patches/9.06-font-width.patch
+++ b/pkgs/applications/terminal-emulators/rxvt-unicode/patches/9.06-font-width.patch
diff --git a/pkgs/applications/misc/rxvt-unicode/patches/makefile-phony.patch b/pkgs/applications/terminal-emulators/rxvt-unicode/patches/makefile-phony.patch
index 5e42e17c156..5e42e17c156 100644
--- a/pkgs/applications/misc/rxvt-unicode/patches/makefile-phony.patch
+++ b/pkgs/applications/terminal-emulators/rxvt-unicode/patches/makefile-phony.patch
diff --git a/pkgs/applications/misc/rxvt-unicode/wrapper.nix b/pkgs/applications/terminal-emulators/rxvt-unicode/wrapper.nix
index 38978799b5a..38978799b5a 100644
--- a/pkgs/applications/misc/rxvt-unicode/wrapper.nix
+++ b/pkgs/applications/terminal-emulators/rxvt-unicode/wrapper.nix
diff --git a/pkgs/applications/misc/rxvt/default.nix b/pkgs/applications/terminal-emulators/rxvt/default.nix
index c71973da13b..c71973da13b 100644
--- a/pkgs/applications/misc/rxvt/default.nix
+++ b/pkgs/applications/terminal-emulators/rxvt/default.nix
diff --git a/pkgs/applications/misc/sakura/default.nix b/pkgs/applications/terminal-emulators/sakura/default.nix
index 7cccec3b72f..7cccec3b72f 100644
--- a/pkgs/applications/misc/sakura/default.nix
+++ b/pkgs/applications/terminal-emulators/sakura/default.nix
diff --git a/pkgs/applications/misc/st/default.nix b/pkgs/applications/terminal-emulators/st/default.nix
index a91229f2921..a91229f2921 100644
--- a/pkgs/applications/misc/st/default.nix
+++ b/pkgs/applications/terminal-emulators/st/default.nix
diff --git a/pkgs/applications/misc/st/xst.nix b/pkgs/applications/terminal-emulators/st/xst.nix
index 3e29abee5d6..3e29abee5d6 100644
--- a/pkgs/applications/misc/st/xst.nix
+++ b/pkgs/applications/terminal-emulators/st/xst.nix
diff --git a/pkgs/applications/misc/stupidterm/default.nix b/pkgs/applications/terminal-emulators/stupidterm/default.nix
index 2016059d81e..2016059d81e 100644
--- a/pkgs/applications/misc/stupidterm/default.nix
+++ b/pkgs/applications/terminal-emulators/stupidterm/default.nix
diff --git a/pkgs/applications/misc/terminator/default.nix b/pkgs/applications/terminal-emulators/terminator/default.nix
index 5de8109e3a4..5de8109e3a4 100644
--- a/pkgs/applications/misc/terminator/default.nix
+++ b/pkgs/applications/terminal-emulators/terminator/default.nix
diff --git a/pkgs/applications/misc/terminus/default.nix b/pkgs/applications/terminal-emulators/terminus/default.nix
index 4c38e530247..4c38e530247 100644
--- a/pkgs/applications/misc/terminus/default.nix
+++ b/pkgs/applications/terminal-emulators/terminus/default.nix
diff --git a/pkgs/applications/misc/termite/add_errno_header.patch b/pkgs/applications/terminal-emulators/termite/add_errno_header.patch
index 81283f86a21..81283f86a21 100644
--- a/pkgs/applications/misc/termite/add_errno_header.patch
+++ b/pkgs/applications/terminal-emulators/termite/add_errno_header.patch
diff --git a/pkgs/applications/misc/termite/default.nix b/pkgs/applications/terminal-emulators/termite/default.nix
index 63565e207f7..63565e207f7 100644
--- a/pkgs/applications/misc/termite/default.nix
+++ b/pkgs/applications/terminal-emulators/termite/default.nix
diff --git a/pkgs/applications/misc/termite/remove_ldflags_macos.patch b/pkgs/applications/terminal-emulators/termite/remove_ldflags_macos.patch
index f8c68518bb4..f8c68518bb4 100644
--- a/pkgs/applications/misc/termite/remove_ldflags_macos.patch
+++ b/pkgs/applications/terminal-emulators/termite/remove_ldflags_macos.patch
diff --git a/pkgs/applications/misc/termite/url_regexp_trailing.patch b/pkgs/applications/terminal-emulators/termite/url_regexp_trailing.patch
index 96deaa073d7..96deaa073d7 100644
--- a/pkgs/applications/misc/termite/url_regexp_trailing.patch
+++ b/pkgs/applications/terminal-emulators/termite/url_regexp_trailing.patch
diff --git a/pkgs/applications/misc/termite/wrapper.nix b/pkgs/applications/terminal-emulators/termite/wrapper.nix
index 379223d9076..379223d9076 100644
--- a/pkgs/applications/misc/termite/wrapper.nix
+++ b/pkgs/applications/terminal-emulators/termite/wrapper.nix
diff --git a/pkgs/applications/misc/termonad/default.nix b/pkgs/applications/terminal-emulators/termonad/default.nix
index 4388cbcfb44..4388cbcfb44 100644
--- a/pkgs/applications/misc/termonad/default.nix
+++ b/pkgs/applications/terminal-emulators/termonad/default.nix
diff --git a/pkgs/applications/misc/tilda/default.nix b/pkgs/applications/terminal-emulators/tilda/default.nix
index 0a672b039f6..0a672b039f6 100644
--- a/pkgs/applications/misc/tilda/default.nix
+++ b/pkgs/applications/terminal-emulators/tilda/default.nix
diff --git a/pkgs/applications/misc/tilix/default.nix b/pkgs/applications/terminal-emulators/tilix/default.nix
index 4707685e3da..4707685e3da 100644
--- a/pkgs/applications/misc/tilix/default.nix
+++ b/pkgs/applications/terminal-emulators/tilix/default.nix
diff --git a/pkgs/applications/misc/wayst/default.nix b/pkgs/applications/terminal-emulators/wayst/default.nix
index 99ee326aebf..99ee326aebf 100644
--- a/pkgs/applications/misc/wayst/default.nix
+++ b/pkgs/applications/terminal-emulators/wayst/default.nix
diff --git a/pkgs/applications/misc/wayst/utf8proc.patch b/pkgs/applications/terminal-emulators/wayst/utf8proc.patch
index 0923c5dbe18..0923c5dbe18 100644
--- a/pkgs/applications/misc/wayst/utf8proc.patch
+++ b/pkgs/applications/terminal-emulators/wayst/utf8proc.patch
diff --git a/pkgs/applications/misc/x3270/default.nix b/pkgs/applications/terminal-emulators/x3270/default.nix
index 747d2653876..747d2653876 100644
--- a/pkgs/applications/misc/x3270/default.nix
+++ b/pkgs/applications/terminal-emulators/x3270/default.nix
diff --git a/pkgs/applications/misc/xterm/default.nix b/pkgs/applications/terminal-emulators/xterm/default.nix
index 109444fc518..109444fc518 100644
--- a/pkgs/applications/misc/xterm/default.nix
+++ b/pkgs/applications/terminal-emulators/xterm/default.nix
diff --git a/pkgs/applications/misc/xterm/sixel-256.support.patch b/pkgs/applications/terminal-emulators/xterm/sixel-256.support.patch
index 480e67e89ca..480e67e89ca 100644
--- a/pkgs/applications/misc/xterm/sixel-256.support.patch
+++ b/pkgs/applications/terminal-emulators/xterm/sixel-256.support.patch
diff --git a/pkgs/applications/misc/xtermcontrol/default.nix b/pkgs/applications/terminal-emulators/xtermcontrol/default.nix
index f7c0edf2242..f7c0edf2242 100644
--- a/pkgs/applications/misc/xtermcontrol/default.nix
+++ b/pkgs/applications/terminal-emulators/xtermcontrol/default.nix
diff --git a/pkgs/applications/misc/yaft/default.nix b/pkgs/applications/terminal-emulators/yaft/default.nix
index e66f397a383..e66f397a383 100644
--- a/pkgs/applications/misc/yaft/default.nix
+++ b/pkgs/applications/terminal-emulators/yaft/default.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1a81c1fcf14..ad7eb42b128 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -669,7 +669,7 @@ in
 
   albert = libsForQt5.callPackage ../applications/misc/albert {};
 
-  alacritty = callPackage ../applications/misc/alacritty {
+  alacritty = callPackage ../applications/terminal-emulators/alacritty {
     inherit (xorg) libXcursor libXxf86vm libXi;
     inherit (darwin.apple_sdk.frameworks) AppKit CoreGraphics CoreServices CoreText Foundation OpenGL;
   };
@@ -2976,7 +2976,7 @@ in
 
   cpcfs = callPackage ../tools/filesystems/cpcfs { };
 
-  cool-retro-term = libsForQt5.callPackage ../applications/misc/cool-retro-term { };
+  cool-retro-term = libsForQt5.callPackage ../applications/terminal-emulators/cool-retro-term { };
 
   coreutils = callPackage ../tools/misc/coreutils { };
   coreutils-full = coreutils.override { minimal = false; };
@@ -3431,7 +3431,7 @@ in
 
   wayland-utils = callPackage ../tools/wayland/wayland-utils { };
 
-  wayst = callPackage ../applications/misc/wayst { };
+  wayst = callPackage ../applications/terminal-emulators/wayst { };
 
   wev = callPackage ../tools/misc/wev { };
 
@@ -5477,7 +5477,7 @@ in
 
   mgba = libsForQt5.callPackage ../misc/emulators/mgba { };
 
-  microcom = callPackage ../applications/misc/microcom { };
+  microcom = callPackage ../applications/terminal-emulators/microcom { };
 
   microserver = callPackage ../servers/microserver { };
 
@@ -5830,7 +5830,7 @@ in
 
   nilfs-utils = callPackage ../tools/filesystems/nilfs-utils {};
 
-  nimmm = callPackage ../applications/misc/nimmm { };
+  nimmm = callPackage ../applications/terminal-emulators/nimmm { };
 
   nitrogen = callPackage ../tools/X11/nitrogen {};
 
@@ -7445,7 +7445,7 @@ in
 
   tikzit = libsForQt5.callPackage ../tools/typesetting/tikzit { };
 
-  tilix = callPackage ../applications/misc/tilix { };
+  tilix = callPackage ../applications/terminal-emulators/tilix { };
 
   tinc_pre = callPackage ../tools/networking/tinc/pre.nix {};
 
@@ -8160,7 +8160,7 @@ in
 
   clipnotify = callPackage ../tools/misc/clipnotify { };
 
-  x3270 = callPackage ../applications/misc/x3270 { };
+  x3270 = callPackage ../applications/terminal-emulators/x3270 { };
 
   xclip = callPackage ../tools/misc/xclip { };
 
@@ -8248,7 +8248,7 @@ in
 
   yafaray-core = callPackage ../tools/graphics/yafaray-core { };
 
-  yaft = callPackage ../applications/misc/yaft { };
+  yaft = callPackage ../applications/terminal-emulators/yaft { };
 
   yarn = callPackage ../development/tools/yarn  { };
 
@@ -20520,7 +20520,7 @@ in
 
   esniper = callPackage ../applications/networking/esniper { };
 
-  eterm = callPackage ../applications/misc/eterm { };
+  eterm = callPackage ../applications/terminal-emulators/eterm { };
 
   eteroj.lv2 = libsForQt5.callPackage ../applications/audio/eteroj.lv2 { };
 
@@ -20528,7 +20528,7 @@ in
 
   etherape = callPackage ../applications/networking/sniffers/etherape { };
 
-  evilvte = callPackage ../applications/misc/evilvte (config.evilvte or {});
+  evilvte = callPackage ../applications/terminal-emulators/evilvte (config.evilvte or {});
 
   evilpixie = libsForQt514.callPackage ../applications/graphics/evilpixie { };
 
@@ -20634,7 +20634,7 @@ in
 
   foo-yc20 = callPackage ../applications/audio/foo-yc20 { };
 
-  foot = callPackage ../applications/misc/foot { };
+  foot = callPackage ../applications/terminal-emulators/foot { };
 
   fossil = callPackage ../applications/version-management/fossil { };
 
@@ -20927,7 +20927,7 @@ in
 
   gcalcli = callPackage ../applications/misc/gcalcli { };
 
-  havoc = callPackage ../applications/misc/havoc { };
+  havoc = callPackage ../applications/terminal-emulators/havoc { };
 
   vcal = callPackage ../applications/misc/vcal { };
 
@@ -21146,7 +21146,7 @@ in
 
   gtk2fontsel = callPackage ../applications/misc/gtk2fontsel { };
 
-  guake = callPackage ../applications/misc/guake { };
+  guake = callPackage ../applications/terminal-emulators/guake { };
 
   guardian-agent = callPackage ../tools/networking/guardian-agent { };
 
@@ -21250,7 +21250,7 @@ in
 
   hydroxide = callPackage ../applications/networking/hydroxide { };
 
-  hyper = callPackage ../applications/misc/hyper { };
+  hyper = callPackage ../applications/terminal-emulators/hyper { };
 
   hyper-haskell-server-with-packages = callPackage ../development/tools/haskell/hyper-haskell/server.nix {
     inherit (haskellPackages) ghcWithPackages;
@@ -21695,7 +21695,7 @@ in
     ffmpeg = ffmpeg_2;
   };
 
-  kitty = callPackage ../applications/misc/kitty {
+  kitty = callPackage ../applications/terminal-emulators/kitty {
     harfbuzz = harfbuzz.override { withCoreText = stdenv.isDarwin; };
     inherit (darwin.apple_sdk.frameworks) Cocoa CoreGraphics Foundation IOKit Kernel OpenGL;
   };
@@ -21929,7 +21929,7 @@ in
 
   jftui = callPackage ../applications/video/jftui { };
 
-  lilyterm = callPackage ../applications/misc/lilyterm {
+  lilyterm = callPackage ../applications/terminal-emulators/lilyterm {
     inherit (gnome2) vte;
     gtk = gtk2;
     flavour = "stable";
@@ -22259,7 +22259,7 @@ in
 
   mrpeach = callPackage ../applications/audio/pd-plugins/mrpeach { };
 
-  mrxvt = callPackage ../applications/misc/mrxvt { };
+  mrxvt = callPackage ../applications/terminal-emulators/mrxvt { };
 
   mtpaint = callPackage ../applications/graphics/mtpaint { };
 
@@ -23210,13 +23210,13 @@ in
 
   runc = callPackage ../applications/virtualization/runc {};
 
-  rxvt = callPackage ../applications/misc/rxvt { };
+  rxvt = callPackage ../applications/terminal-emulators/rxvt { };
 
-  rxvt-unicode = callPackage ../applications/misc/rxvt-unicode/wrapper.nix { };
+  rxvt-unicode = callPackage ../applications/terminal-emulators/rxvt-unicode/wrapper.nix { };
 
-  rxvt-unicode-unwrapped = callPackage ../applications/misc/rxvt-unicode { };
+  rxvt-unicode-unwrapped = callPackage ../applications/terminal-emulators/rxvt-unicode { };
 
-  rxvt-unicode-plugins = import ../applications/misc/rxvt-unicode-plugins { inherit callPackage; };
+  rxvt-unicode-plugins = import ../applications/terminal-emulators/rxvt-unicode-plugins { inherit callPackage; };
 
   uade123 = callPackage ../applications/audio/uade123 {};
 
@@ -23226,7 +23226,7 @@ in
 
   sacc = callPackage ../applications/networking/gopher/sacc { };
 
-  sakura = callPackage ../applications/misc/sakura { };
+  sakura = callPackage ../applications/terminal-emulators/sakura { };
 
   sameboy = callPackage ../misc/emulators/sameboy { };
 
@@ -23324,7 +23324,7 @@ in
     ncurses = ncurses5;
   };
 
-  stupidterm = callPackage ../applications/misc/stupidterm {
+  stupidterm = callPackage ../applications/terminal-emulators/stupidterm {
     gtk = gtk3;
   };
 
@@ -23338,13 +23338,13 @@ in
 
   sonic-pi = libsForQt5.callPackage ../applications/audio/sonic-pi { };
 
-  st = callPackage ../applications/misc/st {
+  st = callPackage ../applications/terminal-emulators/st {
     conf = config.st.conf or null;
     patches = config.st.patches or [];
     extraLibs = config.st.extraLibs or [];
   };
 
-  xst = callPackage ../applications/misc/st/xst.nix { };
+  xst = callPackage ../applications/terminal-emulators/st/xst.nix { };
 
   stag = callPackage ../applications/misc/stag {
     curses = ncurses;
@@ -23678,21 +23678,21 @@ in
 
   terminal-notifier = callPackage ../applications/misc/terminal-notifier {};
 
-  terminator = callPackage ../applications/misc/terminator { };
+  terminator = callPackage ../applications/terminal-emulators/terminator { };
 
-  terminus = callPackage ../applications/misc/terminus { };
+  terminus = callPackage ../applications/terminal-emulators/terminus { };
 
   tty-solitaire = callPackage ../applications/misc/tty-solitaire { };
 
-  lxterminal = callPackage ../applications/misc/lxterminal { };
+  lxterminal = callPackage ../applications/terminal-emulators/lxterminal { };
 
-  aminal = callPackage ../applications/misc/aminal {
+  aminal = callPackage ../applications/terminal-emulators/aminal {
     inherit (darwin.apple_sdk.frameworks) Carbon Cocoa Kernel;
   };
 
-  termite-unwrapped = callPackage ../applications/misc/termite { };
+  termite-unwrapped = callPackage ../applications/terminal-emulators/termite { };
 
-  termite = callPackage ../applications/misc/termite/wrapper.nix { termite = termite-unwrapped; };
+  termite = callPackage ../applications/terminal-emulators/termite/wrapper.nix { termite = termite-unwrapped; };
 
   termtosvg = callPackage ../tools/misc/termtosvg { };
 
@@ -23737,7 +23737,7 @@ in
 
   tig = gitAndTools.tig;
 
-  tilda = callPackage ../applications/misc/tilda {
+  tilda = callPackage ../applications/terminal-emulators/tilda {
     gtk = gtk3;
   };
 
@@ -24590,16 +24590,16 @@ in
 
   xsynth_dssi = callPackage ../applications/audio/xsynth-dssi { };
 
-  xterm = callPackage ../applications/misc/xterm { };
+  xterm = callPackage ../applications/terminal-emulators/xterm { };
 
-  mlterm = callPackage ../applications/misc/mlterm {
+  mlterm = callPackage ../applications/terminal-emulators/mlterm {
     libssh2 = null;
     openssl = null;
   };
 
-  roxterm = callPackage ../applications/misc/roxterm { };
+  roxterm = callPackage ../applications/terminal-emulators/roxterm { };
 
-  termonad-with-packages = callPackage ../applications/misc/termonad {
+  termonad-with-packages = callPackage ../applications/terminal-emulators/termonad {
     inherit (haskellPackages) ghcWithPackages;
   };
 
@@ -28128,7 +28128,7 @@ in
 
   imatix_gsl = callPackage ../development/tools/imatix_gsl {};
 
-  iterm2 = callPackage ../applications/misc/iterm2 {};
+  iterm2 = callPackage ../applications/terminal-emulators/iterm2 {};
 
   sccache = callPackage ../development/tools/misc/sccache { };
 
@@ -28193,7 +28193,7 @@ in
 
   houdini = callPackage ../applications/misc/houdini {};
 
-  xtermcontrol = callPackage ../applications/misc/xtermcontrol {};
+  xtermcontrol = callPackage ../applications/terminal-emulators/xtermcontrol {};
 
   openfst = callPackage ../development/libraries/openfst {};