fix: update secrets approach to match 'nix-secrets'

This commit is contained in:
2026-04-11 20:48:47 +02:00
parent db116cc4de
commit faf3afad79
17 changed files with 268 additions and 180 deletions

View File

@@ -23,6 +23,8 @@ in
inherit lib config;
device = "/dev/nvme1n1";
})
../../modules/ai-tools
../../modules/anki
../../modules/audio
../../modules/backups
../../modules/bluetooth
@@ -31,17 +33,19 @@ in
../../modules/firewall
../../modules/fonts
../../modules/gaming
../../modules/git
../../modules/hcloud
../../modules/keyboard
../../modules/localization
../../modules/networking
../../modules/nvidia
(import ../../modules/secrets { inherit lib inputs config; })
../../modules/secrets
../../modules/ssh
../../modules/storage
../../modules/stylix
../../modules/syncthing
../../modules/tailscale
../../modules/taskwarrior
../../modules/users
../../modules/wol
../../modules/yubikey

View File

@@ -16,30 +16,34 @@ in
inputs.nixos-hardware.nixosModules.common-pc
inputs.nixos-hardware.nixosModules.common-pc-ssd
# inputs.nixos-hardware.nixosModules.lenovo-thinkpad-e14-intel-gen7 (not available yet?)
inputs.sops-nix.nixosModules.sops
../../modules/common
../../modules/boot/bootloader.nix
(import ../../modules/disko/zfs-encrypted-root.nix {
inherit lib config;
device = "/dev/nvme0n1";
})
../../modules/desktops/niri
../../modules/ai-tools
../../modules/anki
../../modules/audio
../../modules/backups
../../modules/bluetooth
../../modules/keyboard
../../modules/networking
../../modules/users
../../modules/localization
../../modules/desktops/niri
../../modules/docker
../../modules/firewall
../../modules/fonts
../../modules/git
../../modules/keyboard
../../modules/localization
../../modules/networking
../../modules/nfc
../../modules/secrets
../../modules/ssh
../../modules/storage
../../modules/stylix
(import ../../modules/secrets { inherit lib inputs config; })
../../modules/docker
../../modules/nfc
../../modules/firewall
../../modules/tailscale
../../modules/taskwarrior
../../modules/users
../../modules/yubikey
];

View File

@@ -1,5 +1,4 @@
{
lib,
inputs,
config,
pkgs,
@@ -12,20 +11,22 @@
./host.nix
./disk.nix
../../modules/common
../../modules/boot/bootloader.nix
../../modules/keyboard
../../modules/networking
../../modules/users
../../modules/anki
../../modules/audio
../../modules/localization
../../modules/x
../../modules/boot/bootloader.nix
../../modules/fonts
../../modules/git
../../modules/keyboard
../../modules/localization
../../modules/networking
../../modules/ai-tools
../../modules/ssh
../../modules/storage
../../modules/stylix
(import ../../modules/secrets {
inherit lib inputs config;
})
../../modules/secrets
../../modules/taskwarrior
../../modules/users
../../modules/x
];
home-manager.users.${config.host.username} = import ../../home/hosts/vm {