diff --git a/config/common/kinoite-files.yml b/config/common/kinoite-files.yml
new file mode 100644
index 0000000..62bbd2c
--- /dev/null
+++ b/config/common/kinoite-files.yml
@@ -0,0 +1,6 @@
+type: files
+files:
+  - kinoite/usr: /usr # copy static configurations
+              # configuration you wish to end up in /etc/ on the booted system should be 
+              # added into /usr/etc/ (under /config/files) as that is the proper "distro" 
+              # config directory on ostree read more in the files module's README
\ No newline at end of file
diff --git a/config/files/kinoite/usr/etc/sddm.conf.d/10-wayland.conf b/config/files/kinoite/usr/etc/sddm.conf.d/10-wayland.conf
new file mode 100644
index 0000000..513ca92
--- /dev/null
+++ b/config/files/kinoite/usr/etc/sddm.conf.d/10-wayland.conf
@@ -0,0 +1,10 @@
+# Sets the display server to wayland instead of xorg
+[General]
+DisplayServer=wayland
+# uses kwin_wayland as a compositor for sddm instead of sway,
+# drm mode for rendering,
+# disables lock-screen as we are not logged in yet,
+# disables global shortcuts to make sure user shortcuts are not inherited for security reasons
+# and uses the system locale as opposed to the user's locale
+[Wayland]
+CompositorCommand=kwin_wayland --drm --no-lockscreen --no-global-shortcuts --locale1
\ No newline at end of file
diff --git a/config/recipes/desktop/recipe-kinoite-main-userns.yml b/config/recipes/desktop/recipe-kinoite-main-userns.yml
index 8da97f2..3e7875d 100644
--- a/config/recipes/desktop/recipe-kinoite-main-userns.yml
+++ b/config/recipes/desktop/recipe-kinoite-main-userns.yml
@@ -11,6 +11,7 @@ image-version: 39
 # you can include multiple instances of the same module
 modules:
   - from-file: common/common-files.yml
+  - from-file: common/kinoite-files.yml
   - from-file: common/kinoite-packages.yml
   - from-file: common/gui-packages.yml
   - from-file: common/common-packages.yml
diff --git a/config/recipes/desktop/recipe-kinoite-main.yml b/config/recipes/desktop/recipe-kinoite-main.yml
index b629716..8ccb667 100644
--- a/config/recipes/desktop/recipe-kinoite-main.yml
+++ b/config/recipes/desktop/recipe-kinoite-main.yml
@@ -11,6 +11,7 @@ image-version: 39
 # you can include multiple instances of the same module
 modules:
   - from-file: common/common-files.yml
+  - from-file: common/kinoite-files.yml
   - from-file: common/kinoite-packages.yml
   - from-file: common/gui-packages.yml
   - from-file: common/common-packages.yml
diff --git a/config/recipes/desktop/recipe-kinoite-nvidia-userns.yml b/config/recipes/desktop/recipe-kinoite-nvidia-userns.yml
index 27a9bfd..159b379 100644
--- a/config/recipes/desktop/recipe-kinoite-nvidia-userns.yml
+++ b/config/recipes/desktop/recipe-kinoite-nvidia-userns.yml
@@ -11,6 +11,7 @@ image-version: 39
 # you can include multiple instances of the same module
 modules:
   - from-file: common/common-files.yml
+  - from-file: common/kinoite-files.yml
   - from-file: common/kinoite-packages.yml
   - from-file: common/gui-packages.yml
   - from-file: common/common-packages.yml
diff --git a/config/recipes/desktop/recipe-kinoite-nvidia.yml b/config/recipes/desktop/recipe-kinoite-nvidia.yml
index 2ecf7e5..ab08956 100644
--- a/config/recipes/desktop/recipe-kinoite-nvidia.yml
+++ b/config/recipes/desktop/recipe-kinoite-nvidia.yml
@@ -11,6 +11,7 @@ image-version: 39
 # you can include multiple instances of the same module
 modules:
   - from-file: common/common-files.yml
+  - from-file: common/kinoite-files.yml
   - from-file: common/kinoite-packages.yml
   - from-file: common/gui-packages.yml
   - from-file: common/common-packages.yml
diff --git a/config/recipes/laptop/recipe-kinoite-framework-userns.yml b/config/recipes/laptop/recipe-kinoite-framework-userns.yml
index a398e1b..45453c7 100644
--- a/config/recipes/laptop/recipe-kinoite-framework-userns.yml
+++ b/config/recipes/laptop/recipe-kinoite-framework-userns.yml
@@ -11,6 +11,7 @@ image-version: 39
 # you can include multiple instances of the same module
 modules:
   - from-file: common/common-files.yml
+  - from-file: common/kinoite-files.yml
   - from-file: common/kinoite-packages.yml
   - from-file: common/gui-packages.yml
   - from-file: common/common-packages.yml
diff --git a/config/recipes/laptop/recipe-kinoite-framework.yml b/config/recipes/laptop/recipe-kinoite-framework.yml
index 8c0db15..a582f93 100644
--- a/config/recipes/laptop/recipe-kinoite-framework.yml
+++ b/config/recipes/laptop/recipe-kinoite-framework.yml
@@ -11,6 +11,7 @@ image-version: 39
 # you can include multiple instances of the same module
 modules:
   - from-file: common/common-files.yml
+  - from-file: common/kinoite-files.yml
   - from-file: common/kinoite-packages.yml
   - from-file: common/gui-packages.yml
   - from-file: common/common-packages.yml
diff --git a/config/recipes/laptop/recipe-kinoite-main-laptop-userns.yml b/config/recipes/laptop/recipe-kinoite-main-laptop-userns.yml
index f19b59f..80bf018 100644
--- a/config/recipes/laptop/recipe-kinoite-main-laptop-userns.yml
+++ b/config/recipes/laptop/recipe-kinoite-main-laptop-userns.yml
@@ -11,6 +11,7 @@ image-version: 39
 # you can include multiple instances of the same module
 modules:
   - from-file: common/common-files.yml
+  - from-file: common/kinoite-files.yml
   - from-file: common/kinoite-packages.yml
   - from-file: common/gui-packages.yml
   - from-file: common/common-packages.yml
diff --git a/config/recipes/laptop/recipe-kinoite-main-laptop.yml b/config/recipes/laptop/recipe-kinoite-main-laptop.yml
index ff8509a..07855be 100644
--- a/config/recipes/laptop/recipe-kinoite-main-laptop.yml
+++ b/config/recipes/laptop/recipe-kinoite-main-laptop.yml
@@ -11,6 +11,7 @@ image-version: 39
 # you can include multiple instances of the same module
 modules:
   - from-file: common/common-files.yml
+  - from-file: common/kinoite-files.yml
   - from-file: common/kinoite-packages.yml
   - from-file: common/gui-packages.yml
   - from-file: common/common-packages.yml
diff --git a/config/recipes/laptop/recipe-kinoite-nvidia-laptop-userns.yml b/config/recipes/laptop/recipe-kinoite-nvidia-laptop-userns.yml
index f927c6e..77bd126 100644
--- a/config/recipes/laptop/recipe-kinoite-nvidia-laptop-userns.yml
+++ b/config/recipes/laptop/recipe-kinoite-nvidia-laptop-userns.yml
@@ -11,6 +11,7 @@ image-version: 39
 # you can include multiple instances of the same module
 modules:
   - from-file: common/common-files.yml
+  - from-file: common/kinoite-files.yml
   - from-file: common/kinoite-packages.yml
   - from-file: common/gui-packages.yml
   - from-file: common/common-packages.yml
diff --git a/config/recipes/laptop/recipe-kinoite-nvidia-laptop.yml b/config/recipes/laptop/recipe-kinoite-nvidia-laptop.yml
index c50cabb..d85954e 100644
--- a/config/recipes/laptop/recipe-kinoite-nvidia-laptop.yml
+++ b/config/recipes/laptop/recipe-kinoite-nvidia-laptop.yml
@@ -11,6 +11,7 @@ image-version: 39
 # you can include multiple instances of the same module
 modules:
   - from-file: common/common-files.yml
+  - from-file: common/kinoite-files.yml
   - from-file: common/kinoite-packages.yml
   - from-file: common/gui-packages.yml
   - from-file: common/common-packages.yml