updates and workarounds, as usual~

flake.nix

@@ -153,7 +153,6 @@
 
       # Modules for Linux machines with Wayland GUIs.
       linuxGuiModuleSet = [
-        waveforms.nixosModule
         nix-flatpak.nixosModules.nix-flatpak
 
         ./nixos/dotfiles/vscode.nix
@@ -223,6 +222,7 @@
           esp-dev = esp-dev.outputs.packages.${system};
           lix = lix.outputs.packages.${system};
           talon = talon.outputs.packages.${system};
+          waveforms = waveforms.outputs.packages.${system};
 
           # Helper to convert hm modules into NixOS or nix-on-droid modules.
           callHm = module: (specialArgs: (import module) specialArgs);

nixos/configs/udev.nix

@@ -3,7 +3,7 @@
 #
 # vim: et:ts=2:sw=2:
 #
-{ deprekages, pkgs, ... }:
+{ deprekages, pkgs, waveforms, ... }:
 {
   services.udev = {
 
@@ -23,6 +23,10 @@
       # 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.
       ACTION=="add", SUBSYSTEM=="usb", ATTR{serial}=="bce-vhci", ATTR{authorized}=="1", ATTR{authorized}="0", ATTR{authorized}="1"
+
+      # 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}"
     '';
 
   };

nixos/configuration.linux.nix

@@ -92,6 +92,7 @@
   #
   services.pcscd.enable = true;
   services.openssh.enable = true;
+  services.mullvad-vpn.enable = true;
   virtualisation.docker.enable = true;
 
   services.udev.packages = [

nixos/packages/default.pkgs.nix

@@ -199,6 +199,9 @@ with pkgs;
       evtest
       libinput
 
+      # Networking
+      mullvad-vpn
+
     ]
   else
     [ ]

nixos/packages/gui.pkgs.nix

@@ -8,6 +8,7 @@
   pkgs,
   deprekages,
   niri,
+  waveforms,
   ...
 }:
 let
@@ -61,7 +62,7 @@ with pkgs;
   krita
   xournalpp
   kdePackages.itinerary
-  deprekages.notion-app
+  #deprekages.notion-app
 
   # PDFs.
   (zathuraPkgs.override { useMupdf = false; }).zathuraWrapper
@@ -137,6 +138,7 @@ with pkgs;
       imhex
       gimp
       deluge
+      waveforms.waveforms
 
       # System utilities.
       nemo-with-extensions