Support for deadnix pre-commit check

This commit is contained in:
Greg Hellings
2024-10-03 15:21:56 -05:00
parent 78c802d32c
commit 229188214f
46 changed files with 50 additions and 85 deletions
+3 -3
View File
@@ -5,7 +5,7 @@ let
where = j: "${config.services.syncthing.dataDir}/${j.dest}";
makeSyncFolders = name: job: {
makeSyncFolders = _: job: {
devices = [ "chronicles" ];
enable = true;
id = job.id;
@@ -14,7 +14,7 @@ let
type = "sendonly";
};
makeRestic = name: job:
makeRestic = _: job:
let
who = "${config.services.syncthing.user}:${config.services.syncthing.group}";
in
@@ -34,7 +34,7 @@ with lib; {
default = { };
type = with types; attrsOf (submodule (
{ name, config, options, ... }:
{ ... }:
{
options = {
src = mkOption {
+3 -1
View File
@@ -10,7 +10,7 @@ let
ensureUnitExists = c': name:
let
unitName = (builtins.elemAt (builtins.split "\\." name) 0);
#unitName = (builtins.elemAt (builtins.split "\\." name) 0);
in
if c'.systemd.services ? unitName
then name
@@ -393,6 +393,8 @@ in
"/run/wrappers" # `systemd.services.<name>.path` adds the `bin/` subdir of this
] ++ map ({ package, ... }: package) cephMonitoringSudoersCommandsAndPackages;
# Unused localOsdServiceName in the following line
# deadnix: skip
makeCephOsdSetupSystemdService = localOsdServiceName: osdConfig:
let
osdExistenceFile = "/var/lib/ceph/osd/.${toString osdConfig.id}.${osdConfig.uuid}.nix-existence";
+2 -2
View File
@@ -5,7 +5,7 @@ let
# Create a container with all our default settings
makeContainer = name: container:
makeContainer = _: container:
let
agekey = "/etc/ssh/agenix_key";
in
@@ -18,7 +18,7 @@ let
"${agekey}".hostPath = "/etc/ssh/ssh_host_ed25519_key"; # This is needed for agenix to
};
enableTun = container.tailscale;
config = { config, pkgs, ... }: {
config = { ... }: {
imports = [
inputs.agenix.nixosModules.default
inputs.self.modules.nixosModule
+1 -1
View File
@@ -8,7 +8,7 @@ in
options.greg.databases = lib.mkOption {
default = { };
type = with lib.types; attrsOf (submodule (
{ name, config, options, ... }: {
{ ... }: {
# Options reserved for future expansion
options = { };
}
+1 -1
View File
@@ -1,4 +1,4 @@
{ config, pkgs, inputs, lib, ... }:
{ config, pkgs, lib, ... }:
let
x =
+2 -2
View File
@@ -1,4 +1,4 @@
{ config, lib, pkgs, ... }:
{ config, lib, ... }:
let
cfg = config.greg.proxies;
@@ -38,7 +38,7 @@ with lib; {
'';
type = with types; attrsOf (submodule (
{ name, config, options, ... }:
{ ... }:
{
options = {
genAliases = mkOption {
+1 -1
View File
@@ -1,4 +1,4 @@
{ config, pkgs, lib, ... }:
{ config, lib, ... }:
let
cfg = config.greg.sway;
+1 -1
View File
@@ -1,4 +1,4 @@
{ config, lib, pkgs, ... }:
{ config, lib, ... }:
let
cfg = config.greg.syncthing;