Merge remote-tracking branch 'origin/master' into master

This commit is contained in:
Gabriel Ebner 2020-08-22 14:42:34 +02:00
commit e763ebcbe4
2 changed files with 3 additions and 3 deletions

@ -21,7 +21,7 @@
networking.networkmanager.enable = true;
networking.firewall.enable = true;
time.timeZone = "Europe/Vienna";
time.timeZone = "Europe/Amsterdam";
# Enable the OpenSSH daemon.
services.openssh = {
@ -87,7 +87,7 @@
i18n = {
defaultLocale = "en_US.UTF-8";
extraLocaleSettings = {
LC_TIME = "en_GB.UTF-8";
# LC_TIME = "en_GB.UTF-8";
LC_PAPER = "de_AT.UTF-8";
};
};

@ -55,7 +55,7 @@
networking.hostName = "murex";
#networking.hostId = "34a820f1";
time.timeZone = "Europe/Vienna";
time.timeZone = "Europe/Amsterdam";
environment.systemPackages = with pkgs; [
raspberrypi-tools