diff --git a/devices/mini-pc.nix b/devices/mini-pc.nix
index 80e4ce2..e102dbc 100755
--- a/devices/mini-pc.nix
+++ b/devices/mini-pc.nix
@@ -11,7 +11,10 @@ let
       ...
     }:
     {
-      device.type = "primary";
+      device = {
+        type = "primary";
+        hostname = "atoridu";
+      };
 
       imports = with inputs; [
         ./hardware/mini-pc.nix
@@ -94,7 +97,7 @@ let
       # networking.firewall.allowedTCPPorts = [ ... ];
       # networking.firewall.allowedUDPPorts = [ ... ];
       networking = {
-        hostName = "${config.xlib.devices.laptop.hostname}";
+        hostName = "${config.xlib.device.hostname}";
         networkmanager.enable = true;
         firewall.enable = false;
       };
@@ -127,7 +130,7 @@ let
           configDir = "${config.xlib.dirs.user-storage}/Syncthing/${config.system.name}"; # ${config.xlib.devices.laptop.hostname}
           dataDir = "${config.xlib.dirs.user-home}";
           group = "users";
-          user = "${config.xlib.devices.admin}";
+          user = "${config.xlib.device.username}";
         };
         pipewire = {
           enable = lib.mkDefault true;
diff --git a/modules/desktop/default.nix b/modules/desktop/default.nix
index e5904b3..fd02e12 100755
--- a/modules/desktop/default.nix
+++ b/modules/desktop/default.nix
@@ -32,10 +32,10 @@
       systemd-boot.enable = lib.mkForce false;
       grub = {
         enable = lib.mkForce true;
-        useOSProber = true;
+        device = "nodev";
         efiInstallAsRemovable = true;
         efiSupport = true;
-        device = "nodev";
+        useOSProber = true;
       };
       grub2-theme = {
         enable = true;