diff --git a/flake.lock b/flake.lock
index 8b63e46..a9881a7 100644
--- a/flake.lock
+++ b/flake.lock
@@ -70,11 +70,11 @@
         "nixpkgs-stable": "nixpkgs-stable"
       },
       "locked": {
-        "lastModified": 1742576675,
-        "narHash": "sha256-2JbkmTzqfb5c/zk2xM6JKHZzgN1YsxblgqucbI0P4bU=",
+        "lastModified": 1742609412,
+        "narHash": "sha256-IxX39CKe2jknL7ipiufh92z0V3WXfdpe+oHIzAqtcTs=",
         "owner": "nix-community",
         "repo": "emacs-overlay",
-        "rev": "610d71db8074a369a0498572ff75b444d284409d",
+        "rev": "724499d6305658949e21e01f5624ac429d9ab48a",
         "type": "github"
       },
       "original": {
@@ -357,11 +357,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1742569620,
-        "narHash": "sha256-igC2cu+cPRB3E4QwKR+vGagyAtoyB+DrmWwDKm8jkaw=",
+        "lastModified": 1742588233,
+        "narHash": "sha256-Fi5g8H5FXMSRqy+mU6gPG0v+C9pzjYbkkiePtz8+PpA=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "8a68f18e96bcab13e4f97bece61e6602298a3141",
+        "rev": "296ddc64627f4a6a4eb447852d7346b9dd16197d",
         "type": "github"
       },
       "original": {
@@ -1272,11 +1272,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1742406979,
-        "narHash": "sha256-r0aq70/3bmfjTP+JZs4+XV5SgmCtk1BLU4CQPWGtA7o=",
+        "lastModified": 1742595978,
+        "narHash": "sha256-05onsoMrLyXE4XleDCeLC3bXnC4nyUbKWInGwM7v6hU=",
         "owner": "Mic92",
         "repo": "sops-nix",
-        "rev": "1770be8ad89e41f1ed5a60ce628dd10877cb3609",
+        "rev": "b7756921b002de60fb66782effad3ce8bdb5b25d",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
index e4a9e55..7398a6c 100644
--- a/flake.nix
+++ b/flake.nix
@@ -111,6 +111,8 @@
       inherit (nixpkgs.lib) genAttrs replaceStrings;
       inherit (nixpkgs.lib.filesystem) packagesFromDirectoryRecursive listFilesRecursive;
 
+      sys = "x86_64-linux";
+
       forAllSystems =
         function:
         genAttrs [
@@ -122,9 +124,20 @@
       configArgs = {
         inherit inputs;
         nix-config = self;
-        pkgs-stable = inputs.nixpkgs-stable {
-          config.allowUnfree = true;
-        };
+        pkgs-stable = inputs.nixpkgs-stable.legacyPackages.${sys};
+      };
+
+      baseHomeModules = [
+        inputs.nix-flatpak.homeManagerModules.nix-flatpak
+        inputs.sops-nix.homeManagerModules.sops
+      ];
+
+      baseHomeManager = {
+        useGlobalPkgs = true;
+        useUserPackages = true;
+        backupFileExtension = "bak";
+        sharedModules = baseHomeModules;
+        extraSpecialArgs = configArgs;
       };
 
     in
@@ -154,7 +167,7 @@
 
       nixosConfigurations = {
         eddie = nixpkgs.lib.nixosSystem {
-          system = "x86_64-linux";
+          system = sys;
           specialArgs = configArgs;
           modules = [
             inputs.musnix.nixosModules.musnix
@@ -165,22 +178,7 @@
             ./hosts/eddie/configuration.nix
 
             {
-              home-manager = {
-                useGlobalPkgs = true;
-                useUserPackages = true;
-                backupFileExtension = "bak";
-                sharedModules = [
-                  inputs.nix-flatpak.homeManagerModules.nix-flatpak
-                  inputs.sops-nix.homeManagerModules.sops
-                ];
-                extraSpecialArgs = {
-                  inherit inputs;
-                  nix-config = self;
-                  pkgs-stable = inputs.nixpkgs-stable {
-                    config.allowUnfree = true;
-                  };
-
-                };
+              home-manager = baseHomeManager // {
                 users.emenel = import ./homes/emenel/default.nix;
               };
             }
@@ -188,7 +186,7 @@
         };
 
         media-server = nixpkgs.lib.nixosSystem {
-          system = "x86_64-linux";
+          system = sys;
           specialArgs = configArgs;
           modules = [
             home-manager.nixosModules.home-manager
@@ -198,22 +196,7 @@
             ./hosts/media-server/configuration.nix
 
             {
-              home-manager = {
-                useGlobalPkgs = true;
-                useUserPackages = true;
-                backupFileExtension = "bak";
-                sharedModules = [
-                  inputs.nix-flatpak.homeManagerModules.nix-flatpak
-                  inputs.sops-nix.homeManagerModules.sops
-                ];
-                extraSpecialArgs = {
-                  inherit inputs;
-                  nix-config = self;
-                  pkgs-stable = inputs.nixpkgs-stable {
-                    config.allowUnfree = true;
-                  };
-
-                };
+              home-manager = baseHomeManager // {
                 users.media = import ./homes/media/default.nix;
               };
             }
diff --git a/modules/home/langs.nix b/modules/home/langs.nix
index 834db3e..12a5d72 100644
--- a/modules/home/langs.nix
+++ b/modules/home/langs.nix
@@ -1,4 +1,4 @@
-{ nix-config, pkgs, ... }:
+{ pkgs-stable, pkgs, ... }:
 
 {
   home.packages = with pkgs; [
@@ -47,7 +47,7 @@
     ccls
     vscode-langservers-extracted
     java-language-server
-    nix-config.pkgs-stable.javascript-typescript-langserver
+    pkgs-stable.javascript-typescript-langserver
     haskell-language-server
     cmake-language-server
     stylelint-lsp