diff --git a/flake.nix b/flake.nix
index 5c693bb..d9e89ef 100644
--- a/flake.nix
+++ b/flake.nix
@@ -158,8 +158,6 @@
       linuxGuiModuleSet = [
         nix-flatpak.nixosModules.nix-flatpak
 
-        ./nixos/dotfiles/vscode.nix
-
         ./nixos/packages/gui.nix
         ./nixos/packages/wine.nix
         ./nixos/packages/flatpak.nix
diff --git a/nixos/configs/gui/default.nix b/nixos/configs/gui/default.nix
index 6c260db..8293d9d 100644
--- a/nixos/configs/gui/default.nix
+++ b/nixos/configs/gui/default.nix
@@ -168,7 +168,7 @@ UseIn=niri'')
   services.power-profiles-daemon.enable = lib.mkForce false;
 
   # Enable sound with pipewire.
-  hardware.pulseaudio.enable = false;
+  services.pulseaudio.enable = false;
   security.rtkit.enable = true;
   services.pipewire = {
     enable = true;
diff --git a/nixos/configs/gui/mako.nix b/nixos/configs/gui/mako.nix
index 7569819..215ef04 100644
--- a/nixos/configs/gui/mako.nix
+++ b/nixos/configs/gui/mako.nix
@@ -16,8 +16,10 @@
         enable = true;
         defaultTimeout = 10000;
 
-        width = 400;
-        height = 200;
+        settings = {
+          width = 400;
+          height = 200;
+        };
       };
 
     };
diff --git a/nixos/configs/gui/niri.nix b/nixos/configs/gui/niri.nix
index 285cd67..2bbf697 100644
--- a/nixos/configs/gui/niri.nix
+++ b/nixos/configs/gui/niri.nix
@@ -146,7 +146,7 @@ in
         input = {
 
           # Moving focus with the keyboard should move the mouse.
-          warp-mouse-to-focus = true;
+          warp-mouse-to-focus.enable = true;
 
           touchpad = {
 
diff --git a/nixos/configs/udev.nix b/nixos/configs/udev.nix
index b843f77..d509231 100644
--- a/nixos/configs/udev.nix
+++ b/nixos/configs/udev.nix
@@ -18,7 +18,7 @@
 
     extraRules = ''
       # Brother p-touch cube
-      SUBSYSTEM == "usb", ATTRS{idVendor} == "04f9", ATTRS{idProduct} == "20af", MODE = "0666"
+      SUBSYSTEM == "usb", ATTRS{idVendor} == "04f9", ATTRS{idProduct} == "20af", GROUP="plugdev", TAG+="uaccess"
 
       # If we have a Apple T2 VHCI, force it to re-start once things are more up.
       # This forces a re-enumeration of the connected devices, and thus makes things like the touch bar work reliably.
@@ -27,6 +27,9 @@
       # Digilent waveforms
       ACTION=="add", ATTR{idVendor}=="1443", GROUP="plugdev", TAG+="uaccess"
       ACTION=="add", ATTR{idVendor}=="0403", ATTR{manufacturer}=="Digilent", GROUP="plugdev", TAG+="uaccess", RUN+="${waveforms.adept2-runtime}/sbin/dftdrvdtch %s{busnum} %s{devnum}"
+
+      # LibreVNA
+      SUBSYSTEM == "usb", ATTRS{idVendor} == "1209", ATTRS{idProduct} == "4121", GROUP="plugdev", TAG+="uaccess"
     '';
 
   };
diff --git a/nixos/packages/default.pkgs.nix b/nixos/packages/default.pkgs.nix
index 8d082e9..012371d 100644
--- a/nixos/packages/default.pkgs.nix
+++ b/nixos/packages/default.pkgs.nix
@@ -125,7 +125,6 @@ with pkgs;
   unzip
   unar
   unrar
-  deprekages.vja
   wget
   wireshark-cli
   zellij
diff --git a/packages/oxfs.nix b/packages/oxfs.nix
index 936ea77..16bc464 100644
--- a/packages/oxfs.nix
+++ b/packages/oxfs.nix
@@ -12,6 +12,9 @@ python3Packages.buildPythonApplication rec {
   pname = "oxfs";
   version = "0.5.5";
 
+  pyproject = true;
+  build-system = [ python3Packages.setuptools ];
+
   src = fetchPypi {
     inherit pname version;
     hash = "sha256-iHtUfrf91vr5UOn5vr6679OsGh5xipgbCeCRxluf9Pc=";
diff --git a/packages/svd2py.nix b/packages/svd2py.nix
index c046226..f04a0d7 100644
--- a/packages/svd2py.nix
+++ b/packages/svd2py.nix
@@ -6,7 +6,9 @@
 python3Packages.buildPythonPackage rec {
   pname = "svd2py";
   version = "1.0.2";
-  format = "pyproject";
+
+  pyproject = true;
+  build-system = [ python3Packages.setuptools ];
 
   src = fetchPypi {
     inherit pname version;
diff --git a/packages/xonsh-python-package.nix b/packages/xonsh-python-package.nix
index 15a5592..6aa8a1e 100644
--- a/packages/xonsh-python-package.nix
+++ b/packages/xonsh-python-package.nix
@@ -11,7 +11,10 @@
 python3Packages.buildPythonPackage rec {
   pname = "xonsh";
   version = xonsh.version;
-  format = "pyproject";
+
+  pyproject = true;
+  build-system = [ python3Packages.setuptools ];
+  format = null;
 
   src = fetchFromGitHub {
     owner = pname;
diff --git a/packages/xontrib-prompt-bar.nix b/packages/xontrib-prompt-bar.nix
index effac38..ba3ecbe 100644
--- a/packages/xontrib-prompt-bar.nix
+++ b/packages/xontrib-prompt-bar.nix
@@ -13,7 +13,9 @@ let
 in python3Packages.buildPythonPackage rec {
   pname = "xontrib_prompt_bar";
   version = "0.5.8";
-  format = "pyproject";
+
+  pyproject = true;
+  build-system = [ python3Packages.setuptools ];
 
   src = fetchPypi {
     inherit pname version;
diff --git a/packages/xontrib-sh.nix b/packages/xontrib-sh.nix
index 32e744e..86c2fb6 100644
--- a/packages/xontrib-sh.nix
+++ b/packages/xontrib-sh.nix
@@ -3,7 +3,7 @@
 #
 # vim: et:ts=2:sw=2:
 #
-{ 
+{
   lib,
   callPackage,
   fetchPypi,
@@ -20,6 +20,9 @@ in python3Packages.buildPythonPackage rec {
   pname = "xontrib_sh";
   version = "0.3.1";
 
+  pyproject = true;
+  build-system = [ python3Packages.setuptools ];
+
   src = fetchPypi {
     inherit pname version;
     hash = "sha256-qIr/VKCdcSBrtz/4ttpxV2i/4D9t3hw1D0AuzGA9DMk=";