From ec64b11b159016a015e1d9d759d88d6c77bf4966 Mon Sep 17 00:00:00 2001 From: Chris Dombroski Date: Wed, 13 Nov 2024 11:19:25 -0500 Subject: [PATCH] default flake for nh --- nixos-modules/common/nix.nix | 19 +++++++++++++++---- nixos-modules/common/sshd.nix | 6 +----- nixos-modules/docker-zwave.nix | 2 +- 3 files changed, 17 insertions(+), 10 deletions(-) diff --git a/nixos-modules/common/nix.nix b/nixos-modules/common/nix.nix index 9a78d6d..2b40396 100644 --- a/nixos-modules/common/nix.nix +++ b/nixos-modules/common/nix.nix @@ -1,10 +1,18 @@ -{ pkgs, lib, config, ... }: +{ + pkgs, + lib, + config, + ... +}: { programs.git.enable = true; programs.nh = { enable = true; - clean.enable = true; - clean.extraArgs = "--keep-since 7d"; + clean = { + enable = true; + extraArgs = "--keep-since 7d"; + }; + flake = "git+https://git.icanttype.org/cdombroski/nix-configs.git"; }; nix = { @@ -22,7 +30,10 @@ enable = true; flake = "git+https://git.icanttype.org/cdombroski/nix-configs.git"; allowReboot = true; - flags = lib.lists.optionals config.nixpkgs.hostPlatform.isAarch64 [ "--build-host" "zeus" ]; + flags = lib.lists.optionals config.nixpkgs.hostPlatform.isAarch64 [ + "--build-host" + "zeus" + ]; rebootWindow = { lower = "02:00"; upper = "06:00"; diff --git a/nixos-modules/common/sshd.nix b/nixos-modules/common/sshd.nix index 14cad64..686e5d5 100644 --- a/nixos-modules/common/sshd.nix +++ b/nixos-modules/common/sshd.nix @@ -1,8 +1,4 @@ -{ - pkgs, - config, - ... -}: +{ pkgs, config, ... }: { sops.secrets = { "root/password" = { diff --git a/nixos-modules/docker-zwave.nix b/nixos-modules/docker-zwave.nix index b92f3b6..09fe156 100644 --- a/nixos-modules/docker-zwave.nix +++ b/nixos-modules/docker-zwave.nix @@ -5,7 +5,7 @@ podman.enable = true; oci-containers.containers = { zwave-js-ui = { -# image = "zwavejs/zwave-js-ui:latest"; + # image = "zwavejs/zwave-js-ui:latest"; image = "my-zwave-js-ui:latest"; imageFile = pkgs.dockerTools.buildLayeredImage { name = "my-zwave-js-ui";