diff --git a/darwin/shiro/configuration.nix b/darwin/shiro/configuration.nix
index 7cdaf178..92d8330e 100644
--- a/darwin/shiro/configuration.nix
+++ b/darwin/shiro/configuration.nix
@@ -75,6 +75,7 @@
   programs.fish.enable = true;
 
   # services.nix-daemon.enable = true;
+  system.primaryUser = "servius";
   system.stateVersion = 4;
 
   system.keyboard.enableKeyMapping = true;
diff --git a/darwin/shiro/services/tailscale.nix b/darwin/shiro/services/tailscale.nix
index 175d3b09..7945f0e6 100644
--- a/darwin/shiro/services/tailscale.nix
+++ b/darwin/shiro/services/tailscale.nix
@@ -2,8 +2,9 @@
   services = {
     tailscale = {
       enable = true;
-      useRoutingFeatures = "both";
-      extraUpFlags = ["--advertise-routes=192.168.0.0/24"];
+      overrideLocalDns = true;
+      # useRoutingFeatures = "both";
+      # extraUpFlags = ["--advertise-routes=192.168.0.0/24"];
     };
   };
 }
diff --git a/home/apps/openscad.nix b/home/apps/openscad.nix
index 08d67c4e..ccc39d80 100644
--- a/home/apps/openscad.nix
+++ b/home/apps/openscad.nix
@@ -1,9 +1,10 @@
 {
   pkgs,
   device,
+  lib,
   ...
 }: {
-  home.packages = [
+  home.packages = lib.optionals pkgs.stdenv.isLinux [
     (pkgs.openscad-unstable.overrideAttrs
       (_: {
         doCheck = false;