diff --git a/flake.lock b/flake.lock
index 051ccc7..5ec518a 100644
--- a/flake.lock
+++ b/flake.lock
@@ -452,16 +452,16 @@
         "nixpkgs-regression": "nixpkgs-regression"
       },
       "locked": {
-        "lastModified": 1740601978,
-        "narHash": "sha256-b70oopwDPaHiddorJIvI8H50yTXOd04noGZVp3YPHbM=",
+        "lastModified": 1742837300,
+        "narHash": "sha256-pidBRgonX1k7NJ1K8ML0rX1WWrAuYlGmQWz2xKXyEFY=",
         "owner": "NixOS",
         "repo": "nix",
-        "rev": "31923aaac0358336442244ec6baf8f6517463afd",
+        "rev": "5a4e306cc5853922b292525ed23c59ba07f9d243",
         "type": "github"
       },
       "original": {
         "owner": "NixOS",
-        "ref": "31923aaac0358336442244ec6baf8f6517463afd",
+        "ref": "5a4e306cc5853922b292525ed23c59ba07f9d243",
         "repo": "nix",
         "type": "github"
       }
diff --git a/flake.nix b/flake.nix
index 444672d..7e3410e 100644
--- a/flake.nix
+++ b/flake.nix
@@ -24,7 +24,7 @@
       type = "github";
       owner = "NixOS";
       repo = "nix";
-      ref = "31923aaac0358336442244ec6baf8f6517463afd";
+      ref = "5a4e306cc5853922b292525ed23c59ba07f9d243";
       inputs.nixpkgs.follows = "stable";
     };
     #other
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/DE/xfce.nix b/nixosModules/DE/xfce.nix
index fb941c8..57fafbf 100644
--- a/nixosModules/DE/xfce.nix
+++ b/nixosModules/DE/xfce.nix
@@ -8,11 +8,13 @@
 
   config = lib.mkIf config.local.DE.xfce.enable {
     environment.systemPackages = [ pkgs.xfce.xfce4-whiskermenu-plugin ];
-    services.xserver = {
-      enable = true;
-      desktopManager.xfce = {
+    services = {
+      xserver = {
         enable = true;
-        enableScreensaver = true;
+        desktopManager.xfce = {
+          enable = true;
+          enableScreensaver = true;
+        };
       };
       displayManager.defaultSession = "xfce";
     };
diff --git a/nixosModules/builders.nix b/nixosModules/builders.nix
index f28ace1..6e532bc 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 = lib.mkForce [ "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..7db00c4 100644
--- a/nixosModules/nix.nix
+++ b/nixosModules/nix.nix
@@ -31,8 +31,9 @@
     # Other nix settings
     #
     settings = {
-      substituters = [
-        "https://nix-community.cachix.org"
+      substituters = lib.mkForce [
+        "https://cache.nixos.org?priority=2"
+        "https://nix-community.cachix.org?priority=3"
       ];
       trusted-public-keys = [
         "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="