motiejus/config
1
Fork 0
Code Packages Releases Activity

tidy up mounts and remove sops

Browse Source
This commit is contained in:
Motiejus Jakštys 2023-04-13 23:32:16 +03:00
parent a1544a9bfe
commit cfe835bf62
1 changed files with 1 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
configuration.nix
View File

@ -2,7 +2,6 @@
config, config,
pkgs, pkgs,
lib, lib,
#sops-nix,
... ...
}: let }: let
gitea_uidgid = 995; gitea_uidgid = 995;
@ -61,21 +60,14 @@
); );
umountLatest = ( umountLatest = (
{mountpoint, ...}: '' set -euo pipefail {mountpoint, ...}: ''exec ${pkgs.util-linux}/bin/umount ${mountpoint}/.snapshot-latest''
${pkgs.util-linux}/bin/umount ${mountpoint}/.snapshot-latest
''
); );
in { in {
imports = [ imports = [
./hardware-configuration.nix ./hardware-configuration.nix
./zfs.nix ./zfs.nix
#sops-nix.nixosModules.sops
]; ];
#sops.defaultSopsFile = ./hosts/hel1-a/secrets.yaml;
#sops.age.sshKeyPaths = [ "/etc/ssh/ssh_host_ed25519_key" ];
#sops.secrets.borgbackup-password = {};
nixpkgs.overlays = [ nixpkgs.overlays = [
(self: super: { (self: super: {
systemd = super.systemd.overrideAttrs (old: { systemd = super.systemd.overrideAttrs (old: {
@ -258,7 +250,6 @@ in {
repo = "zh2769@zh2769.rsync.net:hel1-a.servers.jakst"; repo = "zh2769@zh2769.rsync.net:hel1-a.servers.jakst";
encryption = { encryption = {
mode = "repokey-blake2"; mode = "repokey-blake2";
#passCommand = "cat ${config.sops.secrets.borgbackup-password.path}";
passCommand = "cat /var/src/secrets/borgbackup/password"; passCommand = "cat /var/src/secrets/borgbackup/password";
}; };
paths = value.paths; paths = value.paths;