diff --git a/hardware-configuration/homeserver.nix b/hardware-configuration/homeserver.nix
index 7fbb9ba..c40ffa2 100644
--- a/hardware-configuration/homeserver.nix
+++ b/hardware-configuration/homeserver.nix
@@ -158,8 +158,9 @@
     nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
     hardware.enableAllFirmware = true;
     hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
-    hardware.opengl = {
+    hardware.graphics = {
       enable = true;
+      enable32Bit = true;
       extraPackages = with pkgs; [
         intel-media-driver
         intel-vaapi-driver
diff --git a/system/services/samba.nix b/system/services/samba.nix
index a481d41..6b7e0b5 100644
--- a/system/services/samba.nix
+++ b/system/services/samba.nix
@@ -8,16 +8,17 @@ in
   config = mkIf cfg.enable {
     services.samba = {
       enable = true;
-      securityType = "user";
       openFirewall = true;
-      extraConfig = ''
-        workgroup = WORKGROUP
-        server string = smbnix
-        netbios name = smbnix
-        security = user 
-        guest account = ${user.name}
-      '';
-      shares = {
+      settings = {
+        global = {
+          "invalid users" = [ "root" ];
+          workgroup = "WORKGROUP";
+          "server string" = "smbnix";
+          "netbios name" = "smbnix";
+          security = "user";
+          "guest account" = user.name;
+          "passwd program" = "/run/wrappers/bin/passwd %u";
+        };
         nas = {
           path = "/nas";
           browsable = "yes";