add agenix directly to the base config

This commit is contained in:
Andreas Zweili 2022-03-16 15:22:13 +01:00
parent aec74f1a24
commit e6e2f6f199
4 changed files with 11 additions and 7 deletions

View File

@ -78,7 +78,10 @@
configurationNix configurationNix
# Common configuration # Common configuration
(import ./modules/common-x86 {inherit custom inputs pkgs system;}) ./modules/common-x86
agenix.nixosModules.age
{ environment.systemPackages = [ agenix.defaultPackage.${system} ]; }
home-manager.nixosModules.home-manager home-manager.nixosModules.home-manager
{ {
@ -99,7 +102,10 @@
configurationNix configurationNix
# Common configuration # Common configuration
(import ./modules/common {inherit custom inputs pkgs system;}) ./modules/common
agenix.nixosModules.age
{ environment.systemPackages = [ agenix.defaultPackage.${system} ]; }
home-manager.nixosModules.home-manager home-manager.nixosModules.home-manager
{ {

View File

@ -1,4 +1,4 @@
{ inputs, pkgs, system, ... }: { pkgs, ... }:
{ {
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
@ -14,7 +14,6 @@
unzip unzip
vim vim
wget wget
inputs.agenix.defaultPackage."${system}"
]; ];
environment.shellAliases = { environment.shellAliases = {
format-modules = "nixpkgs-fmt **/*.nix"; format-modules = "nixpkgs-fmt **/*.nix";

View File

@ -1,7 +1,7 @@
{ inputs, custom, pkgs, system, ... }: { inputs, ... }:
{ {
imports = [ imports = [
(import "${inputs.self}/modules/common" {inherit inputs custom pkgs system;}) "${inputs.self}/modules/common"
]; ];
# Use the systemd-boot EFI boot loader. # Use the systemd-boot EFI boot loader.

View File

@ -2,7 +2,6 @@
{ {
imports = [ imports = [
(import "${inputs.self}/modules/cli" { inherit inputs pkgs system; }) (import "${inputs.self}/modules/cli" { inherit inputs pkgs system; })
inputs.agenix.nixosModule
]; ];
# The rough location # The rough location