From 56374cc64d58451b359bb4e8502387d3a96e7c7b Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Thu, 13 Mar 2025 09:25:14 -0500
Subject: [PATCH] zoxide: remove with lib

---
 modules/programs/zoxide.nix | 39 +++++++++++++++++--------------------
 1 file changed, 18 insertions(+), 21 deletions(-)

diff --git a/modules/programs/zoxide.nix b/modules/programs/zoxide.nix
index 085583e1b..8509a3dc6 100644
--- a/modules/programs/zoxide.nix
+++ b/modules/programs/zoxide.nix
@@ -1,30 +1,25 @@
 { config, lib, pkgs, ... }:
-
-with lib;
-
 let
-
   cfg = config.programs.zoxide;
 
-  cfgOptions = concatStringsSep " " cfg.options;
-
+  cfgOptions = lib.concatStringsSep " " cfg.options;
 in {
   meta.maintainers = [ ];
 
   options.programs.zoxide = {
-    enable = mkEnableOption "zoxide";
+    enable = lib.mkEnableOption "zoxide";
 
-    package = mkOption {
-      type = types.package;
+    package = lib.mkOption {
+      type = lib.types.package;
       default = pkgs.zoxide;
-      defaultText = literalExpression "pkgs.zoxide";
+      defaultText = lib.literalExpression "pkgs.zoxide";
       description = ''
         Zoxide package to install.
       '';
     };
 
-    options = mkOption {
-      type = types.listOf types.str;
+    options = lib.mkOption {
+      type = lib.types.listOf lib.types.str;
       default = [ ];
       example = [ "--no-cmd" ];
       description = ''
@@ -45,22 +40,24 @@ in {
       lib.hm.shell.mkZshIntegrationOption { inherit config; };
   };
 
-  config = mkIf cfg.enable {
+  config = lib.mkIf cfg.enable {
     home.packages = [ cfg.package ];
 
-    programs.bash.initExtra = mkIf cfg.enableBashIntegration (mkOrder 2000 ''
-      eval "$(${cfg.package}/bin/zoxide init bash ${cfgOptions})"
-    '');
+    programs.bash.initExtra = lib.mkIf cfg.enableBashIntegration
+      (lib.mkOrder 2000 ''
+        eval "$(${cfg.package}/bin/zoxide init bash ${cfgOptions})"
+      '');
 
-    programs.zsh.initContent = mkIf cfg.enableZshIntegration (mkOrder 2000 ''
-      eval "$(${cfg.package}/bin/zoxide init zsh ${cfgOptions})"
-    '');
+    programs.zsh.initContent = lib.mkIf cfg.enableZshIntegration
+      (lib.mkOrder 2000 ''
+        eval "$(${cfg.package}/bin/zoxide init zsh ${cfgOptions})"
+      '');
 
-    programs.fish.interactiveShellInit = mkIf cfg.enableFishIntegration ''
+    programs.fish.interactiveShellInit = lib.mkIf cfg.enableFishIntegration ''
       ${cfg.package}/bin/zoxide init fish ${cfgOptions} | source
     '';
 
-    programs.nushell = mkIf cfg.enableNushellIntegration {
+    programs.nushell = lib.mkIf cfg.enableNushellIntegration {
       extraEnv = ''
         let zoxide_cache = "${config.xdg.cacheHome}/zoxide"
         if not ($zoxide_cache | path exists) {