flake update

Signed-off-by: cy <cy@cy7.sh>

flake.lock

@@ -120,11 +120,11 @@
         "rocksdb": "rocksdb"
       },
       "locked": {
-        "lastModified": 1739050686,
-        "narHash": "sha256-j3Gx6ntsPcvccmdQl/BcDpXAM1jiDZ7HPBB+dLCCaBs=",
+        "lastModified": 1739114248,
+        "narHash": "sha256-Etzh7m1aZBwKfcS6sa+2zBzdOaZSR+yFn2pwwGTilb4=",
         "owner": "girlbossceo",
         "repo": "conduwuit",
-        "rev": "3b0d965a21b99e2ca554b9e84754a97dff83bb8b",
+        "rev": "b6e9dc3d98704c56027219d3775336910a0136c6",
         "type": "github"
       },
       "original": {
@@ -683,11 +683,11 @@
         "pre-commit-hooks": "pre-commit-hooks"
       },
       "locked": {
-        "lastModified": 1739022633,
-        "narHash": "sha256-CaXRW9kDAcf1QIxjOF5ffMW0JkZWSrNv0QGBvd26EkY=",
+        "lastModified": 1739035579,
+        "narHash": "sha256-Zc7KAA3iC5Ak9reV/peqELKXJn6rLcSZptq1Tzcx9Nc=",
         "ref": "refs/heads/main",
-        "rev": "b60314f32eb02417463392b6276d456ad853ccc5",
-        "revCount": 17381,
+        "rev": "132d11c2d85425b7d23785ec306acb9b1d1ddba6",
+        "revCount": 17397,
         "type": "git",
         "url": "https://git.lix.systems/lix-project/lix"
       },
@@ -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,
@@ -1102,11 +1102,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1738966895,
-        "narHash": "sha256-OXOh35rTEnFSO4vj/SDMIlDvFPGW0ba1XhZkfx+AlL0=",
+        "lastModified": 1739121491,
+        "narHash": "sha256-BEmyAozR3Pc2qwPtC4rgUglzi3cw4nv4fXEY23NxOrQ=",
         "owner": "nix-community",
         "repo": "nixvim",
-        "rev": "e7f20a602f6e08a70045f36c531bc44ba1baed07",
+        "rev": "13341a4c1238b7974e7bad9c7a6d5c51ca3cf81a",
         "type": "github"
       },
       "original": {
@@ -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

@@ -116,11 +116,13 @@
     sccache
     awscli2
     lldb
-    (cutter.withPlugins (p: with p; [
+    (cutter.withPlugins (
+      p: with p; [
         rz-ghidra
         jsdec
         sigdb
-    ]))
+      ]
+    ))
     ida-free
     patchelf
     radare2

hosts/ytnix/default.nix

@@ -337,7 +337,10 @@
     enable = true;
     wlr.enable = true;
     xdgOpenUsePortal = true;
-    extraPortals = with pkgs; [ xdg-desktop-portal-gtk xdg-desktop-portal-gnome ];
+    extraPortals = with pkgs; [
+      xdg-desktop-portal-gtk
+      xdg-desktop-portal-gnome
+    ];
   };
 
   programs.obs-studio = {

modules/roundcube.nix

@@ -1,4 +1,9 @@
-{ config, lib, pkgs, ... }:
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
 let
   cfg = config.my.roundcube;
   fpm = config.services.phpfpm.pools.roundcube;
@@ -13,12 +18,14 @@ in
     services.roundcube = {
       enable = true;
       configureNginx = false;
-      package = pkgs.roundcube.withPlugins (p: with p; [
+      package = pkgs.roundcube.withPlugins (
+        p: with p; [
           persistent_login
           contextmenu
           custom_from
           thunderbird_labels
-      ]);
+        ]
+      );
       plugins = [
         "persistent_login"
         "contextmenu"

overlay/default.nix

@@ -1,3 +1,4 @@
+{ inputs }:
 let
   overlays = [
     ./conduwuit
@@ -7,3 +8,16 @@ 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";
+    }
+  )
+]