From 45df0550943e14f32cda8898834e90440f5c08c9 Mon Sep 17 00:00:00 2001
From: Jan Malakhovski <oxij@oxij.org>
Date: Tue, 2 Oct 2018 15:17:36 +0000
Subject: [PATCH 1/4] maintainers/maintainer-list.nix: make the top comment a
 bit more readable

---
 maintainers/maintainer-list.nix | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 3b7329a8d790..11ccbfc9b47f 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -1,21 +1,27 @@
 /* List of NixOS maintainers.
 
     handle = {
+      # Required
       name = "Real name";
       email = "address@example.org";
+
+      # Optional
       github = "GithubUsername";
     };
 
-  where `name` is your real name, `email` is your maintainer email
-  address and `github` is your GitHub handle (as it appears in the
-  URL of your profile page, `https://github.com/<userhandle>`).
- address
-  The only required fields are `name` and `email`.
+  where
+
+  - `handle` is the handle you are going to use in nixpkgs expressions,
+  - `name` is your real name,
+  - `email` is your maintainer email address, and
+  - `github` is your GitHub handle (as it appears in the URL of your profile page, `https://github.com/<userhandle>`).
+
+  `handle == github` is strongly preffered whenever `github` is an acceptable attribute name and is short and convenient.
+
   More fields may be added in the future.
 
   Please keep the list alphabetically sorted.
-  See `../maintainers/scripts/check-maintainer-github-handles.sh`
-  for an example on how to work with this data.
+  See `./scripts/check-maintainer-github-handles.sh` for an example on how to work with this data.
   */
 {
   "1000101" = {

From 5abdbbb8b7436f48463d93fa3c11f48a03a66bba Mon Sep 17 00:00:00 2001
From: Jan Malakhovski <oxij@oxij.org>
Date: Tue, 2 Oct 2018 15:17:38 +0000
Subject: [PATCH 2/4] maintainers/maintainer-list.nix: stop the real name
 policy

What is a "real name" anyway? Are we in the buisness of checking passports here?
---
 maintainers/maintainer-list.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 11ccbfc9b47f..2b439da2a40b 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -2,7 +2,7 @@
 
     handle = {
       # Required
-      name = "Real name";
+      name = "Your name";
       email = "address@example.org";
 
       # Optional
@@ -12,7 +12,7 @@
   where
 
   - `handle` is the handle you are going to use in nixpkgs expressions,
-  - `name` is your real name,
+  - `name` is your, preferably real, name,
   - `email` is your maintainer email address, and
   - `github` is your GitHub handle (as it appears in the URL of your profile page, `https://github.com/<userhandle>`).
 

From be68971cd18226a15d4b3d784273e4d9c96872a2 Mon Sep 17 00:00:00 2001
From: Jan Malakhovski <oxij@oxij.org>
Date: Tue, 2 Oct 2018 15:17:41 +0000
Subject: [PATCH 3/4] maintainers/maintainer-list.nix: add PGP/GPG attributes

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 2b439da2a40b..04fabb190003 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -7,6 +7,10 @@
 
       # Optional
       github = "GithubUsername";
+      keys = [{
+        longkeyid = "rsa2048/0x0123456789ABCDEF";
+        fingerprint = "AAAA BBBB CCCC DDDD EEEE  FFFF 0000 1111 2222 3333";
+      }];
     };
 
   where
@@ -14,10 +18,20 @@
   - `handle` is the handle you are going to use in nixpkgs expressions,
   - `name` is your, preferably real, name,
   - `email` is your maintainer email address, and
-  - `github` is your GitHub handle (as it appears in the URL of your profile page, `https://github.com/<userhandle>`).
+  - `github` is your GitHub handle (as it appears in the URL of your profile page, `https://github.com/<userhandle>`),
+  - `keys` is a list of your PGP/GPG key IDs and fingerprints.
 
   `handle == github` is strongly preffered whenever `github` is an acceptable attribute name and is short and convenient.
 
+  Add PGP/GPG keys only if you actually use them to sign commits and/or mail.
+
+  To get the required PGP/GPG values for a key run
+  ```shell
+  gpg --keyid-format 0xlong --fingerprint <email> | head -n 2
+  ```
+
+  !!! Note that PGP/GPG values stored here are for informational purposes only, don't use this file as a source of truth.
+
   More fields may be added in the future.
 
   Please keep the list alphabetically sorted.

From 419ea86540a0e5e947fd523ae8004790d5cfda55 Mon Sep 17 00:00:00 2001
From: Jan Malakhovski <oxij@oxij.org>
Date: Tue, 2 Oct 2018 15:17:43 +0000
Subject: [PATCH 4/4] maintainers/maintainer-list.nix: add my own PGP/GPG
 attributes

First! :)
---
 maintainers/maintainer-list.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 04fabb190003..fb8eaaccec53 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -3119,6 +3119,10 @@
     email = "oxij@oxij.org";
     github = "oxij";
     name = "Jan Malakhovski";
+    keys = [{
+      longkeyid = "rsa2048/0x0E6CA66E5C557AA8";
+      fingerprint = "514B B966 B46E 3565 0508  86E8 0E6C A66E 5C55 7AA8";
+    }];
   };
   oyren = {
     email = "m.scheuren@oyra.eu";