diff --git a/lib/mkNeovim.nix b/lib/mkNeovim.nix
index d638598ee58e0b5d0d50fb7bed98c8a54181ff43..d22a809c0c461e5a1e88caf629f4edc76ca016e0 100644
--- a/lib/mkNeovim.nix
+++ b/lib/mkNeovim.nix
@@ -1,7 +1,7 @@
 { self, inputs }:
 user: pkgs:
 let
-  darwin = pkgs.lib.strings.hasSuffix "-darwin" pkgs.system;
+  darwin = pkgs.lib.strings.hasSuffix "-darwin" pkgs.stdenv.hostPlatform.system;
 
   host = {
     inherit darwin;
diff --git a/modules/home/default.nix b/modules/home/default.nix
index 6e9a26196dcdf34958881eb89a2316560317139d..88d1c66aca0215de23ec9f7d009cae4034edb60f 100644
--- a/modules/home/default.nix
+++ b/modules/home/default.nix
@@ -69,8 +69,10 @@ in
 
       git = {
         enable = true;
-        userName = lib.mkDefault user.name;
-        userEmail = lib.mkDefault user.email;
+        settings.user = {
+          name = lib.mkDefault user.name;
+          email = lib.mkDefault user.email;
+        };
         ignores = [
           (lib.mkIf host.darwin ".DS_Store") # When using Finder
           (lib.mkIf host.darwin "._*") # When using non-APFS drives
diff --git a/modules/neovim/default.nix b/modules/neovim/default.nix
index 6a31c91a848672da9814e0b6bd9e5c5ad48a29f8..ba0eb9a3070da9d298bb1aaa677260b93cad1194 100644
--- a/modules/neovim/default.nix
+++ b/modules/neovim/default.nix
@@ -111,7 +111,7 @@
       html.enable = true;
       nix.enable = true;
       python.enable = true;
-      rust.crates.enable = true;
+      rust.extensions.crates-nvim.enable = true;
       rust.enable = true;
       ts.enable = true;
       zig.enable = true;
diff --git a/modules/nixos/nvidia.nix b/modules/nixos/nvidia.nix
index 88f2252341a33631e504018b8a531b7c1b32fec9..07da1ea6a0b00b9d2454cfce62b531447bbae0a1 100644
--- a/modules/nixos/nvidia.nix
+++ b/modules/nixos/nvidia.nix
@@ -84,7 +84,7 @@ in
       enable32Bit = true;
       extraPackages = with pkgs; [
         nvidia-vaapi-driver
-        vaapiVdpau
+        libva-vdpau-driver
         libvdpau-va-gl
         mesa
         egl-wayland
@@ -104,7 +104,7 @@ in
 
   environment.systemPackages = with pkgs; [
     vulkan-tools
-    glxinfo
+    mesa-demos
     libva-utils # VA-API debugging tools
   ];
 }
diff --git a/users/fish/cattop/hardware-configuration.nix b/users/fish/cattop/hardware-configuration.nix
index b16ddcb14f7da7960d16b1feb84affeece222af5..3ba67c75dbb9e829ad076a7a30a6c0320fdc9ac6 100644
--- a/users/fish/cattop/hardware-configuration.nix
+++ b/users/fish/cattop/hardware-configuration.nix
@@ -1,32 +1,46 @@
 # Do not modify this file!  It was generated by ‘nixos-generate-config’
 # and may be overwritten by future invocations.  Please make changes
 # to /etc/nixos/configuration.nix instead.
-{ config, lib, pkgs, modulesPath, ... }:
+{
+  config,
+  lib,
+  pkgs,
+  modulesPath,
+  ...
+}:
 
 {
-  imports =
-    [ (modulesPath + "/installer/scan/not-detected.nix")
-    ];
+  imports = [
+    (modulesPath + "/installer/scan/not-detected.nix")
+  ];
 
-  boot.initrd.availableKernelModules = [ "xhci_pci" "thunderbolt" "vmd" "nvme" ];
+  boot.initrd.availableKernelModules = [
+    "xhci_pci"
+    "thunderbolt"
+    "vmd"
+    "nvme"
+  ];
   boot.initrd.kernelModules = [ ];
   boot.kernelModules = [ "kvm-intel" ];
   boot.extraModulePackages = [ ];
 
-  fileSystems."/" =
-    { device = "/dev/disk/by-uuid/d434c90f-e135-426e-b237-ead2f44e37c6";
-      fsType = "ext4";
-    };
+  fileSystems."/" = {
+    device = "/dev/disk/by-uuid/d434c90f-e135-426e-b237-ead2f44e37c6";
+    fsType = "ext4";
+  };
 
-  fileSystems."/boot/EFI" =
-    { device = "/dev/disk/by-uuid/473A-B8FD";
-      fsType = "vfat";
-      options = [ "fmask=0077" "dmask=0077" ];
-    };
-
-  swapDevices =
-    [ { device = "/dev/disk/by-uuid/e0cac471-0e32-4d5a-bf85-e8f93b304356"; }
+  fileSystems."/boot/EFI" = {
+    device = "/dev/disk/by-uuid/473A-B8FD";
+    fsType = "vfat";
+    options = [
+      "fmask=0077"
+      "dmask=0077"
     ];
+  };
+
+  swapDevices = [
+    { device = "/dev/disk/by-uuid/e0cac471-0e32-4d5a-bf85-e8f93b304356"; }
+  ];
 
   # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
   # (the default) this is the recommended approach. When using systemd-networkd it's
diff --git a/users/fish/vim/languages.nix b/users/fish/vim/languages.nix
index 6c370854799533d6388b8eb992df055f6df93b7a..d948dd1884da8b708ee20cb09db340ce269c74d5 100644
--- a/users/fish/vim/languages.nix
+++ b/users/fish/vim/languages.nix
@@ -14,7 +14,7 @@
       lua.lsp.enable = true;
       lua.lsp.lazydev.enable = true;
       python = {
-        format.type = "ruff";
+        format.type = [ "ruff" ];
       };
       markdown = {
         enable = true;
diff --git a/users/natalie/configuration.nix b/users/natalie/configuration.nix
index d15641a3c807b1615f9a971e92a0fa2e385b8d6a..625e8920549013d98afcb9560f443592ce2475e4 100644
--- a/users/natalie/configuration.nix
+++ b/users/natalie/configuration.nix
@@ -13,7 +13,7 @@
     iosevka
     nerd-fonts.symbols-only
     nerd-fonts.iosevka
-    inputs.apple-fonts.packages.${pkgs.system}.sf-pro
+    inputs.apple-fonts.packages.${pkgs.stdenv.hostPlatform.system}.sf-pro
     sketchybar-app-font
   ];
 
diff --git a/users/natalie/desktop/home.nix b/users/natalie/desktop/home.nix
index 65b4bcabdea99e9732feabd3f5c32a821af45c97..cf6d38ac1ff4064795a753843cb0db6cfd1a3145 100644
--- a/users/natalie/desktop/home.nix
+++ b/users/natalie/desktop/home.nix
@@ -25,7 +25,7 @@
       dxvk_2
       steam-run
       vulkan-tools
-      path-of-building
+      rusty-path-of-building
       wineWowPackages.stable
       winetricks
       (prismlauncher.override { gamemodeSupport = true; })
diff --git a/users/natalie/home/hyprland/plugins.nix b/users/natalie/home/hyprland/plugins.nix
index 32697739bb1b84b29123d72171c02687fe8b3acd..f1f97902c264ee65fca3a95a5d1ad7d16293cba6 100644
--- a/users/natalie/home/hyprland/plugins.nix
+++ b/users/natalie/home/hyprland/plugins.nix
@@ -2,7 +2,7 @@
 {
   wayland.windowManager.hyprland = {
     plugins = [
-      inputs.split-monitor-workspaces.packages.${pkgs.system}.split-monitor-workspaces
+      inputs.split-monitor-workspaces.packages.${pkgs.stdenv.hostPlatform.system}.split-monitor-workspaces
     ];
     settings = {
       plugin = {
diff --git a/users/natalie/home/vicinae.nix b/users/natalie/home/vicinae.nix
index 5276e4bb4a02d62e5e02631b8317a8201c571e9d..eda114a97d7e2c327fab1dc87700f53efda0a2b0 100644
--- a/users/natalie/home/vicinae.nix
+++ b/users/natalie/home/vicinae.nix
@@ -18,7 +18,7 @@
     };
 
     # extensions = [
-    #   (inputs.vicinae.mkVicinaeExtension.${pkgs.system} {
+    #   (inputs.vicinae.mkVicinaeExtension.${pkgs.stdenv.hostPlatform.system} {
     #     inherit pkgs;
     #     name = "nixpkgs search";
     #     src = pkgs.fetchFromGithub {
diff --git a/users/natalie/vim/languages.nix b/users/natalie/vim/languages.nix
index 6c370854799533d6388b8eb992df055f6df93b7a..d948dd1884da8b708ee20cb09db340ce269c74d5 100644
--- a/users/natalie/vim/languages.nix
+++ b/users/natalie/vim/languages.nix
@@ -14,7 +14,7 @@
       lua.lsp.enable = true;
       lua.lsp.lazydev.enable = true;
       python = {
-        format.type = "ruff";
+        format.type = [ "ruff" ];
       };
       markdown = {
         enable = true;