diff options
| author | AndersonTorres <torres.anderson.85@protonmail.com> | 2022-02-26 21:04:25 -0300 |
|---|---|---|
| committer | AndersonTorres <torres.anderson.85@protonmail.com> | 2022-02-26 21:04:25 -0300 |
| commit | ed2b1b4b909538716abb6378971ba75fae65b7d2 (patch) | |
| tree | 25c9f8f505f3ad7d3955c556a50ef6c111e7c369 /nixos/modules/module-list.nix | |
| parent | f68dbdc7c39faa5f685e34b10da0b373ad6a7c22 (diff) | |
| parent | 2970b27faf15840714feba50186e7e02d945569f (diff) | |
| download | nixpkgs-ed2b1b4b909538716abb6378971ba75fae65b7d2.tar nixpkgs-ed2b1b4b909538716abb6378971ba75fae65b7d2.tar.gz nixpkgs-ed2b1b4b909538716abb6378971ba75fae65b7d2.tar.bz2 nixpkgs-ed2b1b4b909538716abb6378971ba75fae65b7d2.tar.lz nixpkgs-ed2b1b4b909538716abb6378971ba75fae65b7d2.tar.xz nixpkgs-ed2b1b4b909538716abb6378971ba75fae65b7d2.tar.zst nixpkgs-ed2b1b4b909538716abb6378971ba75fae65b7d2.zip | |
Merge branch 'master' into staging-next
Diffstat (limited to 'nixos/modules/module-list.nix')
| -rw-r--r-- | nixos/modules/module-list.nix | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 351fcf7cdbb..29fcc920f42 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -167,6 +167,7 @@ ./programs/iftop.nix ./programs/iotop.nix ./programs/java.nix + ./programs/k40-whisperer.nix ./programs/kdeconnect.nix ./programs/kbdlight.nix ./programs/less.nix @@ -253,6 +254,7 @@ ./security/tpm2.nix ./services/admin/meshcentral.nix ./services/admin/oxidized.nix + ./services/admin/pgadmin.nix ./services/admin/salt/master.nix ./services/admin/salt/minion.nix ./services/amqp/activemq/default.nix @@ -897,6 +899,7 @@ ./services/networking/tcpcrypt.nix ./services/networking/teamspeak3.nix ./services/networking/tedicross.nix + ./services/networking/tetrd.nix ./services/networking/teleport.nix ./services/networking/thelounge.nix ./services/networking/tinc.nix |