diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index f134013db..01c8b4be4 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -92,7 +92,7 @@ /modules/programs/go.nix @rvolosatovs -/modules/programs/hexchat.nix @superherointj @thiagokokada +/modules/programs/hexchat.nix @thiagokokada /tests/modules/programs/hexchat @thiagokokada /modules/programs/himalaya.nix @ambroisie diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 7b1fdbf77..e04df065c 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -24,6 +24,7 @@ jobs: echo "Error: literalExample should be replaced by literalExpression" > /dev/stderr exit 1 fi + - run: nix-build -A docs.jsonModuleMaintainers - run: ./format -c - run: nix-shell . -A install - run: nix-shell --arg enableBig false --pure tests -A run.all diff --git a/default.nix b/default.nix index 4438d827f..b665b7a66 100644 --- a/default.nix +++ b/default.nix @@ -5,6 +5,7 @@ rec { html = manual.html; manPages = manPages; json = options.json; + jsonModuleMaintainers = jsonModuleMaintainers; # Unstable, mainly for CI. }; home-manager = pkgs.callPackage ./home-manager { path = toString ./.; }; diff --git a/docs/default.nix b/docs/default.nix index fd038d1a8..22feac5c9 100644 --- a/docs/default.nix +++ b/docs/default.nix @@ -117,4 +117,14 @@ in { manPages = docs.manPages; manual = { inherit (docs) html htmlOpenTool; }; + + # Unstable, mainly for CI. + jsonModuleMaintainers = pkgs.writeText "hm-module-maintainers.json" (let + result = lib.evalModules { + modules = import ../modules/modules.nix { + inherit lib pkgs; + check = false; + } ++ [ scrubbedPkgsModule ]; + }; + in builtins.toJSON result.config.meta.maintainers); } diff --git a/modules/lib/maintainers.nix b/modules/lib/maintainers.nix index d3bd599ff..105edf073 100644 --- a/modules/lib/maintainers.nix +++ b/modules/lib/maintainers.nix @@ -145,4 +145,28 @@ github = "onny"; githubId = 757752; }; + aheaume = { + name = "aheaume"; + email = "aheaume@users.noreply.github.com"; + github = "aheaume"; + githubId = 13830042; + }; + t4ccer = { + name = "t4ccer"; + email = "t4ccer@users.noreply.github.com"; + github = "t4ccer"; + githubId = 64430288; + }; + nurelin = { + name = "nurelin"; + email = "nurelin@users.noreply.github.com"; + github = "nurelin"; + githubId = 5276274; + }; + pltanton = { + name = "pltanton"; + email = "plotnikovanton@gmail.com"; + github = "pltanton"; + githubId = 4561823; + }; } diff --git a/modules/misc/xdg-desktop-entries.nix b/modules/misc/xdg-desktop-entries.nix index 6e8393c2a..ca61a9988 100644 --- a/modules/misc/xdg-desktop-entries.nix +++ b/modules/misc/xdg-desktop-entries.nix @@ -147,7 +147,7 @@ let extraDesktopEntries = config.settings; }; in { - meta.maintainers = with maintainers; [ cwyc ]; + meta.maintainers = [ hm.maintainers.cwyc ]; options.xdg.desktopEntries = mkOption { description = '' diff --git a/modules/programs/broot.nix b/modules/programs/broot.nix index 79ffb3888..f37470d7c 100644 --- a/modules/programs/broot.nix +++ b/modules/programs/broot.nix @@ -15,7 +15,7 @@ let }; in { - meta.maintainers = [ maintainers.aheaume ]; + meta.maintainers = [ hm.maintainers.aheaume ]; options.programs.broot = { enable = mkEnableOption "Broot, a better way to navigate directories"; diff --git a/modules/programs/exa.nix b/modules/programs/exa.nix index 771e4e65c..ee4979998 100644 --- a/modules/programs/exa.nix +++ b/modules/programs/exa.nix @@ -15,7 +15,7 @@ let }; in { - meta.maintainers = [ maintainers.kalhauge ]; + meta.maintainers = [ hm.maintainers.kalhauge ]; options.programs.exa = { enable = diff --git a/modules/programs/hexchat.nix b/modules/programs/hexchat.nix index 7ac79228f..a23ea622c 100644 --- a/modules/programs/hexchat.nix +++ b/modules/programs/hexchat.nix @@ -229,7 +229,7 @@ let ]); in { - meta.maintainers = with maintainers; [ superherointj thiagokokada ]; + meta.maintainers = with maintainers; [ thiagokokada ]; options.programs.hexchat = with types; { enable = mkEnableOption "HexChat, a graphical IRC client"; diff --git a/modules/programs/htop.nix b/modules/programs/htop.nix index 1c8a59312..0d3530264 100644 --- a/modules/programs/htop.nix +++ b/modules/programs/htop.nix @@ -89,7 +89,7 @@ let blank = text "Blank"; in { - meta.maintainers = [ maintainers.bjpbakker ]; + meta.maintainers = [ hm.maintainers.bjpbakker ]; options.programs.htop = { enable = mkEnableOption "htop"; diff --git a/modules/programs/lazygit.nix b/modules/programs/lazygit.nix index 87bcdecce..1752b151a 100644 --- a/modules/programs/lazygit.nix +++ b/modules/programs/lazygit.nix @@ -11,7 +11,7 @@ let inherit (pkgs.stdenv.hostPlatform) isDarwin; in { - meta.maintainers = [ maintainers.kalhauge ]; + meta.maintainers = [ hm.maintainers.kalhauge ]; options.programs.lazygit = { enable = mkEnableOption "lazygit, a simple terminal UI for git commands"; diff --git a/modules/programs/ncmpcpp.nix b/modules/programs/ncmpcpp.nix index 96013a9d8..d19118184 100644 --- a/modules/programs/ncmpcpp.nix +++ b/modules/programs/ncmpcpp.nix @@ -44,7 +44,7 @@ let }); in { - meta.maintainers = with maintainers; [ olmokramer ]; + meta.maintainers = [ hm.maintainers.olmokramer ]; options.programs.ncmpcpp = { enable = diff --git a/modules/programs/xmobar.nix b/modules/programs/xmobar.nix index 9d8593b7b..a29bea846 100644 --- a/modules/programs/xmobar.nix +++ b/modules/programs/xmobar.nix @@ -55,5 +55,5 @@ in { xdg.configFile."xmobar/.xmobarrc".text = cfg.extraConfig; }; - meta.maintainers = with maintainers; [ t4ccer ]; + meta.maintainers = [ hm.maintainers.t4ccer ]; } diff --git a/modules/services/kanshi.nix b/modules/services/kanshi.nix index e482e9b8c..3d4451e9e 100644 --- a/modules/services/kanshi.nix +++ b/modules/services/kanshi.nix @@ -128,7 +128,7 @@ let ''; in { - meta.maintainers = [ maintainers.nurelin ]; + meta.maintainers = [ hm.maintainers.nurelin ]; options.services.kanshi = { enable = mkEnableOption diff --git a/modules/services/pasystray.nix b/modules/services/pasystray.nix index d41d6c934..15c951e13 100644 --- a/modules/services/pasystray.nix +++ b/modules/services/pasystray.nix @@ -3,7 +3,7 @@ with lib; { - meta.maintainers = [ maintainers.pltanton ]; + meta.maintainers = [ hm.maintainers.pltanton ]; options = { services.pasystray = { enable = mkEnableOption "PulseAudio system tray"; }; diff --git a/modules/services/playerctld.nix b/modules/services/playerctld.nix index dccc1ecc0..5fed8f2b4 100644 --- a/modules/services/playerctld.nix +++ b/modules/services/playerctld.nix @@ -7,7 +7,7 @@ let cfg = config.services.playerctld; in { - meta.maintainers = [ maintainers.fendse ]; + meta.maintainers = [ hm.maintainers.fendse ]; options.services.playerctld = { enable = mkEnableOption "playerctld daemon"; diff --git a/modules/services/status-notifier-watcher.nix b/modules/services/status-notifier-watcher.nix index 8de09d7dd..c6fe08da6 100644 --- a/modules/services/status-notifier-watcher.nix +++ b/modules/services/status-notifier-watcher.nix @@ -7,7 +7,7 @@ let cfg = config.services.status-notifier-watcher; in { - meta.maintainers = [ maintainers.pltanton ]; + meta.maintainers = [ hm.maintainers.pltanton ]; options = { services.status-notifier-watcher = { diff --git a/modules/services/trayer.nix b/modules/services/trayer.nix index 6abfbf7d1..0621c55e6 100644 --- a/modules/services/trayer.nix +++ b/modules/services/trayer.nix @@ -100,7 +100,7 @@ let cfg = config.services.trayer; in { - meta.maintainers = [ maintainers.mager ]; + meta.maintainers = [ hm.maintainers.mager ]; options = { services.trayer = { diff --git a/modules/services/wlsunset.nix b/modules/services/wlsunset.nix index 28e595af9..373d77f2e 100644 --- a/modules/services/wlsunset.nix +++ b/modules/services/wlsunset.nix @@ -5,7 +5,7 @@ with lib; let cfg = config.services.wlsunset; in { - meta.maintainers = [ maintainers.matrss ]; + meta.maintainers = [ hm.maintainers.matrss ]; options.services.wlsunset = { enable = mkEnableOption "Whether to enable wlsunset.";