chore(deps): lock file maintenance

flake.lock

@@ -303,11 +303,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1744440957,
+        "lastModified": 1745487689,
-        "narHash": "sha256-FHlSkNqFmPxPJvy+6fNLaNeWnF1lZSgqVCl/eWaJRc4=",
+        "narHash": "sha256-FQoi3R0NjQeBAsEOo49b5tbDPcJSMWc3QhhaIi9eddw=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "26d499fc9f1d567283d5d56fcf367edd815dba1d",
+        "rev": "5630cf13cceac06cefe9fc607e8dfa8fb342dde3",
         "type": "github"
       },
       "original": {
@@ -319,11 +319,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1744536153,
+        "lastModified": 1745377448,
-        "narHash": "sha256-awS2zRgF4uTwrOKwwiJcByDzDOdo3Q1rPZbiHQg/N38=",
+        "narHash": "sha256-jhZDfXVKdD7TSEGgzFJQvEEZ2K65UMiqW5YJ2aIqxMA=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "18dd725c29603f582cf1900e0d25f9f1063dbf11",
+        "rev": "507b63021ada5fee621b6ca371c4fca9ca46f52c",
         "type": "github"
       },
       "original": {
@@ -342,11 +342,11 @@
         "nuschtosSearch": []
       },
       "locked": {
-        "lastModified": 1745244491,
+        "lastModified": 1745518054,
-        "narHash": "sha256-UlwXkytxGW/aokB9fZ6cSznYKM9ynDLHqhjcPve0KL4=",
+        "narHash": "sha256-jaYDGY/7Uja1/HRvogrvvfIdKKl600kI/fxPdQ3PcUw=",
         "owner": "nix-community",
         "repo": "nixvim",
-        "rev": "7a58109958d14bcece8ec3e2085e41ea3351e387",
+        "rev": "e6e536953580a956c143fc4413e8d9b4c876aeb8",
         "type": "github"
       },
       "original": {

modules/hm/options.nix

@@ -1,8 +1,7 @@
 { lib, pkgs, ... }@attrs:
 let
-  inherit (lib) types;
-  inherit (import ../lib.nix { inherit lib; }) mkExtraPackagesOption;
   osConfig = attrs.osConfig or null;
+  inherit (lib) types;
   fromOs =
     let
       get =
@@ -12,6 +11,22 @@ let
     path: default: if osConfig == null then default else get path osConfig;
   fromConfig = path: default: fromOs ([ "jconfig" ] ++ path) default;
 
+  mkExtraPackagesOption =
+    name: defaultPkgsPath:
+    let
+      text = lib.strings.concatMapStringsSep " " (
+        pkgPath: "pkgs." + (lib.strings.concatStringsSep "." pkgPath)
+      ) defaultPkgsPath;
+      defaultText = lib.literalExpression "[ ${text} ]";
+      default = builtins.map (pkgPath: lib.attrsets.getAttrFromPath pkgPath pkgs) defaultPkgsPath;
+    in
+    lib.mkOption {
+      description = "Extra ${name} Packages.";
+      type = types.listOf types.package;
+      inherit default defaultText;
+      example = [ ];
+    };
+
   identity.options = {
     email = lib.mkOption {
       description = "Primary email address";

modules/lib.nix

@@ -1,4 +1,7 @@
 { lib }:
+let
+  inherit (lib) types;
+in
 {
   # Like mkEnableOption but defaults to true
   mkDisableOption =
@@ -17,31 +20,8 @@
     }:
     lib.mkOption {
       inherit description;
-      type = lib.types.path;
+      type = types.path;
       default = builtins.fetchurl { inherit url sha256; };
       defaultText = lib.literalMD "![${description}](${url})";
     };
-  # Like `lib.mkEnableOption` but default to disabled
-  mkDisableOption =
-    desc:
-    lib.mkEnableOption desc
-    // {
-      default = true;
-      example = false;
-    };
-  # Like `lib.mkPackageOption` but for a list of packages.
-  mkExtraPackagesOption =
-    name: defaultPkgsPath:
-    let
-      text = lib.strings.concatMapStringsSep " " (
-        pkgPath: "pkgs." + (lib.strings.concatStringsSep "." pkgPath)
-      ) defaultPkgsPath;
-    in
-    lib.mkOption {
-      description = "Extra ${name} Packages.";
-      type = lib.types.listOf lib.types.package;
-      default = builtins.map (pkgPath: lib.attrsets.getAttrFromPath pkgPath pkgs) defaultPkgsPath;
-      defaultText = lib.literalExpression "[ ${text} ]";
-      example = [ ];
-    };
 }

modules/nixvim/options.nix

@@ -1,7 +1,13 @@
 { lib, ... }:
 let
   inherit (lib) mkEnableOption mkOption types;
-  inherit (import ../lib.nix { inherit lib; }) mkDisableOption;
+  mkDisableOption =
+    desc:
+    mkEnableOption desc
+    // {
+      default = true;
+      example = false;
+    };
 in
 {
   options.jhome.nvim = {

scripts/jpassmenu/Cargo.lock

@@ -293,9 +293,9 @@ checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf"
 
 [[package]]
 name = "jiff"
-version = "0.2.9"
+version = "0.2.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "59ec30f7142be6fe14e1b021f50b85db8df2d4324ea6e91ec3e5dcde092021d0"
+checksum = "5a064218214dc6a10fbae5ec5fa888d80c45d611aba169222fc272072bf7aef6"
 dependencies = [
  "jiff-static",
  "log",
@@ -306,9 +306,9 @@ dependencies = [
 
 [[package]]
 name = "jiff-static"
-version = "0.2.9"
+version = "0.2.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "526b834d727fd59d37b076b0c3236d9adde1b1729a4361e20b2026f738cc1dbe"
+checksum = "199b7932d97e325aff3a7030e141eafe7f2c6268e1d1b24859b753a627f45254"
 dependencies = [
  "proc-macro2",
  "quote",