diff --git a/nixosConfigurations/gerg-desktop/main.nix b/nixosConfigurations/gerg-desktop/main.nix
index 6221e67..2e823f6 100644
--- a/nixosConfigurations/gerg-desktop/main.nix
+++ b/nixosConfigurations/gerg-desktop/main.nix
@@ -28,7 +28,7 @@
         qbittorrent # steal stuff
         pavucontrol # gui volume control
         pcmanfm # file manager
-        vlc # play stuff
+        mpv # play stuff
         ripgrep
         fd
         jq
diff --git a/nixosConfigurations/media-laptop/main.nix b/nixosConfigurations/media-laptop/main.nix
index 0e0c909..485c4a6 100644
--- a/nixosConfigurations/media-laptop/main.nix
+++ b/nixosConfigurations/media-laptop/main.nix
@@ -15,26 +15,29 @@
     };
     packages = {
       inherit (pkgs)
-        vlc
+        mpv
         pavucontrol # gui volume control
-        chromium
+        librewolf
         ;
       inherit (nvim-flake.packages) neovim;
     };
   };
 
-  services.xserver.videoDrivers = [ "modesetting" ];
+  services = {
+    xserver.videoDrivers = [ "modesetting" ];
+    displayManager.autoLogin = {
+      enable = true;
+      user = "media";
+    };
+    openssh.settings.PermitRootLogin = lib.mkForce "prohibit-password";
+  };
 
-  networking.networkmanager.enable = true;
-
-  boot.kernelPackages = pkgs.linuxPackages_latest;
+  networking = {
+    networkmanager.enable = true;
+    hostName = "media-laptop";
+  };
 
   sops.secrets.root.neededForUsers = true;
-
-  services.displayManager.autoLogin = {
-    enable = true;
-    user = "media";
-  };
   users = {
     mutableUsers = false;
     users = {
@@ -53,8 +56,9 @@
       };
     };
   };
-  services.openssh.settings.PermitRootLogin = lib.mkForce "prohibit-password";
+
   boot = {
+    kernelPackages = pkgs.linuxPackages_latest;
     initrd.availableKernelModules = [
       "xhci-pci"
       "ehci-pci"
@@ -66,19 +70,19 @@
     ];
     kernelModules = [ "kvm-intel" ];
   };
+
   systemd.user.tmpfiles.users.media.rules = [
-    "L+ %h/Desktop/chromium-browser.desktop - - - - ${pkgs.chromium}/share/applications/chromium-browser.desktop"
-    "L+ %h/Desktop/vlc.desktop - - - - ${pkgs.vlc}/share/applications/vlc.desktop"
+    "L+ %h/Desktop/librewolf.desktop - - - - ${pkgs.librewolf}/share/applications/librewolf.desktop"
   ];
 
-  system.stateVersion = "24.11";
-  networking.hostName = "media-laptop";
-  nixpkgs.hostPlatform = "x86_64-linux";
-
+  # Reformat at some point
   swapDevices = [
     {
       device = "/swapfile";
       size = 8 * 1024;
     }
   ];
+
+  system.stateVersion = "24.11";
+  nixpkgs.hostPlatform = "x86_64-linux";
 }
diff --git a/nixosModules/builders.nix b/nixosModules/builders.nix
index f28ace1..e522c25 100644
--- a/nixosModules/builders.nix
+++ b/nixosModules/builders.nix
@@ -10,7 +10,7 @@
           keep-derivations = false;
           builders-use-substitutes = true;
           max-jobs = 0;
-          substituters = [ "https://cache.gerg-l.com" ];
+          substituters = [ "https://cache.gerg-l.com?priority=-1&compression=zstd" ];
           trusted-public-keys = [ "cache.gerg-l.com:6p1+h6jQnb1MOt3ra3PlQpfgEEF4zRrQWiEuAqcjBj8=" ];
         };
         distributedBuilds = true;
diff --git a/nixosModules/nix.nix b/nixosModules/nix.nix
index a7c3e6e..6b2d7d1 100644
--- a/nixosModules/nix.nix
+++ b/nixosModules/nix.nix
@@ -32,7 +32,7 @@
     #
     settings = {
       substituters = [
-        "https://nix-community.cachix.org"
+        "https://nix-community.cachix.org?priority=10"
       ];
       trusted-public-keys = [
         "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="