5 files changed, 31 insertions, 93 deletions
diff --git a/src/file/homefile/meson.build b/src/file/homefile/meson.build
index 99c44c9..f319bcc 100644
--- a/src/file/homefile/meson.build
+++ b/src/file/homefile/meson.build
@@ -1,3 +1 @@
-modules += files('syshomefile.cil', 'userfile.cil')
-
-subdir('user')
+modules += files('syshomefile.cil', 'userhomefile.cil')
diff --git a/src/file/homefile/user/meson.build b/src/file/homefile/user/meson.build
deleted file mode 100644
index 6236def..0000000
--- a/src/file/homefile/user/meson.build
+++ /dev/null
@@ -1,2 +0,0 @@
-modules += files('sshfile.cil')
-
diff --git a/src/file/homefile/user/sshfile.cil b/src/file/homefile/user/sshfile.cil
deleted file mode 100644
index 377b144..0000000
--- a/src/file/homefile/user/sshfile.cil
+++ /dev/null
@@ -1,41 +0,0 @@
-;; Copyright (C) 2025 John Turner
-
-;; This program is free software: you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation, either version 3 of the License, or
-;; (at your option) any later version.
-
-;; This program is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;; GNU General Public License for more details.
-
-;; You should have received a copy of the GNU General Public License
-;; along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
-(in file.home.user
-
-    (block ssh
-
-        (macro type ((type ARG1))
-            (typeattributeset typeattr ARG1))
-
-        (typeattribute typeattr)
-
-        (call file.home.user.type (typeattr))
-
-        (block base_template
-
-    	    (blockabstract base_template)
-
-    	    (blockinherit .file.home.user.base_template)
-
-    	    (call .file.home.user.ssh.type (file)))))
-
-(block ssh
-
-    (block home
-
-        (filecon "HOME_DIR/\.ssh(/.*)?" any file_context)
-
-        (blockinherit .file.home.user.ssh.base_template)))
diff --git a/src/file/homefile/userfile.cil b/src/file/homefile/userfile.cil
deleted file mode 100644
index ff6a6e2..0000000
--- a/src/file/homefile/userfile.cil
+++ /dev/null
@@ -1,47 +0,0 @@
-;; Copyright (C) 2025 John Turner
-
-;; This program is free software: you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation, either version 3 of the License, or
-;; (at your option) any later version.
-
-;; This program is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;; GNU General Public License for more details.
-
-;; You should have received a copy of the GNU General Public License
-;; along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
-(in file.home
-
-    (block user
-
-        (macro type ((type ARG1))
-            (typeattributeset typeattr ARG1))
-
-        (typeattribute typeattr)
-
-        (call file.home.type (typeattr))
-        
-        (block base_template
-
-    	    (blockabstract base_template)
-
-    	    (blockinherit .file.home.base_template)
-
-    	    (call .file.home.user.type (file)))
-
-        (block template
-
-            (blockabstract template)
-
-            (blockinherit .file.home.template))))
-
-(in user
-
-    (block home
-
-        (filecon "HOME_DIR/.*" any file_context)
-        
-        (blockinherit .file.home.user.template)))
diff --git a/src/file/homefile/userhomefile.cil b/src/file/homefile/userhomefile.cil
new file mode 100644
index 0000000..de8a882
--- /dev/null
+++ b/src/file/homefile/userhomefile.cil
@@ -0,0 +1,30 @@
+(in file.unconfined
+    (call .user.home.home_file_type_transition_file (typeattr dir "*")))
+
+(in file.home
+    (block user
+        (macro type ((type ARG1))
+            (typeattributeset typeattr type))
+
+        (typeattribute typeattr)
+
+        (call file.home.type (typeattr))
+        (call file.user.type (typeattr))
+
+        (block base_template
+            (blockabstract base_template)
+            (blockinherit .file.user.base_template)
+            (call .file.home.user.type (file)))
+
+        (block template
+            (blockabstract template)
+            (blockinherit .file.user.template))))
+
+(in user
+    (block home
+        (macro home_file_type_transition_file ((type ARG1) (class ARG2) (name ARG3))
+            (call .home.file_type_transition (ARG1 file ARG2 ARG3)))
+        
+        (blockinherit file.home.user.template)
+        (filecon "HOME_DIR" dir file_context)
+        (filecon "HOME_DIR/.*" any file_context)))