clean up private_assets
This commit is contained in:
parent
581d41238c
commit
a48aa680a4
4 changed files with 8 additions and 15 deletions
|
@ -792,11 +792,11 @@
|
|||
},
|
||||
"private_assets": {
|
||||
"locked": {
|
||||
"lastModified": 1723916901,
|
||||
"narHash": "sha256-/1i1OTqP8Q7DmNqvwyAmKvxxzYr9qiniNM790lKOl4c=",
|
||||
"lastModified": 1724799656,
|
||||
"narHash": "sha256-cvRt3MTi/2UbJBqG4jCDgZJR6fWaWnvA7vUwGc2mzF4=",
|
||||
"ref": "main",
|
||||
"rev": "e7a82f91a7347be4cbc786a22450a78bc11c71ce",
|
||||
"revCount": 67,
|
||||
"rev": "a1c29567b3da9a2aa33f8eb4d88f44f4f4d46deb",
|
||||
"revCount": 68,
|
||||
"type": "git",
|
||||
"url": "ssh://forgejo@git.ingolf-wagner.de/palo/nixos-private-assets.git"
|
||||
},
|
||||
|
|
|
@ -162,7 +162,7 @@
|
|||
];
|
||||
};
|
||||
specialArgs = {
|
||||
inherit private_assets inputs;
|
||||
inherit inputs;
|
||||
assets = ./assets;
|
||||
factsGenerator = clan-fact-generators.lib { inherit pkgs; };
|
||||
clanLib = import ./lib/clanlib.nix { inherit (pkgs) lib; machineDir = ./machines; };
|
||||
|
@ -332,7 +332,7 @@
|
|||
home-manager.nixosModules.home-manager
|
||||
];
|
||||
home-manager.extraSpecialArgs = {
|
||||
inherit private_assets;
|
||||
#inherit private_assets;
|
||||
assets = ./assets;
|
||||
};
|
||||
home-manager.useGlobalPkgs = true;
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
{ pkgs, lib, config, private_assets, ... }:
|
||||
{ pkgs, lib, config, ... }:
|
||||
|
||||
{
|
||||
imports = [ ./hass-mqtt.nix ];
|
||||
|
@ -20,9 +20,6 @@
|
|||
base_topic = "zigbee2mqtt";
|
||||
# MQTT server URL
|
||||
server = "mqtt://127.0.0.1:1883";
|
||||
# MQTT server authentication, uncomment if required:
|
||||
user = "zigbee";
|
||||
password = lib.fileContents "${private_assets}/zigbee/home-assistant-password";
|
||||
};
|
||||
|
||||
# Serial settings
|
||||
|
@ -33,11 +30,7 @@
|
|||
disable_led = true;
|
||||
};
|
||||
|
||||
# you own network key,
|
||||
# 16 numbers between 0 and 255
|
||||
# see https://www.zigbee2mqtt.io/how_tos/how_to_secure_network.html
|
||||
advanced = {
|
||||
network_key = import "${private_assets}/zigbee/networkKey.nix";
|
||||
log_output = [ "console" ];
|
||||
log_level = "warn";
|
||||
pan_id = 1337;
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
{ config, lib, pkgs, private_assets, assets, ... }:
|
||||
{ config, lib, pkgs, assets, ... }:
|
||||
let
|
||||
# todo create flake for this
|
||||
errorPages = pkgs.fetchFromGitHub {
|
||||
|
|
Loading…
Reference in a new issue