From 900aaa5a98b7cbe838018935fe222530a951af05 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Fri, 3 Jan 2020 15:16:25 +0000
Subject: [PATCH 1/3] screen: move pam service to module

---
 nixos/modules/programs/screen.nix | 1 +
 nixos/modules/security/pam.nix    | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/programs/screen.nix b/nixos/modules/programs/screen.nix
index 4fd800dbae7..728a0eb8cea 100644
--- a/nixos/modules/programs/screen.nix
+++ b/nixos/modules/programs/screen.nix
@@ -27,6 +27,7 @@ in
     environment.etc.screenrc.text = cfg.screenrc;
 
     environment.systemPackages = [ pkgs.screen ];
+    security.pam.services.screen = {};
   };
 
 }
diff --git a/nixos/modules/security/pam.nix b/nixos/modules/security/pam.nix
index 0adc27c47f0..1085501e859 100644
--- a/nixos/modules/security/pam.nix
+++ b/nixos/modules/security/pam.nix
@@ -781,7 +781,6 @@ in
         ftp = {};
         i3lock = {};
         i3lock-color = {};
-        screen = {};
         vlock = {};
         xlock = {};
         xscreensaver = {};

From 2591fc7ede5a5442d577509e8bb78455b982e91c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Fri, 3 Jan 2020 15:16:43 +0000
Subject: [PATCH 2/3] pam: remove cups service

The cups module itself already defines this.
---
 nixos/modules/security/pam.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/nixos/modules/security/pam.nix b/nixos/modules/security/pam.nix
index 1085501e859..782716e5197 100644
--- a/nixos/modules/security/pam.nix
+++ b/nixos/modules/security/pam.nix
@@ -777,7 +777,6 @@ in
           '';
 
         # Most of these should be moved to specific modules.
-        cups = {};
         ftp = {};
         i3lock = {};
         i3lock-color = {};

From 9458ec4115f07af4f7e314ce66873a2e89210153 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Fri, 3 Jan 2020 15:17:22 +0000
Subject: [PATCH 3/3] pam: remove unused ftp service

vsftpd is the only ftp server module and defines its own pam service.
---
 nixos/modules/security/pam.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/nixos/modules/security/pam.nix b/nixos/modules/security/pam.nix
index 782716e5197..9a82e3b71cd 100644
--- a/nixos/modules/security/pam.nix
+++ b/nixos/modules/security/pam.nix
@@ -777,7 +777,6 @@ in
           '';
 
         # Most of these should be moved to specific modules.
-        ftp = {};
         i3lock = {};
         i3lock-color = {};
         vlock = {};