don't overlay garage and add some stable packages

flake.lock

@@ -935,22 +935,6 @@
         "type": "github"
       }
     },
-    "nixpkgs-garage": {
-      "locked": {
-        "lastModified": 1736921030,
-        "narHash": "sha256-A7knAvBOwoM5X7oNdIOKvuXYtXJpuR4O8iKHIk8EwOI=",
-        "owner": "cything",
-        "repo": "nixpkgs",
-        "rev": "97f27249297bf5fbc563014ae9d4884dee27f1e0",
-        "type": "github"
-      },
-      "original": {
-        "owner": "cything",
-        "ref": "garage-module",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
     "nixpkgs-regression": {
       "locked": {
         "lastModified": 1643052045,
@@ -1015,6 +999,22 @@
         "type": "github"
       }
     },
+    "nixpkgs-stable_4": {
+      "locked": {
+        "lastModified": 1738843498,
+        "narHash": "sha256-7x+Q4xgFj9UxZZO9aUDCR8h4vyYut4zPUvfj3i+jBHE=",
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "rev": "f5a32fa27df91dfc4b762671a0e0a859a8a0058f",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nixos",
+        "ref": "nixos-24.11",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
     "nixpkgs_2": {
       "locked": {
         "lastModified": 1730531603,
@@ -1252,7 +1252,7 @@
         "niri": "niri",
         "nix-ld": "nix-ld",
         "nixpkgs": "nixpkgs_5",
-        "nixpkgs-garage": "nixpkgs-garage",
+        "nixpkgs-stable": "nixpkgs-stable_4",
         "nixvim": "nixvim",
         "nvim-github-theme": "nvim-github-theme",
         "plasma-manager": "plasma-manager",

flake.nix

@@ -3,6 +3,7 @@
 
   inputs = {
     nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable-small";
+    nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-24.11";
     sops-nix = {
       url = "github:Mic92/sops-nix";
       inputs.nixpkgs.follows = "nixpkgs";
@@ -78,8 +79,6 @@
       inputs.home-manager.follows = "home-manager";
     };
 
-    nixpkgs-garage.url = "github:cything/nixpkgs/garage-module"; # unmerged PR
-
     nvim-github-theme = {
       url = "github:projekt0n/github-nvim-theme";
       flake = false;
@@ -158,7 +157,7 @@
               overlays = [
                 inputs.niri.overlays.niri
                 inputs.rust-overlay.overlays.default
-              ] ++ import ./overlay;
+              ] ++ (import ./overlay { inherit inputs; });
             };
           in
           {
@@ -187,14 +186,10 @@
                   modules = [
                     {
                       nixpkgs = { inherit pkgs; };
-                      disabledModules = [
-                        "services/web-servers/garage.nix"
-                      ];
                     }
                     ./hosts/chunk
                     inputs.sops-nix.nixosModules.sops
                     ./modules
-                    (inputs.nixpkgs-garage + "/nixos/modules/services/web-servers/garage.nix")
                   ];
                 };
 

home/yt/ytnix.nix

@@ -66,7 +66,6 @@
     mpv
     yt-dlp
     signal-desktop
-    azure-cli
     pavucontrol
     btop
     grim

overlay/default.nix

@@ -1,4 +1,4 @@
-let
+{ inputs }: let
   overlays = [
     ./conduwuit
     ./attic
@@ -7,3 +7,18 @@ let
   importedOverlays = map (m: import m) overlays;
 in
 importedOverlays
+++
+[
+  (final: prev:
+    let
+      pkgFrom = flake: pkg: flake.legacyPackages.${prev.system}.${pkg};
+      stable = inputs.nixpkgs-stable;
+    in
+    {
+      bitwarden-cli = pkgFrom stable "bitwarden-cli";
+      roundcube = pkgFrom stable "roundcube";
+      lldb = pkgFrom stable "lldb";
+      calibre = pkgFrom stable "calibre";
+    }
+  )
+]