various optimizations

This commit is contained in:
Ingolf Wagner 2024-07-24 00:55:55 +02:00
parent 5063b12521
commit 2492d67cd7
No known key found for this signature in database
GPG key ID: 76BF5F1928B9618B
5 changed files with 19 additions and 12 deletions

View file

@ -1,6 +1,7 @@
{ lib, ... }: { lib, ... }:
{ {
imports = [ imports = [
./chaospott.nix
./gui ./gui
./mainUser.nix ./mainUser.nix
./media ./media
@ -8,15 +9,9 @@
./network ./network
./nixos ./nixos
./terminal ./terminal
./timezone.nix
./yubikey.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";
} }

View file

@ -2,7 +2,10 @@
with lib; with lib;
with types; with types;
{ {
imports = [ ./default.nix ]; imports = [
./default.nix
../timezone.nix
];
config = { config = {
components.monitor.enable = mkDefault true; components.monitor.enable = mkDefault true;

8
components/timezone.nix Normal file
View file

@ -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";
}

View file

@ -899,11 +899,11 @@
}, },
"private_assets": { "private_assets": {
"locked": { "locked": {
"lastModified": 1718795974, "lastModified": 1721775224,
"narHash": "sha256-wK4G35I23mDBKmEZ07Xz0+064g/I+vuJ6hkXNguT7lA=", "narHash": "sha256-xVnHE46wYTJmgeviTtgsRyKXJ4LqkaMpk1gRN2b62oQ=",
"ref": "main", "ref": "main",
"rev": "77822a68120c56f6fc809a291e7d13173b8f7cea", "rev": "785897686dd7937ecc7d09ec9a2bfa7e74b458c5",
"revCount": 30, "revCount": 31,
"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"
}, },

View file

@ -175,6 +175,7 @@
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; };
zerotierDeviceName = "ztbn67ogn2"; zerotierDeviceName = "ztbn67ogn2";
components = ./components;
}; };
}; };