summaryrefslogtreecommitdiff
path: root/machines/picast/default.nix
diff options
context:
space:
mode:
Diffstat (limited to 'machines/picast/default.nix')
-rw-r--r--machines/picast/default.nix6
1 files changed, 5 insertions, 1 deletions
diff --git a/machines/picast/default.nix b/machines/picast/default.nix
index 827045f..ff10ad5 100644
--- a/machines/picast/default.nix
+++ b/machines/picast/default.nix
@@ -28,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/";
@@ -69,7 +73,7 @@
# Some programs need SUID wrappers, can be configured further or are
# started in user sessions.
- # programs.mtr.enable = true;
+ programs.mtr.enable = true;
# programs.gnupg.agent = {
# enable = true;
# enableSSHSupport = true;