the great update

hosts/default.nix

@@ -1,20 +1,17 @@
-{ self, nixpkgs, ... }: { systemSettings, userSettings, ... }:
+{ self, nixpkgs, ... }:
 let
   inherit (self) inputs;
-  inherit systemSettings userSettings;
   mkHost = name:
     nixpkgs.lib.nixosSystem {
       modules = [
         ./${name}
-        {
-          nixpkgs.hostPlatform = systemSettings.system;
-        }
+        ../overlays
       ] ++ builtins.attrValues self.nixosModules;
 
       specialArgs = {
         inherit inputs;
-        inherit systemSettings;
-        inherit userSettings;
+        systemSettings = import ./${name}/systemSettings.nix;
+        userSettings = import ../user/userSettings.nix;
       };
     };
 in

hosts/syushiki/default.nix

@@ -1,7 +1,8 @@
-{ config, lib, pkgs, modulesPath, ... }: {
+{ config, lib, pkgs, modulesPath, systemSettings, ... }: {
   imports = [
     ../../system
     ../../system/nvidia
+    ../../user
     (modulesPath + "/installer/scan/not-detected.nix")
   ];
 
@@ -30,7 +31,7 @@
     [ { device = "/dev/disk/by-uuid/d933c349-8e70-41e1-8d13-605656dba18b"; }
     ];
 
-  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
+  nixpkgs.hostPlatform = lib.mkDefault systemSettings.system;
   hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
 
   # Use the systemd-boot EFI boot loader.

hosts/syushiki/home.nix

@@ -1,14 +1,7 @@
 { pkgs, userSettings, ... }:
 {
   imports = [
-    ../../user/apps/browsers/firefox.nix
-    ../../user/apps/browsers/chromium.nix
-    ../../user/apps/thunderbird.nix
     ../../user/dev/tools/git.nix
-    ../../user/dev/tools/gitui.nix
-    ../../user/dev/tools/firefox-devedition.nix
-    ../../user/dev/tools/dbeaver-bin.nix
-    ../../user/dev/tools/tldr.nix
     ../../user/dev/tools/gh.nix
     ../../user/dev/editor/vscodium.nix
     ../../user/dev/editor/zed-editor.nix
@@ -16,25 +9,6 @@
     ../../user/dev/lang/python.nix
     ../../user/dev/lang/rust.nix
     ../../user/dev/lang/ecmascript.nix
-    ../../user/dev/ide/qtcreator.nix
-    ../../user/apps/utils/alacritty.nix
-    ../../user/apps/utils/keepassxc.nix
-    #../../user/apps/utils/cava.nix
-    ../../user/apps/utils/owncloud-client.nix
-    ../../user/apps/utils/fzf.nix
-    ../../user/apps/utils/zoxide.nix
-    ../../user/apps/media/vlc.nix
-    ../../user/apps/media/mpv.nix
-    ../../user/apps/media/yt-dlp.nix
-    ../../user/apps/media/kdenlive.nix
-    ../../user/apps/media/obs-studio.nix
-    ../../user/apps/graphics/gimp.nix
-    ../../user/apps/graphics/inkscape.nix
-    ../../user/apps/games/mangohud.nix
-    ../../user/apps/office/texlive.nix
-    #../../user/apps/office/libreoffice-fresh.nix
-    ../../user/shell/bash.nix
-    ../../user/wm/xmonad/xmonad.nix
   ];
 
   home.username = userSettings.username;

hosts/syushiki/systemSettings.nix

@@ -0,0 +1,6 @@
+{
+  system = "x86_64-linux";
+  hostname = "kenryu-nixos";
+  timezone = "Asia/Tokyo";
+  locale = "ja_JP.UTF-8";
+}