motiejus/config
1
Fork 0
Code Packages Releases Activity

nix run github:astro/deadnix

Browse Source
This commit is contained in:
Motiejus Jakštys
2023-09-30 17:06:41 +03:00
parent 305eba5d2e
commit 0e9f90a960
18 changed files with 16 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modules/base/fileSystems/default.nix
View File

@@ -4,7 +4,7 @@
...
}: let
cfg = config.zfs-root.fileSystems;
inherit (lib) mkIf types mkDefault mkOption mkMerge mapAttrsToList;
inherit (lib) types mkDefault mkOption mkMerge mapAttrsToList;
in {
options.zfs-root.fileSystems = {
datasets = mkOption {

4
modules/base/snapshot/default.nix
View File

@@ -23,7 +23,7 @@
};
extraArgs = ["--verbose"];
datasets = let
fs_zfs = lib.filterAttrs (n: v: v.fsType == "zfs") config.fileSystems;
fs_zfs = lib.filterAttrs (_: v: v.fsType == "zfs") config.fileSystems;
mountpoint2fs =
builtins.listToAttrs
(map (mountpoint: {
@@ -32,7 +32,7 @@
})
config.mj.base.snapshot.mountpoints);
s_datasets =
lib.mapAttrs' (mountpoint: fs: {
lib.mapAttrs' (_mountpoint: fs: {
name = fs.device;
value = {use_template = ["prod"];};
})

4
modules/base/sshd/default.nix
View File

@@ -14,8 +14,8 @@
};
programs.mosh.enable = true;
programs.ssh.knownHosts = let
sshAttrs = lib.genAttrs ["extraHostNames" "publicKey"] (name: null);
sshAttrs = lib.genAttrs ["extraHostNames" "publicKey"] (_: null);
in
lib.mapAttrs (name: cfg: builtins.intersectAttrs sshAttrs cfg) myData.hosts;
lib.mapAttrs (_name: cfg: builtins.intersectAttrs sshAttrs cfg) myData.hosts;
};
}

2
modules/base/users/default.nix
View File

@@ -55,7 +55,7 @@
passwd.motiejus or {};
root = assert lib.assertMsg (passwd ? root) "root password needs to be defined";
lib.filterAttrs (n: v: v != null) passwd.root;
lib.filterAttrs (_: v: v != null) passwd.root;
};
};

4
modules/base/zfsborg/default.nix
View File

@@ -4,7 +4,7 @@
pkgs,
...
}: let
mkPreHook = mountpoint: zfs_name: i: ''
mkPreHook = zfs_name: i: ''
set -x
sleep ${toString i}
mkdir "$RUNTIME_DIRECTORY/snapshot"
@@ -79,7 +79,7 @@ in {
extraArgs = "--remote-path=borg1";
compression = "auto,lzma";
startAt = attrs.backup_at;
preHook = mkPreHook mountpoint fs.device i;
preHook = mkPreHook fs.device i;
prune.keep = {
within = "1d";
daily = 7;