diff --git a/components/default.nix b/components/default.nix index 41cb29f..4341dea 100644 --- a/components/default.nix +++ b/components/default.nix @@ -1,6 +1,7 @@ { lib, ... }: { imports = [ + ./chaospott.nix ./gui ./mainUser.nix ./media @@ -8,15 +9,9 @@ ./network ./nixos ./terminal + ./timezone.nix ./yubikey.nix - ./chaospott.nix ]; - # some system stuff - # ----------------- - time.timeZone = "Europe/Berlin"; - #time.timeZone = lib.mkDefault "Pacific/Auckland"; - #time.timeZone = lib.mkDefault "Asia/Singapore"; - #time.timeZone = lib.mkDefault "Asia/Makassar"; } diff --git a/components/monitor/container.nix b/components/monitor/container.nix index 947a5e8..3b2a536 100644 --- a/components/monitor/container.nix +++ b/components/monitor/container.nix @@ -2,7 +2,10 @@ with lib; with types; { - imports = [ ./default.nix ]; + imports = [ + ./default.nix + ../timezone.nix + ]; config = { components.monitor.enable = mkDefault true; diff --git a/components/timezone.nix b/components/timezone.nix new file mode 100644 index 0000000..e1f8027 --- /dev/null +++ b/components/timezone.nix @@ -0,0 +1,8 @@ +{ + # some system stuff + # ----------------- + time.timeZone = "Europe/Berlin"; + #time.timeZone = lib.mkDefault "Pacific/Auckland"; + #time.timeZone = lib.mkDefault "Asia/Singapore"; + #time.timeZone = lib.mkDefault "Asia/Makassar"; +} diff --git a/flake.lock b/flake.lock index 366783a..8d9265a 100644 --- a/flake.lock +++ b/flake.lock @@ -899,11 +899,11 @@ }, "private_assets": { "locked": { - "lastModified": 1718795974, - "narHash": "sha256-wK4G35I23mDBKmEZ07Xz0+064g/I+vuJ6hkXNguT7lA=", + "lastModified": 1721775224, + "narHash": "sha256-xVnHE46wYTJmgeviTtgsRyKXJ4LqkaMpk1gRN2b62oQ=", "ref": "main", - "rev": "77822a68120c56f6fc809a291e7d13173b8f7cea", - "revCount": 30, + "rev": "785897686dd7937ecc7d09ec9a2bfa7e74b458c5", + "revCount": 31, "type": "git", "url": "ssh://forgejo@git.ingolf-wagner.de/palo/nixos-private-assets.git" }, diff --git a/flake.nix b/flake.nix index c29571e..c967a6c 100644 --- a/flake.nix +++ b/flake.nix @@ -175,6 +175,7 @@ factsGenerator = clan-fact-generators.lib { inherit pkgs; }; clanLib = import ./lib/clanlib.nix { inherit (pkgs) lib; machineDir = ./machines; }; zerotierDeviceName = "ztbn67ogn2"; + components = ./components; }; };