merge

2 files changed, 15 insertions, 8 deletions

diff --git a/machines/khad/configuration.nix b/machines/khad/configuration.nix
index 3f46f5f..1f9c187 100644
--- a/machines/khad/configuration.nix
+++ b/machines/khad/configuration.nix
@@ -10,9 +10,14 @@
       ./hardware-configuration.nix
     ];
 
-  # Bootloader.
-  boot.loader.systemd-boot.enable = true;
-  boot.loader.efi.canTouchEfiVariables = true;
+  # Use the systemd-boot EFI boot loader.
+  boot = {
+    loader = {
+      systemd-boot.enable = true;
+      efi.canTouchEfiVariables = true;
+    };
+    kernelPackages = pkgs.linuxPackages_latest; # use latest kernel
+  };
 
   networking.hostName = "khad"; # Define your hostname.
   # Pick only one of the below networking options.
diff --git a/machines/zenbook/configuration.nix b/machines/zenbook/configuration.nix
index 47aecfa..41dd5f0 100644
--- a/machines/zenbook/configuration.nix
+++ b/machines/zenbook/configuration.nix
@@ -2,7 +2,7 @@
 # your system.  Help is available in the configuration.nix(5) man page
 # and in the NixOS manual (accessible by running `nixos-help`).
 
-{ config, pkgs, ... }:
+{ config, pkgs, lib, ... }:
 
 {
   imports = [
@@ -32,9 +32,10 @@
 
   services.xserver.displayManager.sddm  = {
     enableHidpi = true;
-    # settings = {
-    #   serverArguments = "-nolisten tcp -dpi 170";
-    # };
+    wayland.enable = true;
+    settings = {
+      Wayland.serverArguments = "-nolisten tcp -dpi 170";
+    };
   };
 
   networking = {
@@ -56,7 +57,8 @@
   };
 
   # Set your time zone.
-  time.timeZone = "US/Mountain";
+  time.timeZone = lib.mkDefault "US/Mountain";
+  services.automatic-timezoned.enable = true;
   # time.timeZone = "Europe/Stockholm";
   # time.timeZone = "UTC";