diff options
| author | Devin Finlinson <devin.finlinson@pm.me> | 2025-06-21 00:22:34 +0000 |
|---|---|---|
| committer | Devin Finlinson <devin.finlinson@pm.me> | 2025-06-21 00:22:34 +0000 |
| commit | 6f285dddf7c6ba51ba9e486fb1c6809661847f2a (patch) | |
| tree | 5dff58960ae53c0dcce1c5f8e61f847ffdbcc45b /machines/picast/default.nix | |
| parent | 0b9be465194cf7f4462936e6d797beaf5b978839 (diff) | |
| parent | 41bb50dba8c42b8cd7e7c1719d7793a1ca279157 (diff) | |
Merge branch 'master' of ssh://bosco:2200/srv/git/.flake
Diffstat (limited to 'machines/picast/default.nix')
| -rw-r--r-- | machines/picast/default.nix | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/machines/picast/default.nix b/machines/picast/default.nix index ff10ad5..4d24de8 100644 --- a/machines/picast/default.nix +++ b/machines/picast/default.nix @@ -28,11 +28,7 @@ # 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/"; |