diff --git a/hosts/gerg-desktop/main.nix b/hosts/gerg-desktop/main.nix
index 5db6404..fd0fdb1 100644
--- a/hosts/gerg-desktop/main.nix
+++ b/hosts/gerg-desktop/main.nix
@@ -26,6 +26,7 @@
     ];
   };
   boot.binfmt.emulatedSystems = [ "aarch64-linux" ];
+
   hardware.nvidia = {
     package = config.boot.kernelPackages.nvidiaPackages.beta;
     nvidiaPersistenced = false;
@@ -47,20 +48,21 @@
     "amdgpu"
   ];
 
-  services.gnome.gnome-keyring.enable = true;
+  programs = {
+    steam.enable = true;
 
-  programs.steam.enable = true;
+    direnv = {
+      enable = true;
+      loadInNixShell = false;
+      silent = true;
+    };
 
-  programs.direnv = {
-    enable = true;
-    loadInNixShell = false;
-    silent = true;
-    nix-direnv.package = pkgs.nix-direnv.override { nix = config.nix.package; };
-  };
+    nix-index = {
+      enable = true;
+      package = nix-index-database.packages.nix-index-with-db;
+    };
 
-  programs.nix-index = {
-    enable = true;
-    package = nix-index-database.packages.nix-index-with-db;
+    adb.enable = true;
   };
 
   nix = {
@@ -119,7 +121,6 @@
     # pkgs.via
     # pkgs.qmk-udev-rules
   ];
-  programs.adb.enable = true;
 
   networking = {
     useNetworkd = false;
@@ -172,17 +173,12 @@
           "adbusers"
           "plugdev"
         ];
-        openssh.authorizedKeys.keys = [
-          config.local.keys.gerg_gerg-phone
-          config.local.keys.gerg_gerg-windows
-        ];
+        openssh.authorizedKeys.keys = builtins.attrValues {
+          inherit (config.local.keys) gerg_gerg-phone gerg_gerg-windows;
+        };
         hashedPasswordFile = config.sops.secrets.gerg.path;
       };
-      "root" = {
-        uid = 0;
-        home = "/root";
-        hashedPassword = "!";
-      };
+      root.hashedPassword = "!";
     };
   };
   boot = {
diff --git a/hosts/gerg-desktop/services/ddns.nix b/hosts/gerg-desktop/services/ddns.nix
index 78f104b..e66d501 100644
--- a/hosts/gerg-desktop/services/ddns.nix
+++ b/hosts/gerg-desktop/services/ddns.nix
@@ -10,10 +10,6 @@
     reloadIfChanged = false;
     restartIfChanged = false;
     stopIfChanged = false;
-    serviceConfig = {
-      Type = "oneshot";
-      RemainAfterExit = true;
-    };
     wantedBy = [ "multi-user.target" ];
     wants = [ "network-online.target" ];
     after = [ "network-online.target" ];
diff --git a/hosts/gerg-desktop/services/minecraft.nix b/hosts/gerg-desktop/services/minecraft.nix
index 5f8bbd1..7aa8ab9 100644
--- a/hosts/gerg-desktop/services/minecraft.nix
+++ b/hosts/gerg-desktop/services/minecraft.nix
@@ -1,44 +1,30 @@
-{ self', lib }:
+{ lib, self' }:
 {
   # I manually switch this sometimes
   config = lib.mkIf false {
-    networking.firewall.allowedTCPPorts = [ 25565 ];
+    networking.firewall.allowedTCPPorts = [
+      25565
+      25575
+    ];
 
-    users.users.minecraft = {
-      description = "Minecraft server service user";
-      home = "/persist/minecraft";
-      createHome = true;
-      isSystemUser = true;
-      group = "minecraft";
-    };
-    users.groups.minecraft = { };
-
-    systemd.sockets.minecraft-server = {
-      bindsTo = [ "minecraft-server.service" ];
-      socketConfig = {
-        ListenFIFO = "/run/minecraft-server.stdin";
-        SocketMode = "0660";
-        SocketUser = "minecraft";
-        SocketGroup = "minecraft";
-        RemoveOnStop = true;
-        FlushPending = true;
+    users = {
+      users.minecraft = {
+        home = "/minecraft";
+        createHome = true;
+        isSystemUser = true;
+        group = "minecraft";
       };
+      groups.minecraft = { };
     };
 
     systemd.services.minecraft-server = {
-      enable = true;
-      description = "Minecraft Server Service";
+      description = "Minecraft";
       wantedBy = [ "multi-user.target" ];
-      requires = [ "minecraft-server.socket" ];
-      after = [
-        "network.target"
-        "minecraft-server.socket"
-      ];
-      path = [ self'.packages.papermc ];
+      after = [ "network.target" ];
       script = ''
-        minecraft-server \
-          -Xms8G \
-          -Xmx8G \
+        ${lib.getExe self'.packages.papermc} \
+          -Xms6G \
+          -Xmx6G \
           -XX:+UseG1GC \
           -XX:+ParallelRefProcEnabled \
           -XX:MaxGCPauseMillis=200 \
@@ -63,9 +49,9 @@
       serviceConfig = {
         Restart = "always";
         User = "minecraft";
-        WorkingDirectory = "/persist/minecraft";
+        WorkingDirectory = "/minecraft";
 
-        StandardInput = "socket";
+        StandardInput = "journal";
         StandardOutput = "journal";
         StandardError = "journal";
 
diff --git a/hosts/media-laptop/main.nix b/hosts/media-laptop/main.nix
index bed8c53..1fd7895 100644
--- a/hosts/media-laptop/main.nix
+++ b/hosts/media-laptop/main.nix
@@ -45,14 +45,10 @@
         extraGroups = [ "networkmanager" ];
         initialHashedPassword = "";
       };
-      "root" = {
-        uid = 0;
-        home = "/root";
-        openssh.authorizedKeys.keys = [
-          config.local.keys.gerg_gerg-phone
-          config.local.keys.gerg_gerg-windows
-          config.local.keys.gerg_gerg-desktop
-        ];
+      root = {
+        openssh.authorizedKeys.keys = builtins.attrValues {
+          inherit (config.local.keys) gerg_gerg-phone gerg_gerg-windows gerg_gerg-desktop;
+        };
         hashedPasswordFile = config.sops.secrets.root.path;
       };
     };
diff --git a/modules/shell.nix b/modules/shell.nix
index 7903f3b..63b42c2 100644
--- a/modules/shell.nix
+++ b/modules/shell.nix
@@ -2,7 +2,6 @@
   fetch-rs,
   pkgs,
   config,
-  lib,
 }:
 {
   systemd.tmpfiles.rules = [ "d /tmp/neovim-page 0777 root root - -" ];
@@ -11,7 +10,6 @@
       inherit (pkgs) page eza fzf;
       inherit (fetch-rs.packages) fetch-rs;
     };
-    binsh = lib.getExe pkgs.dash; # use dash for speed
     variables = {
       EDITOR = "nvim";
       VISUAL = "nvim";