palo/nixos-config
palo/nixos-config
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

clean up private_assets

Browse source
This commit is contained in:
Ingolf Wagner 2024-08-28 06:02:37 +07:00
parent 581d41238c
commit a48aa680a4
No known key found for this signature in database
GPG key ID: 76BF5F1928B9618B
4 changed files with 8 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
flake.lock
View file

@ -792,11 +792,11 @@
}, },
"private_assets": { "private_assets": {
"locked": { "locked": {
"lastModified": 1723916901, "lastModified": 1724799656,
"narHash": "sha256-/1i1OTqP8Q7DmNqvwyAmKvxxzYr9qiniNM790lKOl4c=", "narHash": "sha256-cvRt3MTi/2UbJBqG4jCDgZJR6fWaWnvA7vUwGc2mzF4=",
"ref": "main", "ref": "main",
"rev": "e7a82f91a7347be4cbc786a22450a78bc11c71ce", "rev": "a1c29567b3da9a2aa33f8eb4d88f44f4f4d46deb",
"revCount": 67, "revCount": 68,
"type": "git", "type": "git",
"url": "ssh://forgejo@git.ingolf-wagner.de/palo/nixos-private-assets.git" "url": "ssh://forgejo@git.ingolf-wagner.de/palo/nixos-private-assets.git"
}, },

4
flake.nix
View file

@ -162,7 +162,7 @@
]; ];
}; };
specialArgs = { specialArgs = {
inherit private_assets inputs; inherit inputs;
assets = ./assets; assets = ./assets;
factsGenerator = clan-fact-generators.lib { inherit pkgs; }; factsGenerator = clan-fact-generators.lib { inherit pkgs; };
clanLib = import ./lib/clanlib.nix { inherit (pkgs) lib; machineDir = ./machines; }; clanLib = import ./lib/clanlib.nix { inherit (pkgs) lib; machineDir = ./machines; };
@ -332,7 +332,7 @@
home-manager.nixosModules.home-manager home-manager.nixosModules.home-manager
]; ];
home-manager.extraSpecialArgs = { home-manager.extraSpecialArgs = {
inherit private_assets; #inherit private_assets;
assets = ./assets; assets = ./assets;
}; };
home-manager.useGlobalPkgs = true; home-manager.useGlobalPkgs = true;

9
machines/chungus/hass-zigbee2mqtt.nix
View file

@ -1,4 +1,4 @@
{ pkgs, lib, config, private_assets, ... }: { pkgs, lib, config, ... }:
{ {
imports = [ ./hass-mqtt.nix ]; imports = [ ./hass-mqtt.nix ];
@ -20,9 +20,6 @@
base_topic = "zigbee2mqtt"; base_topic = "zigbee2mqtt";
# MQTT server URL # MQTT server URL
server = "mqtt://127.0.0.1:1883"; 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 # Serial settings
@ -33,11 +30,7 @@
disable_led = true; 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 = { advanced = {
network_key = import "${private_assets}/zigbee/networkKey.nix";
log_output = [ "console" ]; log_output = [ "console" ];
log_level = "warn"; log_level = "warn";
pan_id = 1337; pan_id = 1337;

2
machines/orbi/nginx-ingolf-wagner-de.nix
View file

@ -1,4 +1,4 @@
{ config, lib, pkgs, private_assets, assets, ... }: { config, lib, pkgs, assets, ... }:
let let
# todo create flake for this # todo create flake for this
errorPages = pkgs.fetchFromGitHub { errorPages = pkgs.fetchFromGitHub {