diff --git a/home/base/desktop/shell.nix b/home/base/desktop/shell.nix index 85f2f6df..e2b35f20 100644 --- a/home/base/desktop/shell.nix +++ b/home/base/desktop/shell.nix @@ -3,14 +3,14 @@ programs.bash = { # load the alias file for work bashrcExtra = '' - source /run/agenix/alias-for-work.bash + source /etc/agenix/alias-for-work.bash ''; }; programs.nushell = { # load the alias file for work extraConfig = '' - source /run/agenix/alias-for-work.nushell + source /etc/agenix/alias-for-work.nushell ''; }; diff --git a/secrets/default.nix b/secrets/default.nix index 7dd58ed6..8fb3edd5 100644 --- a/secrets/default.nix +++ b/secrets/default.nix @@ -1,4 +1,4 @@ -{ pkgs, agenix, mysecrets, ... }: +{ config, pkgs, agenix, mysecrets, ... }: { imports = [ @@ -12,8 +12,6 @@ # if you changed this key, you need to regenerate all encrypt files from the decrypt contents! age.identityPaths = [ "/home/ryan/.ssh/juliet-age" ]; - age.secretsDir = "/run/agenix/"; - ############################################################################ # # The following secrets are used by NixOS Modules @@ -47,17 +45,24 @@ ############################################################################ age.secrets."alias-for-work.nushell" = { - # path = "/etc/agenix/"; file = "${mysecrets}/alias-for-work.nushell.age"; - mode = "0600"; - owner = "ryan"; - group = "ryan"; }; age.secrets."alias-for-work.bash" = { - # path = "/etc/agenix/"; file = "${mysecrets}/alias-for-work.bash.age"; - mode = "0600"; - owner = "ryan"; - group = "ryan"; + }; + + environment.etc = { + "agenix/alias-for-work.nushell" = { + source = config.age.secrets."alias-for-work.nushell".path; + mode = "0600"; + uid = 1000; + gid = 1000; + }; + "agenix/alias-for-work.bash" = { + source = config.age.secrets."alias-for-work.bash".path; + mode = "0600"; + uid = 1000; + gid = 1000; + }; }; }