From e465db8888d4b9830a29865fcc360bbaee9040a5 Mon Sep 17 00:00:00 2001 From: h7x4 Date: Fri, 25 Apr 2025 15:04:21 +0200 Subject: [PATCH] home: move nix config to separate module --- home/home.nix | 20 +------------------- home/programs/nix.nix | 21 +++++++++++++++++++++ 2 files changed, 22 insertions(+), 19 deletions(-) create mode 100644 home/programs/nix.nix diff --git a/home/home.nix b/home/home.nix index 59d486a..b6ecf35 100644 --- a/home/home.nix +++ b/home/home.nix @@ -31,6 +31,7 @@ in { ./programs/man.nix ./programs/neovim ./programs/nix-index + ./programs/nix.nix ./programs/nushell.nix ./programs/pandoc.nix ./programs/python.nix @@ -96,25 +97,6 @@ in { sops.defaultSopsFile = ../secrets/home.yaml; sops.age.sshKeyPaths = [ "${config.home.homeDirectory}/.ssh/id_ed25519_home_sops" ]; - sops = { - secrets = { - "nix/access-tokens/github" = { sopsFile = ../secrets/common.yaml; }; - "nix/access-tokens/pvv-git" = { sopsFile = ../secrets/common.yaml; }; - }; - templates."nix-access-tokens.conf".content = let - inherit (config.sops) placeholder; - in '' - access-tokens = github.com=${placeholder."nix/access-tokens/github"} git.pvv.ntnu.no=${placeholder."nix/access-tokens/pvv-git"} - ''; - }; - - nix = { - settings.use-xdg-base-directories = true; - extraOptions = '' - !include ${config.sops.templates."nix-access-tokens.conf".path} - ''; - }; - home = { username = "h7x4"; homeDirectory = "/home/h7x4"; diff --git a/home/programs/nix.nix b/home/programs/nix.nix new file mode 100644 index 0000000..b9775c4 --- /dev/null +++ b/home/programs/nix.nix @@ -0,0 +1,21 @@ +{ config, ... }: +{ + sops = { + secrets = { + "nix/access-tokens/github" = { sopsFile = ../../secrets/common.yaml; }; + "nix/access-tokens/pvv-git" = { sopsFile = ../../secrets/common.yaml; }; + }; + templates."nix-access-tokens.conf".content = let + inherit (config.sops) placeholder; + in '' + access-tokens = github.com=${placeholder."nix/access-tokens/github"} git.pvv.ntnu.no=${placeholder."nix/access-tokens/pvv-git"} + ''; + }; + + nix = { + settings.use-xdg-base-directories = true; + extraOptions = '' + !include ${config.sops.templates."nix-access-tokens.conf".path} + ''; + }; +}