From b8bb556ce5abe5bbc10acb7508ef273b053f647d Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Fri, 4 Jul 2025 00:01:04 -0500 Subject: [PATCH] maintainers: remove duplicate HM entries We can remove duplicate entries and redirect to the nixpkgs entry. Signed-off-by: Austin Horstman --- modules/i18n/input-method/default.nix | 6 +- modules/lib/maintainers.nix | 377 ------------------ modules/misc/mozilla-messaging-hosts.nix | 2 +- modules/misc/xdg-desktop-entries.nix | 2 +- modules/programs/aerospace.nix | 2 +- modules/programs/aria2.nix | 2 +- modules/programs/ashell.nix | 2 +- modules/programs/bacon.nix | 2 +- modules/programs/cavalier.nix | 2 +- modules/programs/comodoro.nix | 2 +- modules/programs/dircolors.nix | 2 +- modules/programs/firefox/default.nix | 6 +- modules/programs/floorp.nix | 2 +- modules/programs/gradle.nix | 2 +- modules/programs/granted.nix | 2 +- modules/programs/helix.nix | 2 +- modules/programs/himalaya.nix | 2 +- modules/programs/i3status.nix | 2 +- modules/programs/lapce.nix | 2 +- modules/programs/mr.nix | 2 +- modules/programs/ne.nix | 2 +- modules/programs/nix-index.nix | 6 +- modules/programs/openstackclient.nix | 2 +- modules/programs/pay-respects.nix | 2 +- modules/programs/pistol.nix | 2 +- modules/programs/pubs.nix | 2 +- modules/programs/quickshell.nix | 2 +- modules/programs/rbw.nix | 2 +- modules/programs/rclone.nix | 2 +- modules/programs/ruff.nix | 2 +- modules/programs/senpai.nix | 2 +- modules/programs/sesh.nix | 2 +- modules/programs/sioyek.nix | 2 +- modules/programs/spotify-player.nix | 2 +- modules/programs/thefuck.nix | 2 +- modules/programs/timidity.nix | 2 +- modules/programs/vesktop.nix | 6 +- modules/programs/wallust.nix | 2 +- modules/programs/waylogout.nix | 2 +- modules/programs/xmobar.nix | 2 +- modules/programs/zsh/zsh-abbr.nix | 2 +- modules/services/comodoro.nix | 2 +- modules/services/davmail.nix | 2 +- modules/services/espanso.nix | 13 +- modules/services/fusuma.nix | 2 +- .../services/home-manager-auto-upgrade.nix | 2 +- modules/services/jellyfin-mpv-shim.nix | 2 +- modules/services/mopidy.nix | 2 +- modules/services/podman-linux/default.nix | 6 +- modules/services/restic.nix | 2 +- modules/services/trayscale.nix | 2 +- modules/services/window-managers/spectrwm.nix | 2 +- modules/services/wlsunset.nix | 2 +- modules/services/xidlehook.nix | 6 +- 54 files changed, 70 insertions(+), 448 deletions(-) diff --git a/modules/i18n/input-method/default.nix b/modules/i18n/input-method/default.nix index 8b102902c..402b77e54 100644 --- a/modules/i18n/input-method/default.nix +++ b/modules/i18n/input-method/default.nix @@ -133,8 +133,8 @@ in ]; }; - meta.maintainers = [ - lib.hm.maintainers.kranzes - lib.maintainers.awwpotato + meta.maintainers = with lib.maintainers; [ + awwpotato + kranzes ]; } diff --git a/modules/lib/maintainers.nix b/modules/lib/maintainers.nix index b6153c9c2..41dfde361 100644 --- a/modules/lib/maintainers.nix +++ b/modules/lib/maintainers.nix @@ -55,24 +55,6 @@ github = "aheaume"; githubId = 13830042; }; - ALameLlama = { - name = "Nicholas Ciechanowski"; - email = "NicholasACiechanowski@gmail.com"; - github = "ALameLlama"; - githubId = 55490546; - }; - ambroisie = { - email = "bruno.home-manager@belanyi.fr"; - github = "ambroisie"; - githubId = 12465195; - name = "Bruno BELANYI"; - }; - amesgen = { - name = "amesgen"; - email = "amesgen@amesgen.de"; - github = "amesgen"; - githubId = 15369874; - }; austreelis = { email = "github@accounts.austreelis.net"; github = "Austreelis"; @@ -91,12 +73,6 @@ github = "bamhm182"; githubId = 920269; }; - bertof = { - name = "bertof"; - email = "berto.f@protonmail.com"; - github = "bertof"; - githubId = 9915675; - }; bikku = { name = "Bikku"; email = "bikku+dev@slmail.me"; @@ -115,61 +91,18 @@ github = "blmhemu"; githubId = 19410501; }; - bmrips = { - name = "Benedikt Rips"; - email = "benedikt.rips@gmail.com"; - github = "bmrips"; - githubId = 20407973; - }; - bricked = { - name = "Bricked"; - email = "hello@bricked.dev"; - github = "brckd"; - githubId = 92804487; - }; - britter = { - name = "Benedikt Ritter"; - email = "beneritter@gmail.com"; - github = "britter"; - githubId = 1327662; - }; - callumio = { - name = "Callum Leslie"; - email = "git+nix@cleslie.uk"; - github = "callumio"; - githubId = 16057677; - keys = [ { fingerprint = "BC82 4BB5 1656 D144 285E A0EC D382 C4AF EECE AA90"; } ]; - }; CarlosLoboxyz = { name = "Carlos Lobo"; email = "86011416+CarlosLoboxyz@users.noreply.github.com"; github = "CarlosLoboxyz"; githubId = 86011416; }; - chisui = { - name = "Philipp Dargel"; - email = "chisui@users.noreply.github.com"; - github = "chisui"; - githubId = 4526429; - }; ckgxrg = { name = "ckgxrg"; email = "ckgxrg@ckgxrg.io"; github = "ckgxrg-salt"; githubId = 165614491; }; - considerate = { - name = "Viktor Kronvall"; - email = "viktor.kronvall@gmail.com"; - github = "considerate"; - githubId = 217918; - }; - cwyc = { - email = "cwyc@users.noreply.github.com"; - name = "cwyc"; - github = "cwyc"; - githubId = 16950437; - }; d-dervishi = { email = "david.dervishi@epfl.ch"; github = "d-dervishi"; @@ -182,12 +115,6 @@ } ]; }; - damidoug = { - email = "contact@damidoug.dev"; - github = "damidoug"; - githubId = 75175586; - name = "Douglas Damiano"; - }; danjujan = { name = "Jan Schmitz"; email = "44864658+danjujan@users.noreply.github.com"; @@ -208,12 +135,6 @@ github = "Dines97"; githubId = 19364873; }; - diniamo = { - name = "diniamo"; - email = "diniamo69@gmail.com"; - github = "diniamo"; - githubId = 55629891; - }; dsoverlord = { name = "Kirill Zakharov"; email = "dsoverlord@vk.com"; @@ -244,35 +165,17 @@ github = "folliehiyuki"; githubId = 67634026; }; - foo-dogsquared = { - name = "Gabriel Arazas"; - email = "foo.dogsquared@gmail.com"; - github = "foo-dogsquared"; - githubId = 34962634; - }; fpob = { name = "Filip Pobořil"; email = "fpob@proton.me"; github = "fpob"; githubId = 6289078; }; - GaetanLepage = { - email = "gaetan@glepage.com"; - github = "GaetanLepage"; - githubId = 33058747; - name = "Gaetan Lepage"; - }; genericnerdyusername = { email = "genericnerdyusername@proton.me"; github = "genericnerdyusername"; githubId = 111183546; }; - hawkw = { - name = "Eliza Weisman"; - email = "eliza@elizas.website"; - github = "hawkw"; - githubId = 2796466; - }; henrisota = { email = "henrisota@users.noreply.github.com"; github = "henrisota"; @@ -299,18 +202,6 @@ } ]; }; - ilaumjd = { - name = "Ilham AM"; - email = "ilaumjd@gmail.com"; - github = "ilaumjd"; - githubId = 16514431; - }; - iosmanthus = { - name = "iosmanthus"; - email = "myosmanthustree@gmail.com"; - github = "iosmanthus"; - githubId = 16307070; - }; ipsavitsky = { name = "Ilya Savitsky"; email = "ipsavitsky234@gmail.com"; @@ -330,18 +221,6 @@ github = "Janik-Haag"; githubId = 80165193; }; - jess = { - name = "Jessica"; - email = "jess+nix@jessie.cafe"; - githubId = 43591752; - github = "ttrssreal"; - keys = [ - { - longkeyid = "rsa3072/0xBA3350686C918606"; - fingerprint = "8092 3BD1 ECD0 E436 671D C8E9 BA33 5068 6C91 8606"; - } - ]; - }; jkarlson = { email = "jekarlson@gmail.com"; github = "jkarlson"; @@ -367,24 +246,6 @@ githubId = 1553581; name = "Josh Robson Chase"; }; - justdeeevin = { - email = "devin.droddy@gmail.com"; - github = "justdeeevin"; - githubId = 90054389; - name = "Devin Droddy"; - }; - justinlovinger = { - name = "Justin Lovinger"; - email = "git@justinlovinger.com"; - github = "JustinLovinger"; - githubId = 7183441; - }; - jwygoda = { - name = "Jarosław Wygoda"; - email = "jaroslaw@wygoda.me"; - github = "jwygoda"; - githubId = 20658981; - }; kaleo = { name = "Kaleo Cheng"; email = "kaleocheng@gmail.com"; @@ -397,18 +258,6 @@ github = "kalhauge"; githubId = 1182166; }; - kamadorueda = { - name = "Kevin Amado"; - email = "kamadorueda@gmail.com"; - github = "kamadorueda"; - githubId = 47480384; - keys = [ - { - longkeyid = "rsa4096/0x04D0CEAF916A9A40"; - fingerprint = "2BE3 BAFD 793E A349 ED1F F00F 04D0 CEAF 916A 9A40"; - } - ]; - }; karaolidis = { name = "Nikolaos Karaolidis"; email = "nick@karaolidis.com"; @@ -421,36 +270,12 @@ } ]; }; - katexochen = { - name = "Paul Meyer"; - email = "49727155+katexochen@users.noreply.github.com"; - github = "katexochen"; - githubId = 49727155; - }; - kiara = { - name = "kiara"; - email = "cinereal@riseup.net"; - github = "KiaraGrouwstra"; - githubId = 3059397; - }; kmaasrud = { name = "Knut Magnus Aasrud"; email = "km@aasrud.com"; github = "kmaasrud"; githubId = 54394333; }; - kranzes = { - email = "personal@ilanjoselevich.com"; - github = "Kranzes"; - githubId = 56614642; - name = "Ilan Joselevich"; - }; - kubukoz = { - name = "Jakub Kozłowski"; - email = "kubukoz@users.noreply.github.com"; - github = "kubukoz"; - githubId = 894884; - }; LesVu = { name = "John Ferse"; email = "lesvu@ingressland.com"; @@ -468,18 +293,6 @@ github = "libewa"; githubId = 67926131; }; - LilleAila = { - name = "LilleAila"; - email = "olai@olai.dev"; - github = "LilleAila"; - githubId = 67327023; - keys = [ - { - longkeyid = "ed25519/0xD1ACCDCF2B9B9799"; - fingerprint = "8185 29F9 BB4C 33F0 69BB 9782 D1AC CDCF 2B9B 9799"; - } - ]; - }; lilyinstarlight = { email = "lily@lily.flowers"; matrix = "@lily:lily.flowers"; @@ -487,18 +300,6 @@ githubId = 298109; name = "Lily Foster"; }; - liyangau = { - name = "Li Yang"; - email = "d@aufomm.com"; - github = "liyangau"; - githubId = 71299093; - }; - loicreynier = { - name = "Loïc Reynier"; - email = "loic@loireynier.fr"; - github = "loicreynier"; - githubId = 88983487; - }; lowlevl = { name = "maya_t"; email = "lowlevl@users.noreply.github.com"; @@ -535,36 +336,12 @@ github = "mainrs"; githubId = 5113257; }; - malvo = { - email = "malte@malvo.org"; - github = "malte-v"; - githubId = 34393802; - name = "Malte Voos"; - }; - matrss = { - name = "Matthias Riße"; - email = "matrss@users.noreply.github.com"; - github = "matrss"; - githubId = 9308656; - }; - maximsmol = { - email = "maximsmol@gmail.com"; - github = "maximsmol"; - githubId = 1472826; - name = "Max Smolin"; - }; mforster = { name = "Michael Forster"; email = "email@michael-forster.de"; github = "MForster"; githubId = 4067975; }; - michaelvanstraten = { - name = "Michael van Straten"; - email = "michael@vanstraten.de"; - github = "michaelvanstraten"; - githubId = 50352631; - }; mifom = { name = "mifom"; email = "mifom@users.noreply.github.com"; @@ -601,30 +378,12 @@ github = "msyds"; githubId = 65362461; }; - mtoohey = { - name = "Matthew Toohey"; - email = "contact@mtoohey.com"; - github = "mtoohey31"; - githubId = 36740602; - }; munsman = { name = "Hendrik Munske"; email = "munsman.github@gmail.com"; github = "munsman"; githubId = 48153666; }; - n-hass = { - name = "Nicholas Hassan"; - email = "nick@hassan.host"; - github = "n-hass"; - githubId = 72363381; - keys = [ - { - longkeyid = "rsa4096/0xFC95AB946A781EE7"; - fingerprint = "FDEE 6116 DBA7 8840 7323 4466 A371 5973 2728 A6A6"; - } - ]; - }; NateCox = { name = "Nate Cox"; email = "nate@natecox.dev"; @@ -643,24 +402,12 @@ github = "nikp123"; githubId = 4696350; }; - nilp0inter = { - name = "Roberto Abdelkader Martínez Pérez"; - email = "robertomartinezp@gmail.com"; - github = "nilp0inter"; - githubId = 1224006; - }; NitroSniper = { name = "Nitro Sniper"; email = "nitro@ortin.dev"; github = "NitroSniper"; githubId = 44097331; }; - noodlez = { - name = "Nathaniel Barragan"; - email = "contact@nathanielbarragan.xyz"; - github = "Noodlez1232"; - githubId = 12480453; - }; nurelin = { name = "nurelin"; email = "nurelin@users.noreply.github.com"; @@ -673,71 +420,24 @@ github = "olmokramer"; githubId = 3612514; }; - onny = { - name = "onny"; - email = "onny@project-insanity.org"; - github = "onny"; - githubId = 757752; - }; - otavio = { - email = "otavio.salvador@ossystems.com.br"; - github = "otavio"; - githubId = 25278; - name = "Otavio Salvador"; - }; - oughie = { - name = "Oughie"; - email = "oughery@gmail.com"; - github = "Oughie"; - githubId = 123173954; - }; owm111 = { email = "7798336+owm111@users.noreply.github.com"; name = "Owen McGrath"; github = "owm111"; githubId = 7798336; }; - pamplemousse = { - name = "Xavier Maso"; - email = "xav.maso@gmail.com"; - github = "pamplemousse"; - githubId = 2647236; - }; pedorich-n = { name = "Mykyta Pedorich"; email = "pedorich.n@gmail.com"; github = "pedorich-n"; githubId = 15573098; }; - Philipp-M = { - email = "philipp@mildenberger.me"; - github = "Philipp-M"; - githubId = 9267430; - name = "Philipp Mildenberger"; - }; - pinage404 = { - name = "pinage404"; - email = "pinage404@gmail.com"; - github = "pinage404"; - githubId = 6325757; - }; pltanton = { name = "pltanton"; email = "plotnikovanton@gmail.com"; github = "pltanton"; githubId = 4561823; }; - podocarp = { - name = "Jia Xiaodong"; - email = "xdjiaxd@gmail.com"; - github = "podocarp"; - githubId = 10473184; - }; - PopeRigby = { - name = "PopeRigby"; - github = "poperigby"; - githubId = 20866468; - }; rasmus-kirk = { name = "Rasmus Kirk"; email = "mail@rasmuskirk.com"; @@ -756,12 +456,6 @@ } ]; }; - repparw = { - name = "repparw"; - email = "ubritos@gmail.com"; - github = "repparw"; - githubId = 45952970; - }; rosuavio = { name = "Rosario Pulella"; email = "RosarioPulella@gmail.com"; @@ -774,89 +468,18 @@ github = "rszamszur"; githubId = 10353018; }; - sebtm = { - name = "Sebastian Sellmeier"; - email = "sebtm@users.noreply.github.com"; - github = "sebtm"; - githubId = 17243347; - }; - seylerius = { - email = "sable@seyleri.us"; - name = "Sable Seyler"; - github = "seylerius"; - githubId = 1145981; - keys = [ - { - logkeyid = "rsa4096/0x68BF2EAE6D91CAFF"; - fingerprint = "F0E0 0311 126A CD72 4392 25E6 68BF 2EAE 6D91 CAFF"; - } - ]; - }; - shimunn = { - name = "shimun"; - email = "home-manager.c.shimun@shimun.net"; - github = "shimunn"; - githubId = 41011289; - }; silmarp = { name = "Silmar Pereira da Silva Junior"; email = "silmarjr2@gmail.com"; github = "silmarp"; githubId = 67292496; }; - soywod = { - name = "Clément DOUIN"; - email = "clement.douin@posteo.net"; - matrix = "@soywod:matrix.org"; - github = "soywod"; - githubId = 10437171; - keys = [ { fingerprint = "75F0 AB7C FE01 D077 AEE6 CAFD 353E 4A18 EE0F AB72"; } ]; - }; - t4ccer = { - name = "t4ccer"; - email = "t4ccer@users.noreply.github.com"; - github = "t4ccer"; - githubId = 64430288; - }; - tensor5 = { - github = "tensor5"; - githubId = 1545895; - name = "Nicola Squartini"; - }; - timon-schelling = { - name = "Timon Schelling"; - email = "me@timon.zip"; - github = "timon-schelling"; - githubId = 36821505; - matrix = "@timon:beeper.com"; - }; - toastal = { - email = "toastal+nix@posteo.net"; - matrix = "@toastal:matrix.org"; - github = "toastal"; - githubId = 561087; - name = "toastal"; - keys = [ { fingerprint = "7944 74B7 D236 DAB9 C9EF E7F9 5CCE 6F14 66D4 7C9E"; } ]; - }; - tomodachi94 = { - email = "tomodachi94+nixpkgs@protonmail.com"; - matrix = "@tomodachi94:matrix.org"; - github = "tomodachi94"; - githubId = 68489118; - name = "tomodachi94"; - }; vortriz = { name = "Rishi Vora"; email = "vorarishi22+nix@gmail.com"; github = "Vortriz"; githubId = 97402159; }; - wcarlsen = { - name = "Willi Carlsen"; - email = "carlsenwilli+nix@gmail.com"; - github = "wcarlsen"; - githubId = 17003032; - }; zorrobert = { name = "zorrobert"; email = "zorrobert@mailbox.org"; diff --git a/modules/misc/mozilla-messaging-hosts.nix b/modules/misc/mozilla-messaging-hosts.nix index b142f7cbe..cdfba9a6b 100644 --- a/modules/misc/mozilla-messaging-hosts.nix +++ b/modules/misc/mozilla-messaging-hosts.nix @@ -33,8 +33,8 @@ in { meta.maintainers = with lib.maintainers; [ booxter + bricked rycee - lib.hm.maintainers.bricked ]; options.mozilla = { diff --git a/modules/misc/xdg-desktop-entries.nix b/modules/misc/xdg-desktop-entries.nix index 942f4bc74..d13471f20 100644 --- a/modules/misc/xdg-desktop-entries.nix +++ b/modules/misc/xdg-desktop-entries.nix @@ -200,7 +200,7 @@ let }; in { - meta.maintainers = [ lib.hm.maintainers.cwyc ]; + meta.maintainers = [ lib.maintainers.cwyc ]; options.xdg.desktopEntries = mkOption { description = '' diff --git a/modules/programs/aerospace.nix b/modules/programs/aerospace.nix index 450ba7504..b4fcf0a72 100644 --- a/modules/programs/aerospace.nix +++ b/modules/programs/aerospace.nix @@ -37,7 +37,7 @@ let filterNulls = filterListAndAttrsRecursive (v: v != null); in { - meta.maintainers = with lib.hm.maintainers; [ damidoug ]; + meta.maintainers = with lib.maintainers; [ damidoug ]; options.programs.aerospace = { enable = lib.mkEnableOption "AeroSpace window manager"; diff --git a/modules/programs/aria2.nix b/modules/programs/aria2.nix index 54e230230..6670bac1f 100644 --- a/modules/programs/aria2.nix +++ b/modules/programs/aria2.nix @@ -15,7 +15,7 @@ let "${n}=${formatValue v}"; in { - meta.maintainers = [ lib.hm.maintainers.justinlovinger ]; + meta.maintainers = [ lib.maintainers.justinlovinger ]; options.programs.aria2 = { enable = lib.mkEnableOption "aria2"; diff --git a/modules/programs/ashell.nix b/modules/programs/ashell.nix index 2e9349660..9b1fc73d2 100644 --- a/modules/programs/ashell.nix +++ b/modules/programs/ashell.nix @@ -9,7 +9,7 @@ let settingsFormat = pkgs.formats.yaml { }; in { - meta.maintainers = [ lib.hm.maintainers.justdeeevin ]; + meta.maintainers = [ lib.maintainers.justdeeevin ]; options.programs.ashell = { enable = lib.mkEnableOption "ashell, a ready to go wayland status bar for hyprland"; diff --git a/modules/programs/bacon.nix b/modules/programs/bacon.nix index 930200f0c..6551242bc 100644 --- a/modules/programs/bacon.nix +++ b/modules/programs/bacon.nix @@ -18,7 +18,7 @@ let in { - meta.maintainers = [ lib.hm.maintainers.shimunn ]; + meta.maintainers = [ lib.maintainers.shimun ]; options.programs.bacon = { enable = lib.mkEnableOption "bacon, a background rust code checker"; diff --git a/modules/programs/cavalier.nix b/modules/programs/cavalier.nix index 5d5669ba5..745630f3b 100644 --- a/modules/programs/cavalier.nix +++ b/modules/programs/cavalier.nix @@ -15,7 +15,7 @@ let in { - meta.maintainers = [ lib.hm.maintainers.bricked ]; + meta.maintainers = [ lib.maintainers.bricked ]; options.programs.cavalier = { enable = lib.mkEnableOption "Cava audio visualizer GUI"; diff --git a/modules/programs/comodoro.nix b/modules/programs/comodoro.nix index 1959f941c..c0fd7c281 100644 --- a/modules/programs/comodoro.nix +++ b/modules/programs/comodoro.nix @@ -11,7 +11,7 @@ let in { - meta.maintainers = with lib.hm.maintainers; [ soywod ]; + meta.maintainers = with lib.maintainers; [ soywod ]; options.programs.comodoro = { enable = lib.mkEnableOption "Comodoro, a CLI to manage your time"; diff --git a/modules/programs/dircolors.nix b/modules/programs/dircolors.nix index 3b38e1a73..99383f223 100644 --- a/modules/programs/dircolors.nix +++ b/modules/programs/dircolors.nix @@ -16,7 +16,7 @@ let formatLine = n: v: "${n} ${toString v}"; in { - meta.maintainers = [ lib.hm.maintainers.justinlovinger ]; + meta.maintainers = [ lib.maintainers.justinlovinger ]; options.programs.dircolors = { enable = mkOption { diff --git a/modules/programs/firefox/default.nix b/modules/programs/firefox/default.nix index 166ac5713..a23752b02 100644 --- a/modules/programs/firefox/default.nix +++ b/modules/programs/firefox/default.nix @@ -14,9 +14,9 @@ let mkFirefoxModule = import ./mkFirefoxModule.nix; in { - meta.maintainers = [ - lib.maintainers.rycee - lib.hm.maintainers.bricked + meta.maintainers = with lib.maintainers; [ + bricked + rycee lib.hm.maintainers.HPsaucii ]; diff --git a/modules/programs/floorp.nix b/modules/programs/floorp.nix index 50e52d76d..20529985e 100644 --- a/modules/programs/floorp.nix +++ b/modules/programs/floorp.nix @@ -10,7 +10,7 @@ let mkFirefoxModule = import ./firefox/mkFirefoxModule.nix; in { - meta.maintainers = [ lib.hm.maintainers.bricked ]; + meta.maintainers = [ lib.maintainers.bricked ]; imports = [ (mkFirefoxModule { diff --git a/modules/programs/gradle.nix b/modules/programs/gradle.nix index 456f05767..cfdb2dd36 100644 --- a/modules/programs/gradle.nix +++ b/modules/programs/gradle.nix @@ -46,7 +46,7 @@ let ); in { - meta.maintainers = [ lib.hm.maintainers.britter ]; + meta.maintainers = [ lib.maintainers.britter ]; options.programs.gradle = { enable = lib.mkEnableOption "Gradle Build Tool"; diff --git a/modules/programs/granted.nix b/modules/programs/granted.nix index bc2fbd49c..2bcc64746 100644 --- a/modules/programs/granted.nix +++ b/modules/programs/granted.nix @@ -8,7 +8,7 @@ let cfg = config.programs.granted; in { - meta.maintainers = [ lib.hm.maintainers.wcarlsen ]; + meta.maintainers = [ lib.maintainers.wcarlsen ]; options.programs.granted = { enable = lib.mkEnableOption "granted"; diff --git a/modules/programs/helix.nix b/modules/programs/helix.nix index 8fa6e0daf..2e2f78c9d 100644 --- a/modules/programs/helix.nix +++ b/modules/programs/helix.nix @@ -16,7 +16,7 @@ let tomlFormat = pkgs.formats.toml { }; in { - meta.maintainers = [ lib.hm.maintainers.Philipp-M ]; + meta.maintainers = [ lib.maintainers.Philipp-M ]; options.programs.helix = { enable = lib.mkEnableOption "helix text editor"; diff --git a/modules/programs/himalaya.nix b/modules/programs/himalaya.nix index d3d04b63e..4c0986318 100644 --- a/modules/programs/himalaya.nix +++ b/modules/programs/himalaya.nix @@ -107,7 +107,7 @@ let in { - meta.maintainers = with lib.hm.maintainers; [ + meta.maintainers = with lib.maintainers; [ soywod toastal ]; diff --git a/modules/programs/i3status.nix b/modules/programs/i3status.nix index f670aa301..f24f8afbf 100644 --- a/modules/programs/i3status.nix +++ b/modules/programs/i3status.nix @@ -57,7 +57,7 @@ let lib.sort (a: b: comparator (pos a) (pos b)) (lib.attrNames set); in { - meta.maintainers = [ lib.hm.maintainers.justinlovinger ]; + meta.maintainers = [ lib.maintainers.justinlovinger ]; options.programs.i3status = { enable = lib.mkEnableOption "i3status"; diff --git a/modules/programs/lapce.nix b/modules/programs/lapce.nix index 72a9c6f00..665cd550b 100644 --- a/modules/programs/lapce.nix +++ b/modules/programs/lapce.nix @@ -217,7 +217,7 @@ let ); in { - meta.maintainers = [ lib.hm.maintainers.timon-schelling ]; + meta.maintainers = [ lib.maintainers.timon ]; options.programs.lapce = options; diff --git a/modules/programs/mr.nix b/modules/programs/mr.nix index cea77c9b3..ea4a48782 100644 --- a/modules/programs/mr.nix +++ b/modules/programs/mr.nix @@ -12,7 +12,7 @@ let iniFormat = pkgs.formats.ini { inherit listToValue; }; in { - meta.maintainers = [ lib.hm.maintainers.nilp0inter ]; + meta.maintainers = [ lib.maintainers.nilp0inter ]; options.programs.mr = { enable = lib.mkEnableOption "mr, a tool to manage all your version control repositories"; diff --git a/modules/programs/ne.nix b/modules/programs/ne.nix index 9a8ad709d..693f450d7 100644 --- a/modules/programs/ne.nix +++ b/modules/programs/ne.nix @@ -27,7 +27,7 @@ let in { - meta.maintainers = [ lib.hm.maintainers.cwyc ]; + meta.maintainers = [ lib.maintainers.cwyc ]; options.programs.ne = { enable = lib.mkEnableOption "ne"; diff --git a/modules/programs/nix-index.nix b/modules/programs/nix-index.nix index 58b4e1cb8..82a49debd 100644 --- a/modules/programs/nix-index.nix +++ b/modules/programs/nix-index.nix @@ -8,9 +8,9 @@ let cfg = config.programs.nix-index; in { - meta.maintainers = [ - lib.hm.maintainers.ambroisie - lib.maintainers.khaneliman + meta.maintainers = with lib.maintainers; [ + ambroisie + khaneliman ]; options.programs.nix-index = { diff --git a/modules/programs/openstackclient.nix b/modules/programs/openstackclient.nix index 1e29194ff..119803690 100644 --- a/modules/programs/openstackclient.nix +++ b/modules/programs/openstackclient.nix @@ -10,7 +10,7 @@ let yamlFormat = pkgs.formats.yaml { }; in { - meta.maintainers = [ lib.hm.maintainers.tensor5 ]; + meta.maintainers = [ lib.maintainers.tensor5 ]; options.programs.openstackclient = { enable = lib.mkEnableOption "OpenStack command-line client"; diff --git a/modules/programs/pay-respects.nix b/modules/programs/pay-respects.nix index e31d5b0b5..53877c395 100644 --- a/modules/programs/pay-respects.nix +++ b/modules/programs/pay-respects.nix @@ -10,7 +10,7 @@ let cfgOptions = lib.concatStringsSep " " cfg.options; in { - meta.maintainers = [ lib.hm.maintainers.ALameLlama ]; + meta.maintainers = [ lib.maintainers.ALameLlama ]; options.programs.pay-respects = { enable = lib.mkEnableOption "pay-respects"; diff --git a/modules/programs/pistol.nix b/modules/programs/pistol.nix index 46ca6efb5..3c6087e4d 100644 --- a/modules/programs/pistol.nix +++ b/modules/programs/pistol.nix @@ -50,7 +50,7 @@ in ] "Pistol is now configured with programs.pistol.associations.") ]; - meta.maintainers = [ lib.hm.maintainers.mtoohey ]; + meta.maintainers = [ lib.maintainers.mtoohey ]; options.programs.pistol = { enable = lib.mkEnableOption "file previewer for terminal file managers"; diff --git a/modules/programs/pubs.nix b/modules/programs/pubs.nix index b48c5cddc..a3558c09a 100644 --- a/modules/programs/pubs.nix +++ b/modules/programs/pubs.nix @@ -11,7 +11,7 @@ let in { - meta.maintainers = [ lib.hm.maintainers.loicreynier ]; + meta.maintainers = [ lib.maintainers.loicreynier ]; options.programs.pubs = { enable = lib.mkEnableOption "pubs"; diff --git a/modules/programs/quickshell.nix b/modules/programs/quickshell.nix index 3a7549b74..87cc52c16 100644 --- a/modules/programs/quickshell.nix +++ b/modules/programs/quickshell.nix @@ -8,7 +8,7 @@ let cfg = config.programs.quickshell; in { - meta.maintainers = [ lib.hm.maintainers.justdeeevin ]; + meta.maintainers = [ lib.maintainers.justdeeevin ]; options.programs.quickshell = { enable = lib.mkEnableOption "quickshell, a flexbile QtQuick-based desktop shell toolkit."; diff --git a/modules/programs/rbw.nix b/modules/programs/rbw.nix index 80c40a126..411bd9659 100644 --- a/modules/programs/rbw.nix +++ b/modules/programs/rbw.nix @@ -64,7 +64,7 @@ let }; in { - meta.maintainers = with lib.hm.maintainers; [ ambroisie ]; + meta.maintainers = with lib.maintainers; [ ambroisie ]; options.programs.rbw = { enable = lib.mkEnableOption "rbw, a CLI Bitwarden client"; diff --git a/modules/programs/rclone.nix b/modules/programs/rclone.nix index 910828664..3f74fdc7b 100644 --- a/modules/programs/rclone.nix +++ b/modules/programs/rclone.nix @@ -291,5 +291,5 @@ in ); }; - meta.maintainers = with lib.hm.maintainers; [ jess ]; + meta.maintainers = with lib.maintainers; [ jess ]; } diff --git a/modules/programs/ruff.nix b/modules/programs/ruff.nix index b13779c0b..e1a18241c 100644 --- a/modules/programs/ruff.nix +++ b/modules/programs/ruff.nix @@ -12,7 +12,7 @@ let in { - meta.maintainers = [ lib.hm.maintainers.GaetanLepage ]; + meta.maintainers = [ lib.maintainers.GaetanLepage ]; options.programs.ruff = { enable = lib.mkEnableOption "ruff, an extremely fast Python linter and code formatter, written in Rust"; diff --git a/modules/programs/senpai.nix b/modules/programs/senpai.nix index a361ce834..43837f0c8 100644 --- a/modules/programs/senpai.nix +++ b/modules/programs/senpai.nix @@ -106,5 +106,5 @@ in xdg.configFile."senpai/senpai.scfg".text = lib.hm.generators.toSCFG { } cfg.config; }; - meta.maintainers = [ lib.hm.maintainers.malvo ]; + meta.maintainers = [ lib.maintainers.malte-v ]; } diff --git a/modules/programs/sesh.nix b/modules/programs/sesh.nix index 76791209b..3c01a6474 100644 --- a/modules/programs/sesh.nix +++ b/modules/programs/sesh.nix @@ -19,7 +19,7 @@ let tomlFormat = pkgs.formats.toml { }; in { - meta.maintainers = [ lib.hm.maintainers.michaelvanstraten ]; + meta.maintainers = [ lib.maintainers.michaelvanstraten ]; options.programs.sesh = { enable = mkEnableOption "the sesh terminal session manager"; diff --git a/modules/programs/sioyek.nix b/modules/programs/sioyek.nix index 0fe044f6d..0cef52408 100644 --- a/modules/programs/sioyek.nix +++ b/modules/programs/sioyek.nix @@ -81,5 +81,5 @@ in ] ); - meta.maintainers = [ lib.hm.maintainers.podocarp ]; + meta.maintainers = [ lib.maintainers.podocarp ]; } diff --git a/modules/programs/spotify-player.nix b/modules/programs/spotify-player.nix index d18f15017..8704b0e84 100644 --- a/modules/programs/spotify-player.nix +++ b/modules/programs/spotify-player.nix @@ -20,7 +20,7 @@ let tomlType = tomlFormat.type; in { - meta.maintainers = with lib.hm.maintainers; [ diniamo ]; + meta.maintainers = with lib.maintainers; [ diniamo ]; options.programs.spotify-player = { enable = mkEnableOption "spotify-player"; diff --git a/modules/programs/thefuck.nix b/modules/programs/thefuck.nix index 42e5fe925..593b3c427 100644 --- a/modules/programs/thefuck.nix +++ b/modules/programs/thefuck.nix @@ -8,7 +8,7 @@ let inherit (lib) mkIf; in { - meta.maintainers = [ lib.hm.maintainers.ilaumjd ]; + meta.maintainers = [ lib.maintainers.ilaumjd ]; options.programs.thefuck = { enable = lib.mkEnableOption "thefuck - magnificent app that corrects your previous console command"; diff --git a/modules/programs/timidity.nix b/modules/programs/timidity.nix index dd7079f4c..7cf91ce57 100644 --- a/modules/programs/timidity.nix +++ b/modules/programs/timidity.nix @@ -11,7 +11,7 @@ let in { - meta.maintainers = [ lib.hm.maintainers.amesgen ]; + meta.maintainers = [ lib.maintainers.amesgen ]; options.programs.timidity = { enable = lib.mkEnableOption "timidity, a software MIDI renderer"; diff --git a/modules/programs/vesktop.nix b/modules/programs/vesktop.nix index 791e7b71b..036850250 100644 --- a/modules/programs/vesktop.nix +++ b/modules/programs/vesktop.nix @@ -12,9 +12,9 @@ let in { - meta.maintainers = [ - lib.maintainers.Flameopathic - lib.hm.maintainers.LilleAila + meta.maintainers = with lib.maintainers; [ + Flameopathic + LilleAila ]; options.programs.vesktop = { diff --git a/modules/programs/wallust.nix b/modules/programs/wallust.nix index d063bec6c..03f9a25f3 100644 --- a/modules/programs/wallust.nix +++ b/modules/programs/wallust.nix @@ -17,7 +17,7 @@ let tomlFormat = pkgs.formats.toml { }; in { - meta.maintainers = with lib.hm.maintainers; [ kiara ]; + meta.maintainers = with lib.maintainers; [ kiara ]; options.programs.wallust = { enable = mkEnableOption "Wallust color scheme generator"; diff --git a/modules/programs/waylogout.nix b/modules/programs/waylogout.nix index f69e7e842..2e4e2e97d 100644 --- a/modules/programs/waylogout.nix +++ b/modules/programs/waylogout.nix @@ -8,7 +8,7 @@ let cfg = config.programs.waylogout; in { - meta.maintainers = [ lib.hm.maintainers.noodlez ]; + meta.maintainers = [ lib.maintainers.noodlez1232 ]; options.programs.waylogout = { enable = lib.mkOption { diff --git a/modules/programs/xmobar.nix b/modules/programs/xmobar.nix index 3ad556214..467fe97be 100644 --- a/modules/programs/xmobar.nix +++ b/modules/programs/xmobar.nix @@ -52,5 +52,5 @@ in xdg.configFile."xmobar/.xmobarrc".text = cfg.extraConfig; }; - meta.maintainers = [ lib.hm.maintainers.t4ccer ]; + meta.maintainers = [ lib.maintainers.t4ccer ]; } diff --git a/modules/programs/zsh/zsh-abbr.nix b/modules/programs/zsh/zsh-abbr.nix index f23634fe4..a5dfa1cb3 100644 --- a/modules/programs/zsh/zsh-abbr.nix +++ b/modules/programs/zsh/zsh-abbr.nix @@ -9,7 +9,7 @@ let cfg = config.programs.zsh.zsh-abbr; in { - meta.maintainers = [ lib.hm.maintainers.ilaumjd ]; + meta.maintainers = [ lib.maintainers.ilaumjd ]; options.programs.zsh.zsh-abbr = { enable = lib.mkEnableOption "zsh-abbr - zsh manager for auto-expanding abbreviations"; diff --git a/modules/services/comodoro.nix b/modules/services/comodoro.nix index ddbe04bea..a611c9b9e 100644 --- a/modules/services/comodoro.nix +++ b/modules/services/comodoro.nix @@ -15,7 +15,7 @@ let in { - meta.maintainers = with lib.hm.maintainers; [ soywod ]; + meta.maintainers = with lib.maintainers; [ soywod ]; options.services.comodoro = { enable = lib.mkEnableOption "Comodoro server"; diff --git a/modules/services/davmail.nix b/modules/services/davmail.nix index 332ce2af3..8c9b2d874 100644 --- a/modules/services/davmail.nix +++ b/modules/services/davmail.nix @@ -25,7 +25,7 @@ let in { - meta.maintainers = [ lib.hm.maintainers.bmrips ]; + meta.maintainers = [ lib.maintainers.bmrips ]; options.services.davmail = { diff --git a/modules/services/espanso.nix b/modules/services/espanso.nix index 3408242cf..1f799ba55 100644 --- a/modules/services/espanso.nix +++ b/modules/services/espanso.nix @@ -10,7 +10,6 @@ let mkPackageOption mkEnableOption mkIf - maintainers literalExpression types mkRemovedOptionModule @@ -46,12 +45,12 @@ in "settings" ] "Use services.espanso.configs and services.espanso.matches instead.") ]; - meta.maintainers = [ - maintainers.lucasew - maintainers.bobvanderlinden - lib.hm.maintainers.liyangau - maintainers.n8henrie - maintainers.phanirithvij + meta.maintainers = with lib.maintainers; [ + bobvanderlinden + liyangau + lucasew + n8henrie + phanirithvij ]; options = { services.espanso = { diff --git a/modules/services/fusuma.nix b/modules/services/fusuma.nix index 2daa192a6..c147885c9 100644 --- a/modules/services/fusuma.nix +++ b/modules/services/fusuma.nix @@ -63,7 +63,7 @@ let in { - meta.maintainers = [ lib.hm.maintainers.iosmanthus ]; + meta.maintainers = [ lib.maintainers.iosmanthus ]; options.services.fusuma = { enable = lib.mkEnableOption "the fusuma systemd service to automatically enable touchpad gesture"; diff --git a/modules/services/home-manager-auto-upgrade.nix b/modules/services/home-manager-auto-upgrade.nix index bf5aa9ac9..31a85c45d 100644 --- a/modules/services/home-manager-auto-upgrade.nix +++ b/modules/services/home-manager-auto-upgrade.nix @@ -28,7 +28,7 @@ let }; in { - meta.maintainers = [ lib.hm.maintainers.pinage404 ]; + meta.maintainers = [ lib.maintainers.pinage404 ]; options = { services.home-manager.autoUpgrade = { diff --git a/modules/services/jellyfin-mpv-shim.nix b/modules/services/jellyfin-mpv-shim.nix index 849247b24..31f2da6df 100644 --- a/modules/services/jellyfin-mpv-shim.nix +++ b/modules/services/jellyfin-mpv-shim.nix @@ -36,7 +36,7 @@ let bindings: lib.concatStringsSep "\n" (lib.mapAttrsToList (name: value: "${name} ${value}") bindings); in { - meta.maintainers = [ lib.hm.maintainers.repparw ]; + meta.maintainers = [ lib.maintainers.repparw ]; options = { services.jellyfin-mpv-shim = { diff --git a/modules/services/mopidy.nix b/modules/services/mopidy.nix index 7bb9de1d5..875b2d571 100644 --- a/modules/services/mopidy.nix +++ b/modules/services/mopidy.nix @@ -75,7 +75,7 @@ let in { - meta.maintainers = [ lib.hm.maintainers.foo-dogsquared ]; + meta.maintainers = [ lib.maintainers.foo-dogsquared ]; options.services.mopidy = { enable = lib.mkEnableOption "Mopidy music player daemon"; diff --git a/modules/services/podman-linux/default.nix b/modules/services/podman-linux/default.nix index fcfb70b7c..ecabeec99 100644 --- a/modules/services/podman-linux/default.nix +++ b/modules/services/podman-linux/default.nix @@ -9,9 +9,9 @@ let toml = pkgs.formats.toml { }; in { - meta.maintainers = with lib.hm.maintainers; [ - bamhm182 - n-hass + meta.maintainers = [ + lib.hm.maintainers.bamhm182 + lib.maintainers.n-hass ]; imports = [ diff --git a/modules/services/restic.nix b/modules/services/restic.nix index 59f09ae92..df2207c99 100644 --- a/modules/services/restic.nix +++ b/modules/services/restic.nix @@ -547,5 +547,5 @@ in ) (lib.filterAttrs (_: v: v.createWrapper) cfg.backups); }; - meta.maintainers = [ lib.hm.maintainers.jess ]; + meta.maintainers = [ lib.maintainers.jess ]; } diff --git a/modules/services/trayscale.nix b/modules/services/trayscale.nix index 65c2c4a38..7d2ea913e 100644 --- a/modules/services/trayscale.nix +++ b/modules/services/trayscale.nix @@ -9,7 +9,7 @@ let cfg = config.services.trayscale; in { - meta.maintainers = [ lib.hm.maintainers.callumio ]; + meta.maintainers = [ lib.maintainers.callumio ]; options.services.trayscale = { enable = lib.mkEnableOption "An unofficial GUI wrapper around the Tailscale CLI client."; diff --git a/modules/services/window-managers/spectrwm.nix b/modules/services/window-managers/spectrwm.nix index 9b79b1a38..9541e661a 100644 --- a/modules/services/window-managers/spectrwm.nix +++ b/modules/services/window-managers/spectrwm.nix @@ -35,7 +35,7 @@ let in { - meta.maintainers = [ lib.hm.maintainers.loicreynier ]; + meta.maintainers = [ lib.maintainers.loicreynier ]; options = { xsession.windowManager.spectrwm = { diff --git a/modules/services/wlsunset.nix b/modules/services/wlsunset.nix index 8f0652818..2eb59c6c8 100644 --- a/modules/services/wlsunset.nix +++ b/modules/services/wlsunset.nix @@ -14,7 +14,7 @@ let cfg = config.services.wlsunset; in { - meta.maintainers = [ lib.hm.maintainers.matrss ]; + meta.maintainers = [ lib.maintainers.matrss ]; options.services.wlsunset = { enable = lib.mkEnableOption "wlsunset"; diff --git a/modules/services/xidlehook.nix b/modules/services/xidlehook.nix index 3bc3cf8dd..1e8081504 100644 --- a/modules/services/xidlehook.nix +++ b/modules/services/xidlehook.nix @@ -48,9 +48,9 @@ let ''; in { - meta.maintainers = [ - lib.maintainers.dschrempf - lib.hm.maintainers.bertof + meta.maintainers = with lib.maintainers; [ + bertof + dschrempf ]; options.services.xidlehook = {