From 7cb51dcf8da76fe3e168408866a44440296509d0 Mon Sep 17 00:00:00 2001 From: TheWanderingCrow Date: Thu, 13 Mar 2025 09:33:14 -0400 Subject: [PATCH] direnv --- modules/users/crow/configs/direnv.nix | 8 +++++--- modules/users/crow/configs/zsh.nix | 5 +++++ modules/users/crow/home.nix | 3 ++- modules/users/crow/user.nix | 4 ++-- 4 files changed, 14 insertions(+), 6 deletions(-) create mode 100644 modules/users/crow/configs/zsh.nix diff --git a/modules/users/crow/configs/direnv.nix b/modules/users/crow/configs/direnv.nix index 2b51c9d..bf4e94e 100644 --- a/modules/users/crow/configs/direnv.nix +++ b/modules/users/crow/configs/direnv.nix @@ -1,6 +1,8 @@ { - programs.direnv = { - enable = true; - nix-direnv.enable = true; + programs = { + direnv = { + enable = true; + nix-direnv.enable = true; + }; }; } diff --git a/modules/users/crow/configs/zsh.nix b/modules/users/crow/configs/zsh.nix new file mode 100644 index 0000000..f5821ff --- /dev/null +++ b/modules/users/crow/configs/zsh.nix @@ -0,0 +1,5 @@ +{ + programs.zsh = { + enable = true; + }; +} diff --git a/modules/users/crow/home.nix b/modules/users/crow/home.nix index 217d427..57cd2a8 100644 --- a/modules/users/crow/home.nix +++ b/modules/users/crow/home.nix @@ -26,8 +26,9 @@ in { ./configs/waybar.nix ./configs/tmux.nix ./configs/git.nix - ./configs/direnv.nix ./configs/ssh.nix + ./configs/zsh.nix + ./configs/direnv.nix ]; home = { username = "crow"; diff --git a/modules/users/crow/user.nix b/modules/users/crow/user.nix index 9930034..27922db 100644 --- a/modules/users/crow/user.nix +++ b/modules/users/crow/user.nix @@ -4,7 +4,7 @@ config, ... }: { - config.users.users.crow = lib.mkIf config.user.crow.enable { + users.users.crow = lib.mkIf config.user.crow.enable { isNormalUser = true; initialPassword = "changeme"; extraGroups = ["wheel" "networkmanager" "audio" "plugdev" "dialout"]; @@ -13,5 +13,5 @@ ]; }; - config.home-manager.users.crow = lib.mkIf config.user.crow.home.enable ./home.nix; + home-manager.users.crow = lib.mkIf config.user.crow.home.enable ./home.nix; }