4 files changed, 2 insertions, 7 deletions
diff --git a/machines/aszlig/dnyarri.nix b/machines/aszlig/dnyarri.nix
index 7e42f607..482395ee 100644
--- a/machines/aszlig/dnyarri.nix
+++ b/machines/aszlig/dnyarri.nix
@@ -63,7 +63,7 @@ in {
   # This is very ugly and I really want to avoid non-free packages on all
   # of my workstations. But right now I need to get rid of useless paper.
   nixpkgs.config.allowUnfreePredicate = pkg: let
-    inherit (builtins.parseDrvName pkg.name) name;
+    inherit (builtins.parseDrvName (pkg.name or "")) name;
   in name == "hplip";
   nixpkgs.overlays = lib.singleton (lib.const (super: {
     hplip = super.hplip.override { withPlugin = true; };
diff --git a/machines/aszlig/managed/brawndo.nix b/machines/aszlig/managed/brawndo.nix
index 0275a4e5..d08b7a3d 100644
--- a/machines/aszlig/managed/brawndo.nix
+++ b/machines/aszlig/managed/brawndo.nix
@@ -44,10 +44,7 @@ in {
 
   services = {
     deluge.enable = true;
-    printing.drivers = [ pkgs.cups-bjnp ];
-
-    xserver.synaptics.enable = true;
-    xserver.synaptics.twoFingerScroll = true;
+    printing.drivers = [ pkgs.cups-bjnp pkgs.cnijfilter2 ];
   };
 
   swapDevices = lib.singleton { label = "swap"; };
diff --git a/machines/aszlig/managed/shakti.nix b/machines/aszlig/managed/shakti.nix
index 9e7856b8..449bbe3c 100644
--- a/machines/aszlig/managed/shakti.nix
+++ b/machines/aszlig/managed/shakti.nix
@@ -65,7 +65,6 @@
   nix.maxJobs = 4;
 
   services.xserver.xkbOptions = "eurosign:e,caps:none";
-  services.xserver.libinput.enable = true;
 
   services.deluge.enable = true;
 
diff --git a/machines/aszlig/managed/tyree.nix b/machines/aszlig/managed/tyree.nix
index 151a53ef..3768f11c 100644
--- a/machines/aszlig/managed/tyree.nix
+++ b/machines/aszlig/managed/tyree.nix
@@ -62,7 +62,6 @@
 
   services.xserver.xkbOptions = "eurosign:e,caps:none";
   services.xserver.wacom.enable = true;
-  services.xserver.libinput.enable = true;
 
   vuizvui.user.aszlig.profiles.managed.enable = true;
   vuizvui.user.aszlig.profiles.managed.mainUser = "bla";