From 54be18a8a6c0563cada29c5f4f0106eb0e1c2299 Mon Sep 17 00:00:00 2001 From: sadan <117494111+sadan4@users.noreply.github.com> Date: Mon, 27 May 2024 23:02:55 -0400 Subject: [PATCH] 10 current 2024-05-27 23:02:54 24.11.20240524.bfb7a88 Unknown * --- .sops.yaml | 2 +- boxes/wsl/home.nix | 2 +- build | 3 ++- common/files.nix | 4 ---- common/sops.nix | 8 ++++---- 5 files changed, 8 insertions(+), 11 deletions(-) diff --git a/.sops.yaml b/.sops.yaml index a20ff8d..4d02e86 100644 --- a/.sops.yaml +++ b/.sops.yaml @@ -3,7 +3,7 @@ keys: - &laptop age1tq8zaaqe8t4u2jgyf7usngtzyql0ymyxq6hntmu04vt5ypwhxensmzynhl - &win10 age1cz006hex596lmj88kkhrkvq89luqk59hxuq83q4kvhz82ltwpe4ss8gm3t creation_rules: - - path_regex: secrets/hosts.yml + - path_regex: secrets/hosts key_groups: - age: - *desktop diff --git a/boxes/wsl/home.nix b/boxes/wsl/home.nix index 4d58856..81153fa 100644 --- a/boxes/wsl/home.nix +++ b/boxes/wsl/home.nix @@ -1,7 +1,7 @@ { config, lib, pkgs, inputs, ... }: let - _s1 = import ../../common/sops.nix {inherit configl; }; + _s1 = import ../../common/sops.nix {inherit config; }; files = import ../../common/files.nix { inherit config; }; shell = import ../../common/shell.nix { inherit config pkgs; }; p = import ../../common/pkgs.nix { inherit pkgs config; }; diff --git a/build b/build index f894ffd..86a1269 100755 --- a/build +++ b/build @@ -2,10 +2,11 @@ set -e +pushd ~/nixos/ + #Change to change box setup BOX="$(cat .box)" -pushd ~/nixos/ notify(){ command -v notify-send > /dev/null if [[ $? -ne 0 ]]; then diff --git a/common/files.nix b/common/files.nix index 21f83bc..493bb8d 100644 --- a/common/files.nix +++ b/common/files.nix @@ -12,10 +12,6 @@ source = ../dotfiles/gh/config.yml; target = "./.config/gh/config.yml"; }; - gh_auth = { - source = config.sops.hosts.path; - target = "./.config/gh/hosts.yml" - } btop = { recursive = true; source = ../dotfiles/btop; diff --git a/common/sops.nix b/common/sops.nix index 7cb7d2e..eec8abe 100644 --- a/common/sops.nix +++ b/common/sops.nix @@ -1,10 +1,10 @@ { config }: { - age.keyFile = "/home${config.home.username}/.config/sops/age/keys.txt"; - defaultSopsFile = ../../secrets.yaml; + age.keyFile = "/home/${config.home.username}/.config/sops/age/keys.txt"; + defaultSopsFile = ../secrets.yaml; secrets.hosts = { format = "binary"; - sopsFile = ../../secrets/hosts; - owner = "${config.home.username}" + sopsFile = ../secrets/hosts; + path = "/home/${config.home.username}/.config/gh/hosts.yml"; }; }