diff --git a/nixos/vanguard-xenia.nix b/nixos/vanguard-xenia.nix
index cd811737..f95e0e71 100644
--- a/nixos/vanguard-xenia.nix
+++ b/nixos/vanguard-xenia.nix
@@ -9,6 +9,11 @@
 
   networking.hostName = "Vanguard"; # Define your hostname.
 
+  environment.systemPackages = with pkgs; [
+    clinfo
+    glxinfo
+  ];
+
   # Define a user account. Don't forget to set a password with ‘passwd’.
   users.users.xenia = {
     isNormalUser = true;
@@ -17,13 +22,23 @@
     shell = pkgs.fish;
   };
 
-  # Enable automatic login for the user.
-  services.xserver.displayManager.autoLogin.enable = true;
-  services.xserver.displayManager.autoLogin.user = "xenia";
+  services.xserver.displayManager = {
+    # Enable automatic login for the user.
+    autoLogin = {
+      enable = true;
+      user = "xenia";
+    };
+    # Fix Logitech MX Master buttons being inverted
+    sessionCommands = ''
+      ${pkgs.xorg.xinput}/bin/xinput set-button-map "Logitech USB Receiver Mouse" 3 2 1
+    '';
+  };
 
   # Set up home manager for user
   home-manager.users.xenia = import ./home-manager/vanguard-xenia.nix;
 
   # For Steam support
   hardware.opengl.driSupport32Bit = true;
+
+  hardware.bluetooth.enable = true;
 }