diff options
| author | Devin Finlinson <devin.finlinson@pm.me> | 2025-06-13 06:20:22 -0600 |
|---|---|---|
| committer | Devin Finlinson <devin.finlinson@pm.me> | 2025-06-13 06:20:22 -0600 |
| commit | 15ab87c862e119f652b99eb112d72efed6267591 (patch) | |
| tree | 096649e4b5e371c1fd20a652e913d84c2cb9fe31 /machines/picast/default.nix | |
| parent | a591d5475b78a8a3ef8dbfd3035f425466b90f40 (diff) | |
nixos 25.05 update
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/"; |