From 171e3312453d9844bd971a807801ef08c3df6b33 Mon Sep 17 00:00:00 2001 From: Tyler Starr Date: Thu, 2 Jan 2025 23:41:56 -0800 Subject: [PATCH 1/4] update torus backup borg yaml --- home/dot_config/borgmatic.d/torus_apps.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/home/dot_config/borgmatic.d/torus_apps.yaml b/home/dot_config/borgmatic.d/torus_apps.yaml index e76cab7e..99d52ef0 100644 --- a/home/dot_config/borgmatic.d/torus_apps.yaml +++ b/home/dot_config/borgmatic.d/torus_apps.yaml @@ -5,6 +5,8 @@ exclude_patterns: - '**/code-server/config/**' - '**/code-server/workspace/**' - '**/immich/library/**' + - '**/immich/postgres/**' + - '**/dufs/**' before_backup: - stop-docker-containers From f09ab8fab6d1c6b77d7f6a385f00be115b032e48 Mon Sep 17 00:00:00 2001 From: Tyler Starr Date: Fri, 3 Jan 2025 00:16:49 -0800 Subject: [PATCH 2/4] update samba config for newer nixpkgs --- provision/hosts/torus/samba-server.nix | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/provision/hosts/torus/samba-server.nix b/provision/hosts/torus/samba-server.nix index 44f91698..695233a4 100644 --- a/provision/hosts/torus/samba-server.nix +++ b/provision/hosts/torus/samba-server.nix @@ -2,16 +2,18 @@ { services.samba = { enable = true; - extraConfig = '' - workgroup = WORKGROUP - server string = smbnix - netbios name = smbnix - security = user - hosts allow = 192.168.3. 192.168.1. 127.0.0.1 localhost - hosts deny = 0.0.0.0/0 - guest account = nobody - map to guest = bad user - ''; + settings = { + global = { + "workgroup" = "WORKGROUP"; + "server string" = "smbnix"; + "netbios name" = "smbnix"; + "security" = "user"; + "hosts allow" = [ "192.168.3." "192.168.1." "127.0.0.1" "localhost" ]; + "hosts deny" = "0.0.0.0/0"; + "guest account" = "nobody"; + "map to guest" = "bad user"; + }; + }; shares = { private = { From 6c5604eaa1b9b288121f19799e0d475a4b685bae Mon Sep 17 00:00:00 2001 From: Tyler Starr Date: Fri, 3 Jan 2025 01:03:30 -0800 Subject: [PATCH 3/4] remove nix defined automations for homeassistant --- .../torus/home-assistant/automations.nix | 56 ------------------- 1 file changed, 56 deletions(-) diff --git a/provision/hosts/torus/home-assistant/automations.nix b/provision/hosts/torus/home-assistant/automations.nix index 79d1a9bb..99455a7b 100644 --- a/provision/hosts/torus/home-assistant/automations.nix +++ b/provision/hosts/torus/home-assistant/automations.nix @@ -1,62 +1,6 @@ { config, lib, pkgs, user, ... }: { services.home-assistant.config = { - "automation manual" = [ - { - alias = "turn on christmas lights"; - trigger = { - platform = "time"; - at = "16:45"; - }; - action = [ - { - type = "turn_on"; - device_id = "32bf8baf1214391472566d4300c7d6fb"; - entity_id = "72c7694c3a3aed5d67499bfe0574346b"; - domain = "switch"; - } - { - type = "turn_on"; - device_id = "08db6bd9e7bf98d5bf1b08351b909c94"; - entity_id = "ecec82df2265c6b92c8474fe0c9fde6b"; - domain = "switch"; - } - { - type = "turn_on"; - device_id = "f3da07b98e397fba271d2ee7016134b7"; - entity_id = "d23d2fc18b7cb7bab0f1075b55ca5df5"; - domain = "switch"; - } - ]; - } - { - alias = "turn off christmas lights"; - trigger = { - platform = "time"; - at = "23:59"; - }; - action = [ - { - type = "turn_off"; - device_id = "32bf8baf1214391472566d4300c7d6fb"; - entity_id = "72c7694c3a3aed5d67499bfe0574346b"; - domain = "switch"; - } - { - type = "turn_off"; - device_id = "08db6bd9e7bf98d5bf1b08351b909c94"; - entity_id = "ecec82df2265c6b92c8474fe0c9fde6b"; - domain = "switch"; - } - { - type = "turn_off"; - device_id = "f3da07b98e397fba271d2ee7016134b7"; - entity_id = "d23d2fc18b7cb7bab0f1075b55ca5df5"; - domain = "switch"; - } - ]; - } - ]; "automation ui" = "!include automations.yaml"; }; } From 47028769669eb1dff629a766319e299edcfc6367 Mon Sep 17 00:00:00 2001 From: Tyler Starr Date: Fri, 3 Jan 2025 01:07:18 -0800 Subject: [PATCH 4/4] fix hostname error in torus --- provision/hosts/torus/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/provision/hosts/torus/default.nix b/provision/hosts/torus/default.nix index e60e2cd3..60b9005b 100644 --- a/provision/hosts/torus/default.nix +++ b/provision/hosts/torus/default.nix @@ -4,7 +4,7 @@ let hostname = specialArgs.hostname; in { inherit system; - specialArgs = { inherit user inputs home-manager; }; + specialArgs = { inherit user hostname inputs home-manager; }; modules = [ ../default # shared by all configs ../default/physical/configuration.nix # shared by physical machines