From d9521212427516dd928117d5f02c4e0332ddc0d7 Mon Sep 17 00:00:00 2001 From: punkfairie Date: Mon, 26 May 2025 18:16:08 -0700 Subject: [PATCH] feat: agenix --- flake/config.nix | 1 - modules/base/home.nix | 8 ++++++-- modules/home/profiles.nix | 1 + .../default.nix => modules/home/programs/agenix.nix | 9 +++++---- modules/home/programs/default.nix | 1 + 5 files changed, 13 insertions(+), 7 deletions(-) rename snowflake/modules/home/programs/cli/agenix/default.nix => modules/home/programs/agenix.nix (61%) diff --git a/flake/config.nix b/flake/config.nix index 384a76c..8c2dab1 100644 --- a/flake/config.nix +++ b/flake/config.nix @@ -17,7 +17,6 @@ overlays = with inputs; [ lix.overlays.default nur.overlays.default - agenix.overlays.default niri-flake.overlays.niri (import ./overlays/ddclient.nix) diff --git a/modules/base/home.nix b/modules/base/home.nix index 6ea371c..b22430b 100644 --- a/modules/base/home.nix +++ b/modules/base/home.nix @@ -1,4 +1,8 @@ -{marleylib, ...}: let +{ + marleylib, + inputs', + ... +}: let my = { name = "marley"; fullName = "Marley Rae"; @@ -19,7 +23,7 @@ in { }; sharedModules = [../home]; - extraSpecialArgs = {inherit marleylib;}; + extraSpecialArgs = {inherit marleylib inputs';}; }; }; } diff --git a/modules/home/profiles.nix b/modules/home/profiles.nix index 48ca6d0..6b6cf48 100644 --- a/modules/home/profiles.nix +++ b/modules/home/profiles.nix @@ -12,6 +12,7 @@ in { # Universal - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - { programs = { + agenix = enabled; nh = enabled; }; } diff --git a/snowflake/modules/home/programs/cli/agenix/default.nix b/modules/home/programs/agenix.nix similarity index 61% rename from snowflake/modules/home/programs/cli/agenix/default.nix rename to modules/home/programs/agenix.nix index 7d5757a..216ad07 100644 --- a/snowflake/modules/home/programs/cli/agenix/default.nix +++ b/modules/home/programs/agenix.nix @@ -1,7 +1,7 @@ { - lib, config, - pkgs, + lib, + inputs', ... }: let cfg = config.marleyos.programs.agenix; @@ -9,8 +9,9 @@ in { options.marleyos.programs.agenix.enable = lib.mkEnableOption "agenix"; config = lib.mkIf cfg.enable { - home.packages = with pkgs; [ - agenix + home.packages = [ + # The overlay doesn't work for some reason... + inputs'.agenix.packages.default ]; }; } diff --git a/modules/home/programs/default.nix b/modules/home/programs/default.nix index 60bbf18..8a6b2f9 100644 --- a/modules/home/programs/default.nix +++ b/modules/home/programs/default.nix @@ -1,5 +1,6 @@ { imports = [ + ./agenix.nix ./fuzzel.nix ./nemo.nix ./nh.nix