diff --git a/common/default.nix b/common/default.nix
index 592ee9f..a52e5d7 100644
--- a/common/default.nix
+++ b/common/default.nix
@@ -15,6 +15,9 @@
 
   networking.useDHCP = false;
 
+  networking.firewall.enable = true;
+  networking.firewall.allowPing = true;
+
   time.timeZone = "America/New_York";
   i18n.defaultLocale = "en_US.UTF-8";
 
@@ -34,6 +37,8 @@
     usbutils
     killall
     screen
+    micro
+    helix
   ];
 
   nixpkgs.config.allowUnfree = true;
@@ -43,12 +48,15 @@
     isNormalUser = true;
     extraGroups = [
       "wheel"
-      "dialout"
+      "dialout" # serial
     ];
+    shell = pkgs.fish;
     openssh.authorizedKeys.keys = (import ./ssh.nix).users;
     hashedPassword = "$6$TuDO46rILr$gkPUuLKZe3psexhs8WFZMpzgEBGksE.c3Tjh1f8sD0KMC4oV89K2pqAABfl.Lpxu2jVdr5bgvR5cWnZRnji/r/";
   };
   nix.trustedUsers = [ "root" "googlebot" ];
 
   nix.gc.automatic = true;
+
+  programs.fish.enable = true;
 }
diff --git a/common/pc/chromium.nix b/common/pc/chromium.nix
index 2c54494..16f42f6 100644
--- a/common/pc/chromium.nix
+++ b/common/pc/chromium.nix
@@ -83,6 +83,7 @@ in {
         enableWideVine = true;
         # ungoogled = true;
         # --enable-native-gpu-memory-buffers # fails on AMD APU
+        # --enable-webrtc-vp9-support
         commandLineArgs = "--use-vulkan --use-gl=desktop --enable-zero-copy --enable-hardware-overlays --enable-features=VaapiVideoDecoder,CanvasOopRasterization --ignore-gpu-blocklist --enable-accelerated-mjpeg-decode --enable-accelerated-video  --enable-gpu-rasterization";
       };
     };
diff --git a/common/pc/default.nix b/common/pc/default.nix
index 4de91fb..cfe34bd 100644
--- a/common/pc/default.nix
+++ b/common/pc/default.nix
@@ -47,6 +47,7 @@ in {
       lm_sensors
       libreoffice-fresh
       thunderbird
+      spotifyd
       spotify-qt
       arduino
       yt-dlp
diff --git a/machines/liza/configuration.nix b/machines/liza/configuration.nix
index 7e9c9d0..8824ed7 100644
--- a/machines/liza/configuration.nix
+++ b/machines/liza/configuration.nix
@@ -264,6 +264,7 @@ in {
       "george@runyan.org"
       "joslyn@runyan.org"
       "damon@runyan.org"
+      "jonas@runyan.org"
     ];
     certificateScheme = 3; # use let's encrypt for certs
   };
diff --git a/machines/ray/configuration.nix b/machines/ray/configuration.nix
index a5b143d..726b372 100644
--- a/machines/ray/configuration.nix
+++ b/machines/ray/configuration.nix
@@ -47,12 +47,6 @@
   };
 
 
-  services.archivebox = {
-    enable = false;
-    hostname = "localhost";
-    publicCreateSnapshots = true;
-  };
-
   virtualisation.docker.enable = true;
 
   services.zerotierone.enable = true;
diff --git a/machines/storage/s0/configuration.nix b/machines/storage/s0/configuration.nix
index 5d60a7b..d73db84 100644
--- a/machines/storage/s0/configuration.nix
+++ b/machines/storage/s0/configuration.nix
@@ -12,16 +12,9 @@
 
   networking.hostName = "s0";
 
-  boot.initrd.luks.devices."enc-pv" = {
-    device = "/dev/disk/by-uuid/96b216e1-071b-4c02-899e-29e2eeced7a8";
-    allowDiscards = true;
-  };
-
   boot.loader.grub.enable = false;
   boot.loader.generic-extlinux-compatible.enable = true;
 
-  networking.interfaces.eth0.useDHCP = true;
-
   system.autoUpgrade.enable = true;
 
   boot.supportedFilesystems = [ "bcachefs" ];
@@ -33,6 +26,4 @@
   users.users.googlebot.packages = with pkgs; [
     bcachefs-tools
   ];
-
-  zramSwap.enable = true;
 }