Skip to content

Commit 6c813fc

Browse files
committed
add extra keys, age vars
1 parent 7e23870 commit 6c813fc

File tree

2 files changed

+20
-11
lines changed

2 files changed

+20
-11
lines changed

.sops.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@ keys:
22
- &kclejeune age16vnps5ues20fykepcjwr5zyvf5p7pzd3skdr4kh4hf9nxl38vfxq6vanlm
33
# Derived from gateway SSH host key via ssh-to-age
44
- &gateway age1xawelux9hmvjmq3ry9yu0uh0njyjx87hskdlnlknjh3ud2rm74fs5jc8vk
5+
- &klejeune age10suv000jwsgzq546kmj5jxltmxawsx90nvdmyzc42nhsayyfa4rq720w54
6+
- &standalone age17t0ghmx3ze62epewm9p5rdaywv9u6wjcjvrj5e734uqzkst6hvtqhwtdkz
57

68
creation_rules:
79
- path_regex: secrets/gateway\.yaml$

modules/home-manager/shell.nix

Lines changed: 18 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -18,17 +18,24 @@ in
1818
{
1919
home = {
2020
preferXdgDirectories = true;
21-
sessionVariables = {
22-
GPG_TTY = "/dev/ttys000";
23-
CLICOLOR = 1;
24-
LSCOLORS = "ExFxBxDxCxegedabagacad";
25-
LANG = "en_US.UTF-8";
26-
DEFAULT_USER = "${config.home.username}";
27-
LS_COLORS = "ExFxBxDxCxegedabagacad";
28-
TERM = "xterm-256color";
29-
MISE_ENV_FILE = ".env";
30-
NH_HOST = "${config.home.username}@${pkgs.stdenvNoCC.hostPlatform.system}";
31-
};
21+
sessionVariables =
22+
let
23+
ageKey = "${config.xdg.configHome}/sops/age/keys.txt";
24+
in
25+
{
26+
GPG_TTY = "/dev/ttys000";
27+
CLICOLOR = 1;
28+
LSCOLORS = "ExFxBxDxCxegedabagacad";
29+
LANG = "en_US.UTF-8";
30+
DEFAULT_USER = "${config.home.username}";
31+
LS_COLORS = "ExFxBxDxCxegedabagacad";
32+
TERM = "xterm-256color";
33+
MISE_ENV_FILE = ".env";
34+
NH_HOST = "${config.home.username}@${pkgs.stdenvNoCC.hostPlatform.system}";
35+
AGE_KEY_FILE = ageKey;
36+
MISE_AGE_KEY_FILE = ageKey;
37+
SOPS_AGE_KEY_FILE = ageKey;
38+
};
3239
sessionPath = [
3340
"${homeDir}/.local/bin"
3441
"${homeDir}/.rustup/bin"

0 commit comments

Comments
 (0)