diff --git a/modules/home-environment.nix b/modules/home-environment.nix
index 24c1a40c3..8b6a6cfa8 100644
--- a/modules/home-environment.nix
+++ b/modules/home-environment.nix
@@ -93,6 +93,8 @@ let
 in
 
 {
+  meta.maintainers = [ maintainers.rycee ];
+
   options = {
     home.file = mkOption {
       description = "Attribute set of files to link into the user home.";
diff --git a/modules/manual.nix b/modules/manual.nix
index 4736726f3..636b184c3 100644
--- a/modules/manual.nix
+++ b/modules/manual.nix
@@ -64,15 +64,18 @@ in
   };
 
   # To fix error during manpage build.
-  meta.doc = builtins.toFile "nothingness" ''
-    <chapter xmlns="http://docbook.org/ns/docbook"
-             xmlns:xlink="http://www.w3.org/1999/xlink"
-             xmlns:xi="http://www.w3.org/2001/XInclude"
-             version="5.0"
-             xml:id="sec-nothing">
-      <title>this is just to make the docs compile</title>
-      <para xml:id="sec-grsecurity"></para>
-      <para xml:id="sec-emacs-docbook-xml"></para>
-    </chapter>
-  '';
+  meta = {
+    maintainers = [ maintainers.rycee ];
+    doc = builtins.toFile "nothingness" ''
+      <chapter xmlns="http://docbook.org/ns/docbook"
+               xmlns:xlink="http://www.w3.org/1999/xlink"
+               xmlns:xi="http://www.w3.org/2001/XInclude"
+               version="5.0"
+               xml:id="sec-nothing">
+        <title>this is just to make the docs compile</title>
+        <para xml:id="sec-grsecurity"></para>
+        <para xml:id="sec-emacs-docbook-xml"></para>
+      </chapter>
+    '';
+  };
 }
diff --git a/modules/misc/gtk.nix b/modules/misc/gtk.nix
index 1d6673391..a95e8d6e2 100644
--- a/modules/misc/gtk.nix
+++ b/modules/misc/gtk.nix
@@ -30,6 +30,8 @@ let
 in
 
 {
+  meta.maintainers = [ maintainers.rycee ];
+
   options = {
     gtk = {
       enable = mkEnableOption "GTK 2/3 configuration";
diff --git a/modules/misc/news.nix b/modules/misc/news.nix
index eef664b6f..b52b2b2cd 100644
--- a/modules/misc/news.nix
+++ b/modules/misc/news.nix
@@ -48,6 +48,8 @@ let
 in
 
 {
+  meta.maintainers = [ maintainers.rycee ];
+
   options = {
     news = {
       display = mkOption {
diff --git a/modules/misc/pam.nix b/modules/misc/pam.nix
index 89040aa84..3bd0f2925 100644
--- a/modules/misc/pam.nix
+++ b/modules/misc/pam.nix
@@ -9,6 +9,8 @@ let
 in
 
 {
+  meta.maintainers = [ maintainers.rycee ];
+
   options = {};
 
   config = mkIf (homeCfg.sessionVariableSetter == "pam") {
diff --git a/modules/programs/bash.nix b/modules/programs/bash.nix
index a8004580d..25929abfa 100644
--- a/modules/programs/bash.nix
+++ b/modules/programs/bash.nix
@@ -9,6 +9,8 @@ let
 in
 
 {
+  meta.maintainers = [ maintainers.rycee ];
+
   options = {
     programs.bash = {
       enable = mkEnableOption "GNU Bourne-Again SHell";
diff --git a/modules/programs/beets.nix b/modules/programs/beets.nix
index df9495ef2..34aa04608 100644
--- a/modules/programs/beets.nix
+++ b/modules/programs/beets.nix
@@ -9,6 +9,8 @@ let
 in
 
 {
+  meta.maintainers = [ maintainers.rycee ];
+
   options = {
     programs.beets = {
       settings = mkOption {
diff --git a/modules/programs/eclipse.nix b/modules/programs/eclipse.nix
index e9d4c0602..092db23f4 100644
--- a/modules/programs/eclipse.nix
+++ b/modules/programs/eclipse.nix
@@ -9,6 +9,8 @@ let
 in
 
 {
+  meta.maintainers = [ maintainers.rycee ];
+
   options = {
     programs.eclipse = {
       enable = mkEnableOption "Eclipse";
diff --git a/modules/programs/emacs.nix b/modules/programs/emacs.nix
index 35f039110..a056866a8 100644
--- a/modules/programs/emacs.nix
+++ b/modules/programs/emacs.nix
@@ -13,6 +13,8 @@ let
 in
 
 {
+  meta.maintainers = [ maintainers.rycee ];
+
   options = {
     programs.emacs = {
       enable = mkEnableOption "Emacs";
diff --git a/modules/programs/firefox.nix b/modules/programs/firefox.nix
index befacec24..50a43cfe7 100644
--- a/modules/programs/firefox.nix
+++ b/modules/programs/firefox.nix
@@ -9,6 +9,8 @@ let
 in
 
 {
+  meta.maintainers = [ maintainers.rycee ];
+
   options = {
     programs.firefox = {
       enable = mkEnableOption "Firefox";
diff --git a/modules/programs/git.nix b/modules/programs/git.nix
index 1616dcb4a..c8dab199c 100644
--- a/modules/programs/git.nix
+++ b/modules/programs/git.nix
@@ -31,6 +31,8 @@ let
 in
 
 {
+  meta.maintainers = [ maintainers.rycee ];
+
   options = {
     programs.git = {
       enable = mkEnableOption "Git";
diff --git a/modules/programs/gnome-terminal.nix b/modules/programs/gnome-terminal.nix
index ee9db93b1..a10914ad6 100644
--- a/modules/programs/gnome-terminal.nix
+++ b/modules/programs/gnome-terminal.nix
@@ -157,6 +157,8 @@ let
 in
 
 {
+  meta.maintainers = [ maintainers.rycee ];
+
   options = {
     programs.gnome-terminal = {
       enable = mkEnableOption "Gnome Terminal";
diff --git a/modules/programs/home-manager.nix b/modules/programs/home-manager.nix
index a8950a74d..2b211b85b 100644
--- a/modules/programs/home-manager.nix
+++ b/modules/programs/home-manager.nix
@@ -10,6 +10,8 @@ let
 in
 
 {
+  meta.maintainers = [ maintainers.rycee ];
+
   options = {
     programs.home-manager = {
       enable = mkEnableOption "Home Manager";
diff --git a/modules/programs/lesspipe.nix b/modules/programs/lesspipe.nix
index d250f535a..a7a51ffe2 100644
--- a/modules/programs/lesspipe.nix
+++ b/modules/programs/lesspipe.nix
@@ -3,6 +3,8 @@
 with lib;
 
 {
+  meta.maintainers = [ maintainers.rycee ];
+
   options = {
     programs.lesspipe = {
       enable = mkEnableOption "lesspipe preprocessor for less";
diff --git a/modules/programs/ssh.nix b/modules/programs/ssh.nix
index 3f1d35db9..b2017818c 100644
--- a/modules/programs/ssh.nix
+++ b/modules/programs/ssh.nix
@@ -118,6 +118,8 @@ let
 in
 
 {
+  meta.maintainers = [ maintainers.rycee ];
+
   options.programs.ssh = {
     enable = mkEnableOption "SSH client configuration";
 
diff --git a/modules/programs/texlive.nix b/modules/programs/texlive.nix
index afa8f7012..1d944cef1 100644
--- a/modules/programs/texlive.nix
+++ b/modules/programs/texlive.nix
@@ -9,6 +9,8 @@ let
 in
 
 {
+  meta.maintainers = [ maintainers.rycee ];
+
   options = {
     programs.texlive = {
       enable = mkEnableOption "Texlive";
diff --git a/modules/services/dunst.nix b/modules/services/dunst.nix
index c1f29d942..659425b11 100644
--- a/modules/services/dunst.nix
+++ b/modules/services/dunst.nix
@@ -3,6 +3,8 @@
 with lib;
 
 {
+  meta.maintainers = [ maintainers.rycee ];
+
   options = {
     services.dunst = {
       enable = mkEnableOption "the dunst notification daemon";
diff --git a/modules/services/gnome-keyring.nix b/modules/services/gnome-keyring.nix
index b7097d7cd..4ca6c7cac 100644
--- a/modules/services/gnome-keyring.nix
+++ b/modules/services/gnome-keyring.nix
@@ -9,6 +9,8 @@ let
 in
 
 {
+  meta.maintainers = [ maintainers.rycee ];
+
   options = {
     services.gnome-keyring = {
       enable = mkEnableOption "GNOME Keyring";
diff --git a/modules/services/gpg-agent.nix b/modules/services/gpg-agent.nix
index 03affd217..4f1dd5f2d 100644
--- a/modules/services/gpg-agent.nix
+++ b/modules/services/gpg-agent.nix
@@ -15,6 +15,8 @@ let
 in
 
 {
+  meta.maintainers = [ maintainers.rycee ];
+
   options = {
     services.gpg-agent = {
       enable = mkEnableOption "GnuPG private key agent";
diff --git a/modules/services/keepassx.nix b/modules/services/keepassx.nix
index ff875ee63..ad791786f 100644
--- a/modules/services/keepassx.nix
+++ b/modules/services/keepassx.nix
@@ -3,6 +3,8 @@
 with lib;
 
 {
+  meta.maintainers = [ maintainers.rycee ];
+
   options = {
     services.keepassx = {
       enable = mkEnableOption "the KeePassX password manager";
diff --git a/modules/services/network-manager-applet.nix b/modules/services/network-manager-applet.nix
index eca5515f2..6fd50575a 100644
--- a/modules/services/network-manager-applet.nix
+++ b/modules/services/network-manager-applet.nix
@@ -3,6 +3,8 @@
 with lib;
 
 {
+  meta.maintainers = [ maintainers.rycee ];
+
   options = {
     services.network-manager-applet = {
       enable = mkEnableOption "the Network Manager applet";
diff --git a/modules/services/random-background.nix b/modules/services/random-background.nix
index f1b8d39d1..4f0a4c431 100644
--- a/modules/services/random-background.nix
+++ b/modules/services/random-background.nix
@@ -9,6 +9,8 @@ let
 in
 
 {
+  meta.maintainers = [ maintainers.rycee ];
+
   options = {
     services.random-background = {
       enable = mkEnableOption "random desktop background";
diff --git a/modules/services/redshift.nix b/modules/services/redshift.nix
index ba9f3b1d3..9bf66f894 100644
--- a/modules/services/redshift.nix
+++ b/modules/services/redshift.nix
@@ -8,7 +8,10 @@ let
 
   cfg = config.services.redshift;
 
-in {
+in
+
+{
+  meta.maintainers = [ maintainers.rycee ];
 
   options.services.redshift = {
     enable = mkOption {
diff --git a/modules/services/syncthing.nix b/modules/services/syncthing.nix
index 5da3a8cf0..f722208d1 100644
--- a/modules/services/syncthing.nix
+++ b/modules/services/syncthing.nix
@@ -3,6 +3,8 @@
 with lib;
 
 {
+  meta.maintainers = [ maintainers.rycee ];
+
   options = {
     services.syncthing = {
       enable = mkEnableOption "Syncthing continuous file synchronization";
diff --git a/modules/services/taffybar.nix b/modules/services/taffybar.nix
index a452295f2..b8a642408 100644
--- a/modules/services/taffybar.nix
+++ b/modules/services/taffybar.nix
@@ -9,6 +9,8 @@ let
 in
 
 {
+  meta.maintainers = [ maintainers.rycee ];
+
   options = {
     services.taffybar = {
       enable = mkEnableOption "Taffybar";
diff --git a/modules/services/tahoe-lafs.nix b/modules/services/tahoe-lafs.nix
index 8d12b03e2..bb7be8d7d 100644
--- a/modules/services/tahoe-lafs.nix
+++ b/modules/services/tahoe-lafs.nix
@@ -3,6 +3,8 @@
 with lib;
 
 {
+  meta.maintainers = [ maintainers.rycee ];
+
   options = {
     services.tahoe-lafs = {
       enable = mkEnableOption "Tahoe-LAFS";
diff --git a/modules/services/udiskie.nix b/modules/services/udiskie.nix
index b2a2b4072..a9451c325 100644
--- a/modules/services/udiskie.nix
+++ b/modules/services/udiskie.nix
@@ -3,6 +3,8 @@
 with lib;
 
 {
+  meta.maintainers = [ maintainers.rycee ];
+
   options = {
     services.udiskie = {
       enable = mkEnableOption "Udiskie mount daemon";
diff --git a/modules/services/xscreensaver.nix b/modules/services/xscreensaver.nix
index b27e5b73a..e500c5d85 100644
--- a/modules/services/xscreensaver.nix
+++ b/modules/services/xscreensaver.nix
@@ -3,6 +3,8 @@
 with lib;
 
 {
+  meta.maintainers = [ maintainers.rycee ];
+
   options = {
     services.xscreensaver = {
       enable = mkEnableOption "XScreenSaver";
diff --git a/modules/systemd.nix b/modules/systemd.nix
index 57017a668..d77c0076a 100644
--- a/modules/systemd.nix
+++ b/modules/systemd.nix
@@ -45,6 +45,8 @@ let
 in
 
 {
+  meta.maintainers = [ maintainers.rycee ];
+
   options = {
     systemd.user = {
       services = mkOption {
diff --git a/modules/xresources.nix b/modules/xresources.nix
index abeed0c1f..860843806 100644
--- a/modules/xresources.nix
+++ b/modules/xresources.nix
@@ -17,6 +17,8 @@ let
 in
 
 {
+  meta.maintainers = [ maintainers.rycee ];
+
   options = {
     xresources.properties = mkOption {
       type = types.nullOr types.attrs;
diff --git a/modules/xsession.nix b/modules/xsession.nix
index 89979796c..6a3c589ef 100644
--- a/modules/xsession.nix
+++ b/modules/xsession.nix
@@ -9,6 +9,8 @@ let
 in
 
 {
+  meta.maintainers = [ maintainers.rycee ];
+
   options = {
     xsession = {
       enable = mkEnableOption "X Session";