diff options
Diffstat (limited to 'machines/picast/default.nix')
| -rw-r--r-- | machines/picast/default.nix | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/machines/picast/default.nix b/machines/picast/default.nix index bf0beac..ff10ad5 100644 --- a/machines/picast/default.nix +++ b/machines/picast/default.nix @@ -12,7 +12,6 @@ ../../modules/nixos/nix-common.nix ../../modules/nixos/environment.nix ../../modules/nixos/tailscale.nix - # ../../modules/nixos/cgit.nix ../../modules/nixos/system-packages.nix ../../modules/users/defin.nix ../../modules/users/root.nix @@ -29,7 +28,11 @@ # networking.networkmanager.enable = true; # Easiest to use and most distros use this by default. # Set your time zone. +<<<<<<< HEAD + time.timeZone = "US/Mountain"; +======= time.timeZone = "America/Denver"; +>>>>>>> 7d7f5905769c488d2129b2ec0ade6451f0765d84 # Configure network proxy if necessary # networking.proxy.default = "http://user:password@proxy:port/"; |