merging zenbook branch to bosco

3 files changed, 18 insertions, 27 deletions

diff --git a/machines/khad/configuration.nix b/machines/khad/configuration.nix
index b0f8490..1f9c187 100644
--- a/machines/khad/configuration.nix
+++ b/machines/khad/configuration.nix
@@ -10,22 +10,15 @@
       ./hardware-configuration.nix
     ];
 
-  # Bootloader.
-  boot.loader.systemd-boot.enable = true;
-  boot.loader.efi.canTouchEfiVariables = true;
-
-  # Setup keyfile
-  boot.initrd.secrets = {
-    "/crypto_keyfile.bin" = null;
+  # Use the systemd-boot EFI boot loader.
+  boot = {
+    loader = {
+      systemd-boot.enable = true;
+      efi.canTouchEfiVariables = true;
+    };
+    kernelPackages = pkgs.linuxPackages_latest; # use latest kernel
   };
 
-  # Enable swap on luks
-  boot.initrd.luks.devices."luks-12daadca-e9a9-413b-9286-017b3038e5ba".device = "/dev/disk/by-uuid/12daadca-e9a9-413b-9286-017b3038e5ba";
-  boot.initrd.luks.devices."luks-12daadca-e9a9-413b-9286-017b3038e5ba".keyFile = "/crypto_keyfile.bin";
-
-  boot.initrd.luks.devices."luks-02516df1-d33b-4c83-90f8-4be7b918132e".keyFile = "/crypto_keyfile.bin";
-
-
   networking.hostName = "khad"; # Define your hostname.
   # Pick only one of the below networking options.
   # networking.wireless.enable = true;  # Enables wireless support via wpa_supplicant.
diff --git a/machines/khad/hardware-configuration.nix b/machines/khad/hardware-configuration.nix
index 9807d16..6e9d239 100644
--- a/machines/khad/hardware-configuration.nix
+++ b/machines/khad/hardware-configuration.nix
@@ -14,27 +14,23 @@
   boot.extraModulePackages = [ ];
 
   fileSystems."/" =
-    { device = "/dev/disk/by-uuid/360dd54b-c347-4ca9-adfd-3891414eeef6";
+    { device = "/dev/disk/by-uuid/17bf776d-ed6d-4a80-831c-ddd65dec14fb";
       fsType = "btrfs";
       options = [ "subvol=@" ];
     };
 
-  boot.initrd.luks.devices."luks-f6d45986-2c3d-4c6a-bc73-6753d182fef9".device = "/dev/disk/by-uuid/f6d45986-2c3d-4c6a-bc73-6753d182fef9";
-
   fileSystems."/boot" =
-    { device = "/dev/disk/by-uuid/CE2A-4E2F";
+    { device = "/dev/disk/by-uuid/83FA-1F6E";
       fsType = "vfat";
     };
 
   fileSystems."/home" =
-    { device = "/dev/disk/by-uuid/ce569948-e98c-47e0-9a1b-1e33fc1f0664";
+    { device = "/dev/disk/by-uuid/c6f221f0-f4c0-413e-821b-7363aa5c5f4c";
       fsType = "btrfs";
     };
 
-  boot.initrd.luks.devices."luks-02516df1-d33b-4c83-90f8-4be7b918132e".device = "/dev/disk/by-uuid/02516df1-d33b-4c83-90f8-4be7b918132e";
-
   swapDevices =
-    [ { device = "/dev/disk/by-uuid/8f615eac-c1a1-48c6-8d34-8059732527c0"; }
+    [ { device = "/dev/disk/by-uuid/9b961057-79f7-4024-b1ec-16f9e8af7405"; }
     ];
 
   # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
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";