diff --git a/machines/asus/discord/default.nix b/machines/asus/discord/default.nix
index 2c5054e..1585070 100644
--- a/machines/asus/discord/default.nix
+++ b/machines/asus/discord/default.nix
@@ -1,5 +1,5 @@
-{ pkgs, systemPackages, ... }:
+{ pkgs, homePackages, ... }:
 
-with pkgs; systemPackages [
+with pkgs; homePackages "nixos" [
     discord
 ]
diff --git a/machines/asus/firefox/default.nix b/machines/asus/firefox/default.nix
index 33d9b31..caba968 100644
--- a/machines/asus/firefox/default.nix
+++ b/machines/asus/firefox/default.nix
@@ -1,5 +1,5 @@
-{ systemConfiguration, enabled, ... }:
+{ homeConfiguration, enabled, ... }:
 
-systemConfiguration {
+homeConfiguration "nixos" {
   programs.firefox = enabled {};
 }
diff --git a/machines/asus/nushell/default.nix b/machines/asus/nushell/default.nix
index 04dbf75..51f3f88 100644
--- a/machines/asus/nushell/default.nix
+++ b/machines/asus/nushell/default.nix
@@ -1,7 +1,7 @@
 { pkgs, systemConfiguration, homeConfiguration, enabled, ... }:
 
 (systemConfiguration {
-  users.defaultUserShell = pkgs.nushell;
+  users.users.nixos.shell = pkgs.nushell;
 })
 
 //
diff --git a/machines/asus/openttd/default.nix b/machines/asus/openttd/default.nix
index af57383..831b9d5 100644
--- a/machines/asus/openttd/default.nix
+++ b/machines/asus/openttd/default.nix
@@ -1,5 +1,5 @@
-{ pkgs, systemPackages, ... }:
+{ pkgs, homePackages, ... }:
 
-with pkgs; systemPackages [
+with pkgs; homePackages "nixos" [
     openttd
 ]
diff --git a/machines/asus/packages.nix b/machines/asus/packages.nix
index f202431..3380312 100644
--- a/machines/asus/packages.nix
+++ b/machines/asus/packages.nix
@@ -1,20 +1,12 @@
-{ pkgs, systemPackages, ... }:
+{ pkgs, systemPackages, homePackages, ... }:
 
-with pkgs; systemPackages [
+(with pkgs; systemPackages [
   bat
   htop
   neofetch
   thefuck
   wine
 
-  jetbrains.idea-ultimate
-  obs-studio
-  qbittorrent
-
-  libreoffice
-  hunspellDicts.en_US
-  hunspellDicts.en_GB-ize
-
   gcc
   go
 
@@ -27,4 +19,16 @@ with pkgs; systemPackages [
   ])
 
   lightly-qt
-]
+])
+
+//
+
+(with pkgs; homePackages "nixos" [
+  jetbrains.idea-ultimate
+  obs-studio
+  qbittorrent
+
+  libreoffice
+  hunspellDicts.en_US
+  hunspellDicts.en_GB-ize
+])