diff options
Diffstat (limited to 'machines')
| -rw-r--r-- | machines/betsy/default.nix | 2 | ||||
| -rw-r--r-- | machines/picast/default.nix | 4 |
2 files changed, 1 insertions, 5 deletions
diff --git a/machines/betsy/default.nix b/machines/betsy/default.nix index 19d3b35..4791186 100644 --- a/machines/betsy/default.nix +++ b/machines/betsy/default.nix @@ -93,7 +93,7 @@ services.printing.enable = true; # Enable sound. - hardware.pulseaudio.enable = false; + services.pulseaudio.enable = false; # OR services.pipewire = { # enable = true; 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/"; |