From 151e56e2cf2f9b79c1d888773babc04eff91b22c Mon Sep 17 00:00:00 2001
From: Terry Derks <terry@keiran.us>
Date: Mon, 5 May 2025 01:09:12 -0400
Subject: [PATCH] screenrc moved to users formula

---
 screen/init.sls                  |  1 -
 {screen => users}/files/screenrc |  0
 users/init.sls                   | 21 +++++++++++++++++++--
 3 files changed, 19 insertions(+), 3 deletions(-)
 delete mode 100644 screen/init.sls
 rename {screen => users}/files/screenrc (100%)

diff --git a/screen/init.sls b/screen/init.sls
deleted file mode 100644
index 4640904..0000000
--- a/screen/init.sls
+++ /dev/null
@@ -1 +0,0 @@
-# TODO
diff --git a/screen/files/screenrc b/users/files/screenrc
similarity index 100%
rename from screen/files/screenrc
rename to users/files/screenrc
diff --git a/users/init.sls b/users/init.sls
index 16d8529..15a1a19 100644
--- a/users/init.sls
+++ b/users/init.sls
@@ -1,3 +1,12 @@
+screen:
+  pkg.installed: []
+
+/root/.screenrc:
+  file.managed:
+    - source: salt://users/files/screenrc
+    - user: root
+    - group: root
+    - mode: 640
 
 {% if salt.pillar.get('manage_root_bashrc', False) %}
 /root/.bashrc:
@@ -6,7 +15,7 @@
     - template: jinja
     - user: root
     - group: root
-    - mode: 0640
+    - mode: 640
     - context:
       bashrc_user: root
 {% endif %}
@@ -41,7 +50,15 @@
       bashrc_user: {{ user }}
     - require:
       - user: {{ user }}_user
-    {% endif %}
+
+{{ homedir }}/.screenrc:
+  file.managed:
+    - source: salt://users/files/screenrc
+    - user: {{ user }}
+    - group: {{ user }}
+    - mode: 640
+
+{% endif %}
   {% endif %}
 {% endfor %}