From e7e1fd3bfd735b312bf5f3d460785d7eff4a88b5 Mon Sep 17 00:00:00 2001 From: kat Date: Tue, 25 Oct 2022 10:45:31 -0700 Subject: [PATCH] fix: home-assistant config levels --- flake.lock | 60 +++++++++++++-------------- hardware/oracle/common.nix | 2 +- home/state.nix | 3 ++ modules/nixos/storage.nix | 2 +- nixos/gui/adb.nix | 2 +- nixos/systems/tewi/home-assistant.nix | 8 ++-- tf | 2 +- 7 files changed, 41 insertions(+), 38 deletions(-) diff --git a/flake.lock b/flake.lock index 9b099372..ff10622c 100644 --- a/flake.lock +++ b/flake.lock @@ -3,11 +3,11 @@ "arcexprs": { "flake": false, "locked": { - "lastModified": 1664737885, - "narHash": "sha256-ppcK2iEo949aGMVVXoqYs3H0K0jhPTDdUj+Dt1abIW0=", + "lastModified": 1666550207, + "narHash": "sha256-WsEyJ4L9mhcvMW31aQ4bQg/SmNq4243odALNi9vFhCY=", "owner": "arcnmx", "repo": "nixexprs", - "rev": "4e09592dade1388d900ab3524bc240ce75b14abb", + "rev": "436beaa14af3a8831de5a524d0a2e8aa9e02bef3", "type": "github" }, "original": { @@ -20,11 +20,11 @@ "ci": { "flake": false, "locked": { - "lastModified": 1664566287, - "narHash": "sha256-DysbqsNrLAGI4VU9HlP3qXe1b0P3N9mGGttmr3xUCHU=", + "lastModified": 1666307524, + "narHash": "sha256-JhZerh9vS9yj83S27tktgUtets4WFXsVHhVSAhSlG0k=", "owner": "arcnmx", "repo": "ci", - "rev": "3f5f6df67088485d422b97d3a41fe259e2bdc53e", + "rev": "f7637bbdbd7943388508556fbce8ad12ab44d2ff", "type": "github" }, "original": { @@ -41,11 +41,11 @@ ] }, "locked": { - "lastModified": 1664210064, - "narHash": "sha256-df6nKVZe/yAhmJ9csirTPahc0dldwm3HBhCVNA6qWr0=", + "lastModified": 1666519227, + "narHash": "sha256-z74lSCJE5BzxCeE2r9FU4tvHkQXQyz70zmJ3coLP10w=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "02d2551c927b7d65ded1b3c7cd13da5cc7ae3fcf", + "rev": "8be7f197120739b3ec15f994bdc48116726c6159", "type": "github" }, "original": { @@ -91,11 +91,11 @@ "emacs-overlay": { "flake": false, "locked": { - "lastModified": 1664478431, - "narHash": "sha256-XTPklm/+e2UfIitB0+s/fKTheMJSw3G1p+t0SsBCuo4=", + "lastModified": 1666298449, + "narHash": "sha256-y1SRRRK2eTVuh/HRCxwDSInMwGv0d5cPIp4YDlbcM30=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "6c78924bc5b6daaf98c0dbe63bdfcf80e6433f4b", + "rev": "b8e24cec99ff68f8a875b6f842a10b6b2ab398d3", "type": "github" }, "original": { @@ -342,11 +342,11 @@ "ws-butler": "ws-butler" }, "locked": { - "lastModified": 1664622347, - "narHash": "sha256-pJTnEG68PhrXjpkfz/784BlcxaHgV06b1cUVGRxhMdw=", + "lastModified": 1666441658, + "narHash": "sha256-viSycvYPWInoNoVVzOKcZBtIppK18GuAawqUwGeliKM=", "owner": "nix-community", "repo": "nix-doom-emacs", - "rev": "b65e204ce9d20b376acc38ec205d08007eccdaef", + "rev": "450d891c61eaae70963f319d161c135e401f30c7", "type": "github" }, "original": { @@ -373,11 +373,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1664538465, - "narHash": "sha256-EnlC7dDKX7X1wlnXkB1gmn9rBZQ0J9+biVTZHw//8us=", + "lastModified": 1666447894, + "narHash": "sha256-i9WHX4w/et4qPMzEXd9POmnO0/bthjr7R4cblKNHGms=", "owner": "nixos", "repo": "nixpkgs", - "rev": "10ecda252ce1b3b1d6403caeadbcc8f30d5ab796", + "rev": "95aeaf83c247b8f5aa561684317ecd860476fcd6", "type": "github" }, "original": { @@ -405,11 +405,11 @@ }, "nur": { "locked": { - "lastModified": 1664718272, - "narHash": "sha256-BNnUks1BKzBr8HzoKBFQ8a7/avQhDkKCu0DSgW1ulcY=", + "lastModified": 1666549958, + "narHash": "sha256-EX0xB+eyyeeeMXpqGeCqpwK5DZu50otvzXYZ6bp6SmI=", "owner": "nix-community", "repo": "nur", - "rev": "392b26288ad1cdebd03eac17adb70491f9f392d3", + "rev": "1ee2bab665e18e159edc312f6687406bcd23bfe4", "type": "github" }, "original": { @@ -438,11 +438,11 @@ "org": { "flake": false, "locked": { - "lastModified": 1664493874, - "narHash": "sha256-8zLosjfQX0aR5HprtCeiSqN1pfB+GEUF9AULk6WRcR4=", + "lastModified": 1666258795, + "narHash": "sha256-k2FbWk4OJKZbih3pTvJYxkaXuauWsuaXXthV54UFqCM=", "owner": "emacs-straight", "repo": "org-mode", - "rev": "fe1f4f2ccf040deff9c57288d987f17cc2da321f", + "rev": "98cae03b7d9a612334d5ea461e73ac0b37b0285d", "type": "github" }, "original": { @@ -502,11 +502,11 @@ "revealjs": { "flake": false, "locked": { - "lastModified": 1664012352, - "narHash": "sha256-Pu5p6HqIO2wvWiTEhsQyIuwlWEIa1GjO3EDXosznyYE=", + "lastModified": 1665992801, + "narHash": "sha256-bqNgaBT6WPfumhdG1VPZ6ngn0QA9RDuVtVJtVwxbOd4=", "owner": "hakimel", "repo": "reveal.js", - "rev": "468132320d6e072abd1297d7cc24766a2b7a832d", + "rev": "f6f657b627f9703e32414d8d3f16fb49d41031cb", "type": "github" }, "original": { @@ -566,11 +566,11 @@ "tf-nix": { "flake": false, "locked": { - "lastModified": 1663367102, - "narHash": "sha256-gcUzQDyXogvQ0TSYX2lrKQ5D/3k76w/lmL6tNrnNwXk=", + "lastModified": 1666390187, + "narHash": "sha256-BGF4rvuirlL+/P/BrNCMceHWdZKsCv27bHS2Iy0r6kQ=", "owner": "arcnmx", "repo": "tf-nix", - "rev": "133b92ea58c8c0cd7d02674013d67b54e169141f", + "rev": "0d5ff00ba1799167a9ee33e1ca11508d66cae4ce", "type": "github" }, "original": { diff --git a/hardware/oracle/common.nix b/hardware/oracle/common.nix index be27bb88..229a6dbd 100644 --- a/hardware/oracle/common.nix +++ b/hardware/oracle/common.nix @@ -109,7 +109,7 @@ in ]; }; - services.cockroachdb.locality = "provider=oracle,region=${tf.providers.oci.inputs.region},ad=${toString cfg.ad},host=${config.networking.hostName}"; + services.cockroachdb.locality = lib.mkIf (tf.state.enable) "provider=oracle,region=${tf.providers.oci.inputs.region},ad=${toString cfg.ad},host=${config.networking.hostName}"; deploy.tf = let diff --git a/home/state.nix b/home/state.nix index 2e77c69e..010322e7 100644 --- a/home/state.nix +++ b/home/state.nix @@ -1,3 +1,6 @@ { config, ... }: { home.stateVersion = "20.09"; + manual = { + manpages.enable = false; + }; } diff --git a/modules/nixos/storage.nix b/modules/nixos/storage.nix index 132348bc..38f6d718 100644 --- a/modules/nixos/storage.nix +++ b/modules/nixos/storage.nix @@ -50,7 +50,7 @@ }; }; config = mkMerge [ - (mkIf cfg.enable { + (mkIf false { environment.systemPackages = [ pkgs.glusterfs ]; services.glusterfs = { diff --git a/nixos/gui/adb.nix b/nixos/gui/adb.nix index f2d5bd3a..996026ca 100644 --- a/nixos/gui/adb.nix +++ b/nixos/gui/adb.nix @@ -1,4 +1,4 @@ { config, ... }: { - programs.adb.enable = true; + programs.adb.enable = false; users.users.kat.extraGroups = [ "adbusers" ]; } diff --git a/nixos/systems/tewi/home-assistant.nix b/nixos/systems/tewi/home-assistant.nix index d9497267..9d2ccdd0 100644 --- a/nixos/systems/tewi/home-assistant.nix +++ b/nixos/systems/tewi/home-assistant.nix @@ -1,5 +1,6 @@ { config, lib, tf, ... }: let inherit (lib.attrsets) attrNames filterAttrs mapAttrs' nameValuePair; + inherit (lib.strings) hasPrefix; in { # MDNS services.avahi.enable = true; @@ -103,9 +104,6 @@ in { services.home-assistant = { enable = true; config = { - packages = { - manual = "!include manual.yaml"; - }; homeassistant = { name = "Gensokyo"; unit_system = "metric"; @@ -115,6 +113,9 @@ in { currency = "CAD"; time_zone = "America/Vancouver"; external_url = "https://home.gensokyo.zone"; + packages = { + manual = "!include manual.yaml"; + }; }; frontend = { themes = "!include_dir_merge_named themes"; @@ -381,7 +382,6 @@ in { extraPackages = python3Packages: with python3Packages; [ psycopg2 aiohomekit - pkgs.withings-api securetar getmac # for upnp integration (aiogithubapi.overrideAttrs (_: { doInstallCheck = false; })) diff --git a/tf b/tf index ef3c9266..fcebdcb3 160000 --- a/tf +++ b/tf @@ -1 +1 @@ -Subproject commit ef3c926623860647b4a3f9e28c22863bceaa0838 +Subproject commit fcebdcb305933c80bd9f8ed3bc8f9713577f2bf3