Merge remote-tracking branch 'origin/master' into master
This commit is contained in:
		
						commit
						e763ebcbe4
					
				@ -21,7 +21,7 @@
 | 
				
			|||||||
  networking.networkmanager.enable = true;
 | 
					  networking.networkmanager.enable = true;
 | 
				
			||||||
  networking.firewall.enable = true;
 | 
					  networking.firewall.enable = true;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  time.timeZone = "Europe/Vienna";
 | 
					  time.timeZone = "Europe/Amsterdam";
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  # Enable the OpenSSH daemon.
 | 
					  # Enable the OpenSSH daemon.
 | 
				
			||||||
  services.openssh = {
 | 
					  services.openssh = {
 | 
				
			||||||
@ -87,7 +87,7 @@
 | 
				
			|||||||
  i18n = {
 | 
					  i18n = {
 | 
				
			||||||
    defaultLocale = "en_US.UTF-8";
 | 
					    defaultLocale = "en_US.UTF-8";
 | 
				
			||||||
    extraLocaleSettings = {
 | 
					    extraLocaleSettings = {
 | 
				
			||||||
      LC_TIME = "en_GB.UTF-8";
 | 
					      # LC_TIME = "en_GB.UTF-8";
 | 
				
			||||||
      LC_PAPER = "de_AT.UTF-8";
 | 
					      LC_PAPER = "de_AT.UTF-8";
 | 
				
			||||||
    };
 | 
					    };
 | 
				
			||||||
  };
 | 
					  };
 | 
				
			||||||
 | 
				
			|||||||
@ -55,7 +55,7 @@
 | 
				
			|||||||
  networking.hostName = "murex";
 | 
					  networking.hostName = "murex";
 | 
				
			||||||
  #networking.hostId = "34a820f1";
 | 
					  #networking.hostId = "34a820f1";
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  time.timeZone = "Europe/Vienna";
 | 
					  time.timeZone = "Europe/Amsterdam";
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  environment.systemPackages = with pkgs; [
 | 
					  environment.systemPackages = with pkgs; [
 | 
				
			||||||
    raspberrypi-tools
 | 
					    raspberrypi-tools
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
		Reference in New Issue
	
	Block a user