From 94403975007fad45fbe1c2c649327a6dd907aad1 Mon Sep 17 00:00:00 2001 From: Ingolf Wagner Date: Sat, 22 Jul 2023 01:16:50 +0200 Subject: [PATCH] udpate --- flake.nix | 3 +-- nixos/components/gui/home-manager/default.nix | 2 +- nixos/components/terminal/direnv.nix | 7 ++++++- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/flake.nix b/flake.nix index e7ae05d..a67a97e 100644 --- a/flake.nix +++ b/flake.nix @@ -76,14 +76,12 @@ #inputs.nixpkgs.follows = "nixpkgs"; #inputs.home-manager.follows = "home-manager"; }; - }; outputs = { self , disko , dns - , stylix , doom-emacs-nix , emacs-overlay , grocy-scanner @@ -105,6 +103,7 @@ , retiolum , secrets , sops-nix + , stylix }: let system = "x86_64-linux"; diff --git a/nixos/components/gui/home-manager/default.nix b/nixos/components/gui/home-manager/default.nix index 0b67dcf..888331b 100644 --- a/nixos/components/gui/home-manager/default.nix +++ b/nixos/components/gui/home-manager/default.nix @@ -30,7 +30,7 @@ with lib; key = "42AC51C9482D0834CF488AF1389EC2D64AC71EAC"; signByDefault = true; }; - ignores = [ "*.swp" "*~" ".idea" ".*penis.*" "result" ".envrc" ]; + ignores = [ "*.swp" "*~" ".idea" ".*penis.*" "result" ".envrc" ".direnv" ]; extraConfig = { init.defaultBranch = "main"; pull.ff = "only"; diff --git a/nixos/components/terminal/direnv.nix b/nixos/components/terminal/direnv.nix index a90e847..c0a8dd9 100644 --- a/nixos/components/terminal/direnv.nix +++ b/nixos/components/terminal/direnv.nix @@ -9,7 +9,12 @@ with lib; environment.systemPackages = [ pkgs.direnv ]; - home-manager.users.mainUser.programs.direnv.enable = true; + home-manager.sharedModules = [ + { + programs.direnv.enable = true; + programs.git.ignores = [ ".envrc" ".direnv" ]; + } + ]; programs.zsh.interactiveShellInit = '' eval "$(${pkgs.direnv}/bin/direnv hook zsh)"