From 0fabdf73bb9d2e52a31bd59f417ecd06571fb4da Mon Sep 17 00:00:00 2001
From: DomesticMoth <silkmoth@protonmail.com>
Date: Sat, 3 Dec 2022 11:34:46 +0000
Subject: [PATCH 1/2] maintainers: add DomesticMoth

---
 maintainers/maintainer-list.nix | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 51fa21323a29..95fcae56570a 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -3646,6 +3646,15 @@
     githubId = 126339;
     name = "Domen Kozar";
   };
+  DomesticMoth = {
+    name = "Andrew";
+    email = "silkmoth@protonmail.com";
+    github = "DomesticMoth";
+    githubId = 91414737;
+    keys = [{
+      fingerprint = "7D6B AE0A A98A FDE9 3396  E721 F87E 15B8 3AA7 3087";
+    }];
+  };
   dominikh = {
     email = "dominik@honnef.co";
     github = "dominikh";

From 470353b625e24f3b3b8d86838dcd9be1dcc95298 Mon Sep 17 00:00:00 2001
From: DomesticMoth <silkmoth@protonmail.com>
Date: Sat, 3 Dec 2022 12:35:41 +0000
Subject: [PATCH 2/2] aaa: init at 1.1.1

---
 pkgs/tools/misc/aaa/default.nix | 24 ++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix |  2 ++
 2 files changed, 26 insertions(+)
 create mode 100644 pkgs/tools/misc/aaa/default.nix

diff --git a/pkgs/tools/misc/aaa/default.nix b/pkgs/tools/misc/aaa/default.nix
new file mode 100644
index 000000000000..01b01c7a7f7f
--- /dev/null
+++ b/pkgs/tools/misc/aaa/default.nix
@@ -0,0 +1,24 @@
+{ lib
+, rustPlatform
+, fetchFromGitHub
+}:
+
+rustPlatform.buildRustPackage rec {
+  pname = "aaa";
+  version = "1.1.1";
+
+  src = fetchFromGitHub {
+    owner = "DomesticMoth";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "sha256-gIOlPjZOcmVLi9oOn4gBv6F+3Eq6t5b/3fKzoFqxclw=";
+  };
+  cargoSha256 = "sha256-ugB0r9qiGRurc30GrJH4MKM6fWZ99+f1Gy7/1lSmrwU=";
+
+  meta = with lib; {
+    description = "Terminal viewer for 3a format";
+    homepage = "https://github.com/DomesticMoth/aaa";
+    license = with licenses; [ gpl3Only ];
+    maintainers = with maintainers; [ DomesticMoth ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5686aeb6db2e..4758b9f446ad 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1138,6 +1138,8 @@ with pkgs;
 
   _9pfs = callPackage ../tools/filesystems/9pfs { };
 
+  aaa = callPackage ../tools/misc/aaa {};
+
   aardvark-dns = callPackage ../tools/networking/aardvark-dns { };
 
   a2ps = callPackage ../tools/text/a2ps { };