From 3f3641bf3df550944a1c54693834d978fb2054aa Mon Sep 17 00:00:00 2001 From: mjallen18 Date: Wed, 19 Nov 2025 16:46:06 -0600 Subject: [PATCH] formatting, warning fixes --- checks/pre-commit-hooks/default.nix | 2 +- flake.lock | 6 +++--- modules/nixos/services/nextcloud/container.nix | 12 ++++++------ modules/nixos/services/onlyoffice/default.nix | 7 ++++++- modules/nixos/services/traefik/default.nix | 8 ++++---- modules/nixos/user/default.nix | 2 ++ overlays/stable/default.nix | 2 +- overlays/unstable/default.nix | 2 +- 8 files changed, 24 insertions(+), 17 deletions(-) diff --git a/checks/pre-commit-hooks/default.nix b/checks/pre-commit-hooks/default.nix index 04ec843..e8597b2 100644 --- a/checks/pre-commit-hooks/default.nix +++ b/checks/pre-commit-hooks/default.nix @@ -7,7 +7,7 @@ let inherit (inputs) pre-commit-hooks-nix; in -pre-commit-hooks-nix.lib.${pkgs.system}.run { +pre-commit-hooks-nix.lib.${pkgs.stdenv.hostPlatform.system}.run { src = ../..; hooks = { pre-commit-hook-ensure-sops.enable = true; diff --git a/flake.lock b/flake.lock index b311584..3a48108 100644 --- a/flake.lock +++ b/flake.lock @@ -844,11 +844,11 @@ "nixpkgs": "nixpkgs_10" }, "locked": { - "lastModified": 1762789718, - "narHash": "sha256-PLlSV4vQdBoBi2EL3dRWZmzf8SY+bayh/SwCA33iu3c=", + "lastModified": 1763592252, + "narHash": "sha256-NYWm2FBuzrYASp8nBoEUy5oakMeREZ6XcIuuCcqre38=", "owner": "mjallen18", "repo": "nixos-raspberrypi", - "rev": "9d26705d46fa20d75b9b828d923e505ea770b801", + "rev": "b66b1c369ca9ef728539fad65beb75242a398821", "type": "github" }, "original": { diff --git a/modules/nixos/services/nextcloud/container.nix b/modules/nixos/services/nextcloud/container.nix index 05e5642..a884f04 100755 --- a/modules/nixos/services/nextcloud/container.nix +++ b/modules/nixos/services/nextcloud/container.nix @@ -81,12 +81,12 @@ in ${hostAddress} host.containers protonmail-bridge ''; -# services.nginx.virtualHosts."cloud.mjallen.dev".listen = [ -# { -# addr = "0.0.0.0"; -# port = 8080; -# } -# ]; + # services.nginx.virtualHosts."cloud.mjallen.dev".listen = [ + # { + # addr = "0.0.0.0"; + # port = 8080; + # } + # ]; services = { nextcloud = { diff --git a/modules/nixos/services/onlyoffice/default.nix b/modules/nixos/services/onlyoffice/default.nix index bd4898b..ea4906c 100644 --- a/modules/nixos/services/onlyoffice/default.nix +++ b/modules/nixos/services/onlyoffice/default.nix @@ -16,7 +16,12 @@ in }; config = lib.mkIf cfg.enable { - services.nginx.virtualHosts."office.mjallen.dev".listen = [ { addr = "0.0.0.0"; port = 9943; } ]; + services.nginx.virtualHosts."office.mjallen.dev".listen = [ + { + addr = "0.0.0.0"; + port = 9943; + } + ]; services.onlyoffice = { enable = true; port = 9943; diff --git a/modules/nixos/services/traefik/default.nix b/modules/nixos/services/traefik/default.nix index e252016..805f78c 100755 --- a/modules/nixos/services/traefik/default.nix +++ b/modules/nixos/services/traefik/default.nix @@ -262,12 +262,12 @@ in # }; http = { - + serversTransports = { attich1 = { - serverName = "localhost"; - disableHTTP2 = true; - }; + serverName = "localhost"; + disableHTTP2 = true; + }; }; middlewares = { diff --git a/modules/nixos/user/default.nix b/modules/nixos/user/default.nix index a16aded..75040a9 100644 --- a/modules/nixos/user/default.nix +++ b/modules/nixos/user/default.nix @@ -17,9 +17,11 @@ let # Desktop Windows "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDZ2PYPjZddOzR8OJj16G88KcUhCDLkvrEmpUQP0wKHDUuA27HQQ2ORo66asadwGHY3k1VDZ1ei9l9H++SIIeKOaaUr5yZdktvj4POUNtbd9ZhcS7sZU7BSF+NMDM+h3tImh6z0S7mWvRQOUv3ZM+ZER+5xTWJVG1OOJEpb1drxJk6Qz0wbZKSR7TPNFBLLXlVy7hkNYf07RtDyhCCxNB3hJfa8c+oztnWumwDhDQWLqiUXWIU2QH6iRLGl/WYnujtNvVVaV/Hn3JJkS6MM9dnV3cpoIO0+J7+WfsN9rZ0wXt5yY3GhiGXwmcO5eYVli8lHlLWtK7aYSETyry6CBsLbojzOQO5rSqhpwfF2njAAFAQU0UjLc8PahisIuFKCwHH4iyXXOagiv5K1Mc/0Ak+WhhMPee6vV2p7NTyNpXRvouDbWy5cSRH31WgQ9fK5mIGe5v8nGGqtEhUubUkiOgP+H3UbT2V/nTv/TFKdJcKw+WmizvTrxBmaMjWALlkYl+s= mattl@Jallen-PC" # Desktop NixOS + "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDSbGJHZKrraJYwF4hehqmSd/cFOPyLUuWUECEA7qH2Rv5zrL50Pey3o1L0pKlypxjrrNgkCsn53lP6jgF7GHDo0TICsE1jgVAUKhVL+h6+o/8A509ZVb/ZhItZmbc7mtif59FTF+RiIS11f6RFNdKy6XoosdIXPhxHRqKb40GoVdEmgqSqb77nePQPZQiBhosI0KmJ8UsCn+z6lLAX+hQ9CT7rQDuW18MbAYcc2DI4aug35npngys4m3RMA2IlzF5SRMxmPLpN8HHXkLlliDGjvFHxJbAAlkDvjFETrPjgKQqKcVOhEP42Qg/ywcGfqKQTig2r13AgJE2NSON7VtHu554RiQ+Ob52aN7PvxzsEWwXO01ot7PHB1nnKeFGkRAGQfm6nAZ/So0JOraWL35MKmBmlbIXR3uT8WMJrbCq1YYJ88PbAE8l1LOJSshHRcXFgnrllywO5+6S7cLpKKXu9L4xTisJMbGlq3yVSTfXiysXRa+tfgQy6GdSIyEeQHJs= matt@matt-nixos" "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPTBMydhOc6SnOdB5WrEd7X07DrboAtagCUgXiOJjLov matt@matt-nixos" # Yubikey "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCuzZfywCSde/3J1zRWH0s7OMEhHIwZeNWdKHUxMAYE/5hzFRtl5LYuNU68zxj7Aj67VF8VGwBbMEU6X/ebiNAxahmjf4mtioby5b4TIy+0Xvdbayoch938bP7UhskzobaJF6epg3vyATnJGr6i0EOXiDSkJU8vL1oeue0HN7WmwzIqxw0BTaSh6HJvjhhFhs20dBHc2x9behIfSmKFe9gBlPcIriUtpXNgasm14QCMk537dlSgGUFxPGIzZRAUSn5wqFjbiNK0rP/1MJzhGtXhHFJ8irI4TiVEk3cOm5nMoJxTP4KScfmHU+niU1Al+d0KOBsHb71AWutazRudKvsqrPsbG6vT4gGMVjOCTN9e89jcapz5GEQsVQR6s1HUjh4G+2PFbHOFmR8Mks+TIumqHIWsXgQnFBadblDRGPwrSH3zulvRzghyfTyU/bX28iGvpli2ckso5nJmG8D1LO7Y/E8U8ZGW4hC75+iP90cu9G1Ff1hETkrv6xpbNTGL61U= cardno:33_720_987" + "ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBGdwsYDOkjd17rKdpjKN+3Yx1rRHT/Fiv2erc2JdE6ibHKBxLSEZ4kCOFCyGyc5ZO6Cmb09GfAe9FugkD4titns= cardno:33_720_987" ]; defaultPasswordFile = config.sops.secrets."matt_password".path; diff --git a/overlays/stable/default.nix b/overlays/stable/default.nix index ec08897..fc3b46d 100755 --- a/overlays/stable/default.nix +++ b/overlays/stable/default.nix @@ -1,7 +1,7 @@ { inputs, ... }: final: _prev: { stable = import inputs.nixpkgs-stable { - system = final.system; + system = final.stdenv.hostPlatform.system; config.allowUnfree = true; }; } diff --git a/overlays/unstable/default.nix b/overlays/unstable/default.nix index 385d78b..27d12ab 100644 --- a/overlays/unstable/default.nix +++ b/overlays/unstable/default.nix @@ -1,7 +1,7 @@ { inputs, ... }: final: _prev: { unstable = import inputs.nixpkgs { - system = final.system; + system = final.stdenv.hostPlatform.system; config.allowUnfree = true; }; }