diff options
| author | lassulus <lassulus@lassul.us> | 2020-12-30 09:13:07 +0100 |
|---|---|---|
| committer | lassulus <lassulus@lassul.us> | 2020-12-30 09:13:07 +0100 |
| commit | e0bb61d3d3c2e053ab8c8c22f9cdded409ecece7 (patch) | |
| tree | cb00a8eeead2d80cb05bc561005b8e9cf6edfb6a /makefu | |
| parent | ba47b90d7326c262f3e3327781a16fd8400df062 (diff) | |
| parent | c370c87da36bc256cfbc59bb2b0b9ffa1d457168 (diff) | |
Merge remote-tracking branch 'gum/master'
Diffstat (limited to 'makefu')
| -rw-r--r-- | makefu/2configs/ham/automation/light_buttons.nix | 33 | ||||
| -rw-r--r-- | makefu/2configs/ham/default.nix | 1 | ||||
| -rw-r--r-- | makefu/2configs/ham/light/groups.nix | 2 | ||||
| -rw-r--r-- | makefu/2configs/home-manager/zsh.nix | 3 |
4 files changed, 37 insertions, 2 deletions
diff --git a/makefu/2configs/ham/automation/light_buttons.nix b/makefu/2configs/ham/automation/light_buttons.nix new file mode 100644 index 000000000..7b43027f1 --- /dev/null +++ b/makefu/2configs/ham/automation/light_buttons.nix @@ -0,0 +1,33 @@ +let + toggle = light: btn: + { + alias = "Toggle Light ${light} via ${btn}"; + trigger = { + platform = "state"; + entity_id = "sensor.${btn}_click"; + to = "single"; + }; + action = { + service = "light.toggle"; + entity = light; + }; + }; + turn_off_all = btn: + { + alias = "Turn of all lights via ${btn} double click"; + trigger = { + platform = "state"; + entity_id = "sensor.${btn}_click"; + to = "double"; + }; + action = { + service = "light.turn_off"; + entity = "light.alle_lichter"; + }; + }; +in { + services.home-assistant.config.automation = [ + (toggle "light.wohnzimmer_lichter" "btn3") + (turn_off_all "btn3") + ]; +} diff --git a/makefu/2configs/ham/default.nix b/makefu/2configs/ham/default.nix index 9e3f7f669..1cd06f6a5 100644 --- a/makefu/2configs/ham/default.nix +++ b/makefu/2configs/ham/default.nix @@ -26,6 +26,7 @@ in { ./calendar/nextcloud.nix ./automation/firetv_restart.nix + ./automation/light_buttons.nix ./light/groups.nix ]; diff --git a/makefu/2configs/ham/light/groups.nix b/makefu/2configs/ham/light/groups.nix index e1812b68a..274fd60a3 100644 --- a/makefu/2configs/ham/light/groups.nix +++ b/makefu/2configs/ham/light/groups.nix @@ -13,7 +13,7 @@ let "light.wohnzimmer_stehlampe_osram_light" ]; schlafzimmer_licht = [ - "schlafzimmer_komode_osram_light" + "light.schlafzimmer_komode_osram_light" ]; in { services.home-assistant.config.light = [ diff --git a/makefu/2configs/home-manager/zsh.nix b/makefu/2configs/home-manager/zsh.nix index 862ee5df3..8d6c1f2f0 100644 --- a/makefu/2configs/home-manager/zsh.nix +++ b/makefu/2configs/home-manager/zsh.nix @@ -52,6 +52,7 @@ xo = "mimeopen"; nmap = "nmap -oN $HOME/loot/scan-`date +\%s`.nmap -oX $HOME/loot/scan-`date +%s`.xml"; }; + # navi package does not come with the navi.plugin.zsh anymore so we use .src initExtra = '' bindkey -e # shift-tab @@ -69,7 +70,7 @@ zstyle ':completion::complete:secrets::' prefix "$HOME/.secrets-pass/" # navi - source ${pkgs.navi}/share/navi/shell/navi.plugin.zsh + . ${pkgs.navi.src}/shell/navi.plugin.zsh # ctrl-x ctrl-e autoload -U compinit && compinit autoload -U edit-command-line |