diff --git a/modules/home/roles/default.nix b/modules/home/roles/default.nix
index d39b41e..7502f02 100644
--- a/modules/home/roles/default.nix
+++ b/modules/home/roles/default.nix
@@ -39,6 +39,15 @@ in
         programs.nix-index.enable = mkDefault true;
         programs.nix-index-database.comma.enable = mkDefault true;
 
+        home.activation = {
+          remove-nix-legacy = entryAfter [ "writeBoundary" ] ''
+            rm -rf ${config.home.homeDirectory}/.nix-defexpr
+            unlink ${config.home.homeDirectory}/.nix-profile
+          '';
+        };
+
+        news.display = "silent";
+
         persist.enable = mkDefault true;
         persist.cache.clean.enable = mkDefault true;
         # Cargo cache
@@ -48,6 +57,10 @@ in
         persist.cache.directories = [
           ".local/share/cargo"
         ];
+
+        xdg.configFile."nixpkgs/config.nix".text = mkDefault ''
+          { allowUnfree = true; android_sdk.accept_license = true; }
+        '';
       };
       serverRole = recursiveUpdate baseRole { };
       desktopRole = recursiveUpdate baseRole {
diff --git a/modules/nixos/roles/default.nix b/modules/nixos/roles/default.nix
index 10b8cc7..9c7abcb 100644
--- a/modules/nixos/roles/default.nix
+++ b/modules/nixos/roles/default.nix
@@ -14,6 +14,7 @@ let
     types
     ;
 
+  defaultUser = config.ataraxia.defaults.users.defaultUser;
   fs = config.ataraxia.filesystems;
   fsCompression = fs.zfs.enable || fs.btrfs.enable;
   role = config.ataraxia.defaults.role;
@@ -52,6 +53,7 @@ in
 
         # Do not compress journal logs if using native fs compression
         services.journald.extraConfig = mkIf fsCompression (mkDefault "Compress=false");
+        services.speechd.enable = false;
 
         boot.initrd.systemd.enable = mkDefault true;
         services.userborn.enable = mkDefault true;
@@ -60,6 +62,17 @@ in
         system.etc.overlay.enable = mkDefault true;
         system.etc.overlay.mutable = mkDefault true;
 
+        systemd.services.systemd-timesyncd.wantedBy = [
+          "multi-user.target"
+        ];
+        systemd.timers.systemd-timesyncd = {
+          timerConfig.OnCalendar = "hourly";
+        };
+
+        environment.systemPackages = with pkgs; [
+          git
+        ];
+
         zramSwap = {
           enable = true;
           algorithm = "zstd";
@@ -72,16 +85,21 @@ in
         ataraxia.profiles.minimal = mkDefault true;
 
         time.timeZone = "Etc/UTC";
+        zramSwap.memoryPercent = 100;
       };
       desktopRole = recursiveUpdate baseRole {
         ataraxia.defaults.hardware.graphics = mkDefault true;
         ataraxia.defaults.sound.enable = mkDefault true;
 
+        services.getty.autologinUser = mkDefault defaultUser;
+
         location = {
           provider = "manual";
           latitude = 48;
           longitude = 44;
         };
+
+        zramSwap.memoryPercent = 150;
       };
     in
     mkMerge [