gensokyo-zone/infrastructure
1
0
Fork 0
mirror of https://github.com/gensokyo-zone/infrastructure.git synced 2026-02-09 12:29:19 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix: home-assistant config levels

Browse source
This commit is contained in:
Kat Inskip 2022-10-25 10:45:31 -07:00
parent ce7aee4a3d
commit e7e1fd3bfd
Signed by: kat
GPG key ID: 465E64DECEA8CF0F
7 changed files with 41 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

60
flake.lock generated
View file

@ -3,11 +3,11 @@
"arcexprs": { "arcexprs": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1664737885, "lastModified": 1666550207,
"narHash": "sha256-ppcK2iEo949aGMVVXoqYs3H0K0jhPTDdUj+Dt1abIW0=", "narHash": "sha256-WsEyJ4L9mhcvMW31aQ4bQg/SmNq4243odALNi9vFhCY=",
"owner": "arcnmx", "owner": "arcnmx",
"repo": "nixexprs", "repo": "nixexprs",
"rev": "4e09592dade1388d900ab3524bc240ce75b14abb", "rev": "436beaa14af3a8831de5a524d0a2e8aa9e02bef3",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -20,11 +20,11 @@
"ci": { "ci": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1664566287, "lastModified": 1666307524,
"narHash": "sha256-DysbqsNrLAGI4VU9HlP3qXe1b0P3N9mGGttmr3xUCHU=", "narHash": "sha256-JhZerh9vS9yj83S27tktgUtets4WFXsVHhVSAhSlG0k=",
"owner": "arcnmx", "owner": "arcnmx",
"repo": "ci", "repo": "ci",
"rev": "3f5f6df67088485d422b97d3a41fe259e2bdc53e", "rev": "f7637bbdbd7943388508556fbce8ad12ab44d2ff",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -41,11 +41,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1664210064, "lastModified": 1666519227,
"narHash": "sha256-df6nKVZe/yAhmJ9csirTPahc0dldwm3HBhCVNA6qWr0=", "narHash": "sha256-z74lSCJE5BzxCeE2r9FU4tvHkQXQyz70zmJ3coLP10w=",
"owner": "lnl7", "owner": "lnl7",
"repo": "nix-darwin", "repo": "nix-darwin",
"rev": "02d2551c927b7d65ded1b3c7cd13da5cc7ae3fcf", "rev": "8be7f197120739b3ec15f994bdc48116726c6159",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -91,11 +91,11 @@
"emacs-overlay": { "emacs-overlay": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1664478431, "lastModified": 1666298449,
"narHash": "sha256-XTPklm/+e2UfIitB0+s/fKTheMJSw3G1p+t0SsBCuo4=", "narHash": "sha256-y1SRRRK2eTVuh/HRCxwDSInMwGv0d5cPIp4YDlbcM30=",
"owner": "nix-community", "owner": "nix-community",
"repo": "emacs-overlay", "repo": "emacs-overlay",
"rev": "6c78924bc5b6daaf98c0dbe63bdfcf80e6433f4b", "rev": "b8e24cec99ff68f8a875b6f842a10b6b2ab398d3",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -342,11 +342,11 @@
"ws-butler": "ws-butler" "ws-butler": "ws-butler"
}, },
"locked": { "locked": {
"lastModified": 1664622347, "lastModified": 1666441658,
"narHash": "sha256-pJTnEG68PhrXjpkfz/784BlcxaHgV06b1cUVGRxhMdw=", "narHash": "sha256-viSycvYPWInoNoVVzOKcZBtIppK18GuAawqUwGeliKM=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nix-doom-emacs", "repo": "nix-doom-emacs",
"rev": "b65e204ce9d20b376acc38ec205d08007eccdaef", "rev": "450d891c61eaae70963f319d161c135e401f30c7",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -373,11 +373,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1664538465, "lastModified": 1666447894,
"narHash": "sha256-EnlC7dDKX7X1wlnXkB1gmn9rBZQ0J9+biVTZHw//8us=", "narHash": "sha256-i9WHX4w/et4qPMzEXd9POmnO0/bthjr7R4cblKNHGms=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "10ecda252ce1b3b1d6403caeadbcc8f30d5ab796", "rev": "95aeaf83c247b8f5aa561684317ecd860476fcd6",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -405,11 +405,11 @@
}, },
"nur": { "nur": {
"locked": { "locked": {
"lastModified": 1664718272, "lastModified": 1666549958,
"narHash": "sha256-BNnUks1BKzBr8HzoKBFQ8a7/avQhDkKCu0DSgW1ulcY=", "narHash": "sha256-EX0xB+eyyeeeMXpqGeCqpwK5DZu50otvzXYZ6bp6SmI=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nur", "repo": "nur",
"rev": "392b26288ad1cdebd03eac17adb70491f9f392d3", "rev": "1ee2bab665e18e159edc312f6687406bcd23bfe4",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -438,11 +438,11 @@
"org": { "org": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1664493874, "lastModified": 1666258795,
"narHash": "sha256-8zLosjfQX0aR5HprtCeiSqN1pfB+GEUF9AULk6WRcR4=", "narHash": "sha256-k2FbWk4OJKZbih3pTvJYxkaXuauWsuaXXthV54UFqCM=",
"owner": "emacs-straight", "owner": "emacs-straight",
"repo": "org-mode", "repo": "org-mode",
"rev": "fe1f4f2ccf040deff9c57288d987f17cc2da321f", "rev": "98cae03b7d9a612334d5ea461e73ac0b37b0285d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -502,11 +502,11 @@
"revealjs": { "revealjs": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1664012352, "lastModified": 1665992801,
"narHash": "sha256-Pu5p6HqIO2wvWiTEhsQyIuwlWEIa1GjO3EDXosznyYE=", "narHash": "sha256-bqNgaBT6WPfumhdG1VPZ6ngn0QA9RDuVtVJtVwxbOd4=",
"owner": "hakimel", "owner": "hakimel",
"repo": "reveal.js", "repo": "reveal.js",
"rev": "468132320d6e072abd1297d7cc24766a2b7a832d", "rev": "f6f657b627f9703e32414d8d3f16fb49d41031cb",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -566,11 +566,11 @@
"tf-nix": { "tf-nix": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1663367102, "lastModified": 1666390187,
"narHash": "sha256-gcUzQDyXogvQ0TSYX2lrKQ5D/3k76w/lmL6tNrnNwXk=", "narHash": "sha256-BGF4rvuirlL+/P/BrNCMceHWdZKsCv27bHS2Iy0r6kQ=",
"owner": "arcnmx", "owner": "arcnmx",
"repo": "tf-nix", "repo": "tf-nix",
"rev": "133b92ea58c8c0cd7d02674013d67b54e169141f", "rev": "0d5ff00ba1799167a9ee33e1ca11508d66cae4ce",
"type": "github" "type": "github"
}, },
"original": { "original": {

2
hardware/oracle/common.nix
View file

@ -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 = deploy.tf =
let let

3
home/state.nix
View file

@ -1,3 +1,6 @@
{ config, ... }: { { config, ... }: {
home.stateVersion = "20.09"; home.stateVersion = "20.09";
manual = {
manpages.enable = false;
};
} }

2
modules/nixos/storage.nix
View file

@ -50,7 +50,7 @@
}; };
}; };
config = mkMerge [ config = mkMerge [
(mkIf cfg.enable { (mkIf false {
environment.systemPackages = [ pkgs.glusterfs ]; environment.systemPackages = [ pkgs.glusterfs ];
services.glusterfs = { services.glusterfs = {

2
nixos/gui/adb.nix
View file

@ -1,4 +1,4 @@
{ config, ... }: { { config, ... }: {
programs.adb.enable = true; programs.adb.enable = false;
users.users.kat.extraGroups = [ "adbusers" ]; users.users.kat.extraGroups = [ "adbusers" ];
} }

8
nixos/systems/tewi/home-assistant.nix
View file

@ -1,5 +1,6 @@
{ config, lib, tf, ... }: let { config, lib, tf, ... }: let
inherit (lib.attrsets) attrNames filterAttrs mapAttrs' nameValuePair; inherit (lib.attrsets) attrNames filterAttrs mapAttrs' nameValuePair;
inherit (lib.strings) hasPrefix;
in { in {
# MDNS # MDNS
services.avahi.enable = true; services.avahi.enable = true;
@ -103,9 +104,6 @@ in {
services.home-assistant = { services.home-assistant = {
enable = true; enable = true;
config = { config = {
packages = {
manual = "!include manual.yaml";
};
homeassistant = { homeassistant = {
name = "Gensokyo"; name = "Gensokyo";
unit_system = "metric"; unit_system = "metric";
@ -115,6 +113,9 @@ in {
currency = "CAD"; currency = "CAD";
time_zone = "America/Vancouver"; time_zone = "America/Vancouver";
external_url = "https://home.gensokyo.zone"; external_url = "https://home.gensokyo.zone";
packages = {
manual = "!include manual.yaml";
};
}; };
frontend = { frontend = {
themes = "!include_dir_merge_named themes"; themes = "!include_dir_merge_named themes";
@ -381,7 +382,6 @@ in {
extraPackages = python3Packages: with python3Packages; [ extraPackages = python3Packages: with python3Packages; [
psycopg2 psycopg2
aiohomekit aiohomekit
pkgs.withings-api
securetar securetar
getmac # for upnp integration getmac # for upnp integration
(aiogithubapi.overrideAttrs (_: { doInstallCheck = false; })) (aiogithubapi.overrideAttrs (_: { doInstallCheck = false; }))

2
tf

@ -1 +1 @@
Subproject commit ef3c926623860647b4a3f9e28c22863bceaa0838 Subproject commit fcebdcb305933c80bd9f8ed3bc8f9713577f2bf3