ghoscht/nix-config
ghoscht/nix-config
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix sops-nix failure after reboot

Browse source 
/home partition of lvm wasn't mounted and sops-nix couldn't find the key
in that unmounted partition
This commit is contained in:
GHOSCHT 2024-12-25 22:37:51 +01:00
parent 02adc74c5a
commit 0c8b4ccfa9
Signed by: ghoscht
GPG key ID: 2C2C1C62A5388E82
2 changed files with 26 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
hosts/franz/default.nix
View file

@ -1,19 +1,17 @@
{
inputs,
outputs,
lib,
config,
pkgs,
...
}: let
{ inputs
, outputs
, ...
}:
let
vars = import ../../vars.nix;
in {
in
{
imports = [
inputs.hardware.nixosModules.common-pc-ssd
inputs.disko.nixosModules.default
./hardware-configuration.nix
(import ../../disko/btrfs-swap.nix {device = "/dev/nvme0n1";})
(import ../../disko/btrfs-swap.nix { device = "/dev/nvme0n1"; })
./disko/zfs.nix
../common/global
@ -29,7 +27,7 @@ in {
];
# Enable ZFS
boot.supportedFilesystems = ["zfs"];
boot.supportedFilesystems = [ "zfs" ];
networking.hostId = "f014fc43";
services.zfs.autoScrub.enable = true;
@ -40,12 +38,14 @@ in {
systemd.services.NetworkManager-wait-online.enable = false;
# Prevent zfs from being automounted by fstab auto discovery & zfs
fileSystems."/storage/dataset".options = ["noauto"];
fileSystems."/storage".options = ["noauto"];
fileSystems = {
"/storage/dataset".options = [ "noauto" ];
"/storage".options = [ "noauto" ];
fileSystems."/home/ghoscht/.zfs" = {
device = "/dev/disk/by-label/SECRET_KEYS";
fsType = "vfat";
"/home/ghoscht/.zfs" = {
device = "/dev/disk/by-label/SECRET_KEYS";
fsType = "vfat";
};
};
users.mutableUsers = true;

22
hosts/franz/sops.nix
View file

@ -1,18 +1,16 @@
{
pkgs,
inputs,
config,
...
}: let
vars = import ../../vars.nix;
in {
{ pkgs
, inputs
, ...
}: {
imports = [
inputs.sops-nix.nixosModules.sops
];
environment.systemPackages = with pkgs; [sops];
environment.systemPackages = with pkgs; [ sops ];
sops.defaultSopsFile = ../../secrets/franz.yaml;
sops.defaultSopsFormat = "yaml";
sops.age.keyFile = "/home/${vars.user}/.config/sops/age/keys.txt";
sops = {
defaultSopsFile = ../../secrets/franz.yaml;
defaultSopsFormat = "yaml";
age.keyFile = "/sops-nix/sops.txt";
};
}