From c6510643c1814f22396723de79c583eee39ced6a Mon Sep 17 00:00:00 2001 From: Julian Mutter Date: Wed, 13 Nov 2024 14:35:02 +0100 Subject: [PATCH] Fix home-manager direnv config --- modules/home/direnv/default.nix | 49 ++++++++++++++++----------------- 1 file changed, 24 insertions(+), 25 deletions(-) diff --git a/modules/home/direnv/default.nix b/modules/home/direnv/default.nix index d0aa857..a13f0de 100644 --- a/modules/home/direnv/default.nix +++ b/modules/home/direnv/default.nix @@ -1,37 +1,36 @@ { -# Snowfall Lib provides a customized `lib` instance with access to your flake's library -# as well as the libraries available from your flake's inputs. -lib, -# An instance of `pkgs` with your overlays and packages applied is also available. -pkgs, -# You also have access to your flake's inputs. -inputs, + # Snowfall Lib provides a customized `lib` instance with access to your flake's library + # as well as the libraries available from your flake's inputs. + lib, + # An instance of `pkgs` with your overlays and packages applied is also available. + pkgs, + # You also have access to your flake's inputs. + inputs, -# Additional metadata is provided by Snowfall Lib. -system, # The system architecture for this host (eg. `x86_64-linux`). -target, # The Snowfall Lib target for this system (eg. `x86_64-iso`). -format, # A normalized name for the system target (eg. `iso`). -virtual -, # A boolean to determine whether this system is a virtual target using nixos-generators. -systems, # An attribute map of your defined hosts. + # Additional metadata is provided by Snowfall Lib. + system, # The system architecture for this host (eg. `x86_64-linux`). + target, # The Snowfall Lib target for this system (eg. `x86_64-iso`). + format, # A normalized name for the system target (eg. `iso`). + virtual, # A boolean to determine whether this system is a virtual target using nixos-generators. + systems, # An attribute map of your defined hosts. -# All other arguments come from the module system. -config, ... }: - -with lib; + # All other arguments come from the module system. + config, + ... +}: let cfg = config.modules.shell.direnv; - shellcfg = config.modules.shell; -in { - options.modules.shell.direnv = { enable = mkOption { default = false; }; }; +in +{ + options.modules.shell.direnv = { + enable = lib.mkOption { default = false; }; + }; - config = mkIf cfg.enable { - home.packages = with pkgs; [ direnv nix-direnv ]; + config = lib.mkIf cfg.enable { programs.direnv = { enable = true; nix-direnv.enable = true; - } // mkIf shellcfg.zsh.enable { enableZshIntegration = true; } - // mkIf shellcfg.fish.enable { enableFishIntegration = true; }; + }; }; }