diff --git a/hosts/laptop/configuration.nix b/hosts/laptop/configuration.nix
index bf732ef..9a14dd5 100644
--- a/hosts/laptop/configuration.nix
+++ b/hosts/laptop/configuration.nix
@@ -69,13 +69,6 @@ in
 
   boot.supportedFilesystems = [ "ntfs" ]; 
 
-  # btrfs options
-  fileSystems = {
-    "/".options = [ "compress=zstd" ];
-    "/home".options = [ "compress=zstd" ];
-    "/nix".options = [ "compress=zstd" "noatime" ];
-  };
-
   boot.kernel.sysctl."kernel.sysrq" = 244;
 
   boot.plymouth = {
@@ -180,8 +173,18 @@ in
 
   programs.gamemode.enable = true;
 
-  # VirtualBox
+  # Virtualisation
   virtualisation.docker.enable = true;
+  
+  virtualisation.containers.enable = true;
+  virtualisation = {
+    podman = {
+      enable = true;
+      dockerCompat = false;
+      defaultNetwork.settings.dns_enabled = true;
+    };
+  };
+
   virtualisation.waydroid.enable = true;
   virtualisation.virtualbox.host.enable = true;
   virtualisation.virtualbox.host.package = pkgs.virtualbox;
@@ -326,7 +329,7 @@ in
   users.users.lgm = {
     isNormalUser = true;
     description = "lgm";
-    extraGroups = [ "networkmanager" "wheel" "adbusers" "docker" "wireshark"];
+    extraGroups = [ "networkmanager" "wheel" "adbusers" "docker" "podman" "wireshark"];
     shell = pkgs.fish;
   };
 
@@ -388,6 +391,8 @@ in
 
     kdiskmark
 
+    podman-compose
+
     (let base = pkgs.appimageTools.defaultFhsEnvArgs; in
       pkgs.buildFHSEnv (base // {
       name = "fhs";
diff --git a/hosts/laptop/hardware-configuration.nix b/hosts/laptop/hardware-configuration.nix
index 848ea97..8b69dbb 100644
--- a/hosts/laptop/hardware-configuration.nix
+++ b/hosts/laptop/hardware-configuration.nix
@@ -21,19 +21,25 @@ in
   fileSystems."/" =
     { device = root;
       fsType = "btrfs";
-      options = [ "subvol=root" ];
+      options = [ "compress=zstd" "subvol=root" ];
     };
 
   fileSystems."/nix" =
     { device = root;
       fsType = "btrfs";
-      options = [ "subvol=nix" ];
+      options = [ "compress=zstd" "noatime" "subvol=nix" ];
     };
 
   fileSystems."/home" =
     { device = root;
       fsType = "btrfs";
-      options = [ "subvol=home" ];
+      options = [ "compress=zstd" "subvol=home" ];
+    };
+
+  fileSystems."/steamlibrary" =
+    { device = root;
+      fsType = "btrfs";
+      options = [ "compress=zstd" "subvol=steamlibrary" ];
     };
 
   fileSystems."/boot" =
diff --git a/hosts/laptop/home/default.nix b/hosts/laptop/home/default.nix
index 14df2e9..0b6163b 100644
--- a/hosts/laptop/home/default.nix
+++ b/hosts/laptop/home/default.nix
@@ -181,23 +181,6 @@
     monero-gui
   ];
 
-
-  systemd.user.services.app-input-leap-client = {
-    Unit = {
-      Description = "input-leap client";
-      After = [ "graphical-session-pre.target" "network.target" ];
-      PartOf = [ "graphical-session.target" ];
-    };
-    Service = {
-      Type = "simple";
-      ExecStart = "${pkgs.input-leap}/bin/input-leapc -f --debug DEBUG --name lgm-nixos --disable-crypto [wandering-nomad.lan]:24800";
-      Restart = "always";
-    };
-    Install = {
-      WantedBy = [ "graphical-session.target" ];
-    };
-  };
-
   # Email stuff
 
   programs.thunderbird = {
diff --git a/hosts/laptop/mounts.nix b/hosts/laptop/mounts.nix
index b3ad404..273b946 100644
--- a/hosts/laptop/mounts.nix
+++ b/hosts/laptop/mounts.nix
@@ -13,21 +13,4 @@
       options = "defaults,exec,noauto,prealloc,uid=1000,gid=100";
     }
   ];
-
-  systemd.automounts =  [
-    {
-      where = "/mounts/my_data";
-      wantedBy = ["multi-user.target"];
-      automountConfig = {
-        TimeoutIdleSec = 901;
-      };
-    }
-    {
-      where = "/mounts/windows";
-      wantedBy = ["multi-user.target"];
-      automountConfig = {
-        TimeoutIdleSec = 901;
-      };
-    }
-  ];
 }
diff --git a/hosts/vps1/configuration.nix b/hosts/vps1/configuration.nix
index b9e0afd..5f53599 100644
--- a/hosts/vps1/configuration.nix
+++ b/hosts/vps1/configuration.nix
@@ -150,6 +150,8 @@ in
     vim
     tmux
     sops
+    podman-compose
+    gnumake
   ];
   
   users.users.lgm = {