diff --git a/flake.nix b/flake.nix
index a9d8886..117447f 100644
--- a/flake.nix
+++ b/flake.nix
@@ -52,7 +52,6 @@
           ./tests
           ./modules/clan/flake-module.nix
           ./modules/nixos/flake-module.nix
-          ./modules/home-manager/flake-module.nix
         ];
         perSystem =
           { pkgs, system, ... }:
diff --git a/inventories/default.nix b/inventories/default.nix
index 4e63fa0..cb151dd 100644
--- a/inventories/default.nix
+++ b/inventories/default.nix
@@ -8,9 +8,7 @@
           "vega"
           "ramus"
         ];
-        w = [
-          "sirius"
-        ];
+        w = [ "sirius" ];
         b4l = [
           "rigel"
           "neptune"
diff --git a/modules/clan/home-profiles/home-user/default.nix b/modules/clan/home-profiles/home-user/default.nix
index 7013f76..cffb579 100644
--- a/modules/clan/home-profiles/home-user/default.nix
+++ b/modules/clan/home-profiles/home-user/default.nix
@@ -47,7 +47,7 @@
             services.xserver = {
               enable = true;
               xkb.layout = settings.kbLayout;
-              xkbOptions = settings.kbOptions;
+              xkb.options = settings.kbOptions;
             };
 
             home-manager.useGlobalPkgs = true;
diff --git a/modules/home-manager/emmie/default.nix b/modules/home-manager/emmie/default.nix
deleted file mode 100644
index c9fc5bf..0000000
--- a/modules/home-manager/emmie/default.nix
+++ /dev/null
@@ -1,33 +0,0 @@
-{
-  inputs,
-  ...
-}:
-let
-  username = "emmie";
-in
-{
-  imports = [ inputs.home-manager.nixosModules.home-manager ];
-
-  users.users.${username} = {
-    initialPassword = "";
-    isNormalUser = true;
-    extraGroups = [
-      "audio"
-      "video"
-      "networkmanager"
-    ];
-  };
-
-  services.xserver = {
-    enable = true;
-    xkb.layout = "us,th";
-    xkbOptions = "grp:win_space_toggle,grp:alt_shift_toggle";
-  };
-
-  home-manager.useGlobalPkgs = true;
-  home-manager.useUserPackages = true;
-  home-manager.users.${username} = ./home.nix;
-  home-manager.extraSpecialArgs = {
-    inherit inputs username;
-  };
-}
diff --git a/modules/home-manager/emmie/home.nix b/modules/home-manager/emmie/home.nix
deleted file mode 100644
index fa9d0c1..0000000
--- a/modules/home-manager/emmie/home.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-  osConfig,
-  pkgs,
-  lib,
-  username,
-  ...
-}:
-{
-  home = {
-    inherit username;
-    homeDirectory = lib.mkForce "/home/${username}";
-    stateVersion = osConfig.system.stateVersion;
-    packages = with pkgs; [
-      libreoffice
-      element-desktop
-      brave
-      firefox
-      keepassxc
-      vlc
-      thunderbird
-    ];
-  };
-  programs.home-manager.enable = true;
-}
diff --git a/modules/home-manager/flake-module.nix b/modules/home-manager/flake-module.nix
deleted file mode 100644
index 2ab1ed8..0000000
--- a/modules/home-manager/flake-module.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  flake.nixosModules = {
-    "home:emmie" = {
-      imports = [ ./emmie ];
-    };
-  };
-}
diff --git a/modules/nixos/flake-module.nix b/modules/nixos/flake-module.nix
index c88ac15..f0a8017 100644
--- a/modules/nixos/flake-module.nix
+++ b/modules/nixos/flake-module.nix
@@ -3,9 +3,6 @@
     common = {
       imports = [ ./common.nix ];
     };
-    personalComputer = {
-      imports = [ ./personal-computer ];
-    };
     think-gtcm = {
       imports = [ ./think-gtcm.nix ];
     };
diff --git a/modules/nixos/personal-computer/default.nix b/modules/nixos/personal-computer/default.nix
deleted file mode 100644
index 2d287ce..0000000
--- a/modules/nixos/personal-computer/default.nix
+++ /dev/null
@@ -1,6 +0,0 @@
-{ inputs, lib, ... }:
-{
-  imports = [
-    (inputs.import-tree.initFilter (p: !lib.hasSuffix "default.nix" p) ./.)
-  ];
-}
diff --git a/modules/nixos/personal-computer/printing.nix b/modules/nixos/personal-computer/printing.nix
deleted file mode 100644
index 82fcf98..0000000
--- a/modules/nixos/personal-computer/printing.nix
+++ /dev/null
@@ -1,62 +0,0 @@
-{
-  pkgs,
-  lib,
-  config,
-  ...
-}:
-let
-  allowManageGroups = [
-    "root"
-    "wheel"
-    "lpadmin"
-  ];
-  polkitAllowGroups = builtins.concatStringsSep "||" (
-    builtins.map (group: ''subject.isInGroup("${group}")'') allowManageGroups
-  );
-
-  printerMember = lib.map (user: user.name) (
-    lib.attrsets.attrsToList (
-      lib.attrsets.filterAttrs (name: value: value.isNormalUser) config.users.users
-    )
-  );
-
-in
-{
-  services.printing = {
-    enable = true;
-    drivers = [
-      pkgs.brlaser
-      pkgs.gutenprint
-    ];
-
-    extraFilesConf = ''
-      SystemGroup ${builtins.concatStringsSep " " allowManageGroups}
-    '';
-  };
-
-  security.polkit = {
-    enable = true;
-
-    extraConfig = ''
-      polkit.addRule(function(action, subject) {
-        var actionMatchs = (
-          action.id.indexOf('org.opensuse.cupspkhelper.mechanism.') === 0
-        );
-        if (actionMatchs) {
-          if (${polkitAllowGroups}) {
-            return polkit.Result.YES
-          }
-        }
-      });
-    '';
-  };
-
-  hardware.sane = {
-    enable = true;
-  };
-
-  users.groups.lpadmin.members = printerMember;
-  users.groups.lp.members = printerMember;
-  users.groups.scanner.members = printerMember;
-
-}
diff --git a/modules/nixos/personal-computer/users.nix b/modules/nixos/personal-computer/users.nix
deleted file mode 100644
index 4fcc983..0000000
--- a/modules/nixos/personal-computer/users.nix
+++ /dev/null
@@ -1,4 +0,0 @@
-{ lib, ... }:
-{
-  users.mutableUsers = lib.mkForce true;
-}