From e089aa758943b408fa643ebb3babd748191fed28 Mon Sep 17 00:00:00 2001
From: kurogeek <kurogeek@lmvhaus.com>
Date: Wed, 14 Jan 2026 14:29:26 +0700
Subject: [PATCH] mob next [ci-skip] [ci skip] [skip ci]

lastFile:modules/clan/personal-computer/default.nix
---
 inventories/personal-computer.nix                |  2 +-
 machines/rana/configuration.nix                  |  2 --
 modules/clan/home-profiles/home-user/default.nix | 10 ++--------
 modules/clan/personal-computer/default.nix       | 14 ++++++--------
 4 files changed, 9 insertions(+), 19 deletions(-)

diff --git a/inventories/personal-computer.nix b/inventories/personal-computer.nix
index 9447d58..2b5030c 100644
--- a/inventories/personal-computer.nix
+++ b/inventories/personal-computer.nix
@@ -11,7 +11,7 @@
           name = "home-user";
           input = "self";
         };
-        roles.settings = {
+        roles.default.settings = {
           username = "emmie";
           kbLayout = "us,th";
           kbOptions = "grp:win_space_toggle,grp:alt_shift_toggle";
diff --git a/machines/rana/configuration.nix b/machines/rana/configuration.nix
index 31a85fc..cb66398 100644
--- a/machines/rana/configuration.nix
+++ b/machines/rana/configuration.nix
@@ -2,8 +2,6 @@
 {
   imports = [
     self.nixosModules.common
-    self.nixosModules.personalComputer
-    self.nixosModules."home:emmie"
   ];
 
   nixpkgs.hostPlatform = {
diff --git a/modules/clan/home-profiles/home-user/default.nix b/modules/clan/home-profiles/home-user/default.nix
index b191b14..7013f76 100644
--- a/modules/clan/home-profiles/home-user/default.nix
+++ b/modules/clan/home-profiles/home-user/default.nix
@@ -24,16 +24,10 @@
         };
       };
     perInstance =
-      {
-        settings,
-        ...
-      }:
+      { settings, ... }:
       {
         nixosModule =
-          {
-            inputs,
-            ...
-          }:
+          { inputs, ... }:
           let
             username = settings.username;
           in
diff --git a/modules/clan/personal-computer/default.nix b/modules/clan/personal-computer/default.nix
index fe2cb26..0590433 100644
--- a/modules/clan/personal-computer/default.nix
+++ b/modules/clan/personal-computer/default.nix
@@ -6,16 +6,14 @@
   manifest.categories = [ "System" ];
 
   roles.default = {
-    perInstance =
+    perInstance.nixosModule =
       { ... }:
       {
-        nixosModule =
-          { inputs, lib, ... }:
-          {
-            imports = [
-              (inputs.import-tree.initFilter (p: !lib.hasSuffix "default.nix" p) ./.)
-            ];
-          };
+        imports = [
+          ./printing.nix
+          ./mutable-user.nix
+          ./automatic-timezone.nix
+        ];
       };
   };
 }