From 7237ed70b0659fd3262624b4ad98833af68bd36e Mon Sep 17 00:00:00 2001
From: Dave Gallant <davegallant@gmail.com>
Date: Mon, 17 Oct 2022 20:35:05 -0400
Subject: [PATCH] Update packages for hephaestus

---
 common/desktop.nix                    |  5 +--
 machines/hephaestus/configuration.nix | 14 +--------
 machines/hephaestus/hardware.nix      | 44 +++++++++++++++------------
 modules/overlays/keyleds/default.nix  |  2 +-
 packages/common.nix                   |  2 +-
 packages/desktop.nix                  |  4 +--
 6 files changed, 31 insertions(+), 40 deletions(-)

diff --git a/common/desktop.nix b/common/desktop.nix
index 664af3e..0fd0b4f 100644
--- a/common/desktop.nix
+++ b/common/desktop.nix
@@ -2,11 +2,8 @@
   services.xserver = {
     enable = true;
     displayManager = {
-      lightdm = {
-        enable = true;
-      };
       gdm = {
-        enable = false;
+        enable = true;
         wayland = true;
       };
     };
diff --git a/machines/hephaestus/configuration.nix b/machines/hephaestus/configuration.nix
index be5c28d..52a99cc 100644
--- a/machines/hephaestus/configuration.nix
+++ b/machines/hephaestus/configuration.nix
@@ -5,10 +5,6 @@
 }: {
   imports = [./hardware.nix];
 
-  # Use the systemd-boot EFI boot loader.
-  boot.loader.systemd-boot.enable = true;
-  boot.loader.efi.canTouchEfiVariables = true;
-
   hardware.opengl.enable = true;
 
   networking = {
@@ -35,14 +31,6 @@
   services.tailscale = {enable = true;};
 
   services.xserver = {
-    videoDrivers = ["nvidia"];
-    deviceSection = ''
-      Option    "Coolbits" "4"
-    '';
-    exportConfiguration = true;
+    videoDrivers = ["amdgpu"];
   };
-
-  services.udev.extraRules = ''
-    KERNEL=="hidraw*", SUBSYSTEM=="hidraw", MODE="0666"
-  '';
 }
diff --git a/machines/hephaestus/hardware.nix b/machines/hephaestus/hardware.nix
index 607ec6a..e480e87 100644
--- a/machines/hephaestus/hardware.nix
+++ b/machines/hephaestus/hardware.nix
@@ -14,37 +14,43 @@
     xpadneo
   ];
 
-  powerManagement.cpuFreqGovernor = "balanced";
+  boot.loader.efi.canTouchEfiVariables = true;
+  boot.loader.efi.efiSysMountPoint = "/boot/efi";
 
-  boot.initrd.luks.devices = {
-    luksroot = {
+  boot.loader.grub = {
+    enable = true;
+    device = "nodev";
+    version = 2;
+    efiSupport = true;
+    enableCryptodisk = true;
+  };
+
+  boot.initrd = {
+    luks.devices."root" = {
       allowDiscards = true;
-      device = "/dev/disk/by-uuid/570a2b97-3310-4784-9138-6e09037cea17";
+      device = "/dev/disk/by-uuid/21cd166c-1528-49a4-b31b-0d408d48aa80";
       preLVM = true;
+      keyFile = "./keyfile0.bin";
     };
-
-    luksstorage = {
-      allowDiscards = true;
-      device = "/dev/disk/by-uuid/23b54f60-1eb8-4bf1-b04c-79f8537c228a";
-      preLVM = true;
+    secrets = {
+      "keyfile0.bin" = "/etc/secrets/initrd/keyfile0.bin";
     };
   };
 
+  hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
+  hardware.video.hidpi.enable = lib.mkDefault true;
+
   fileSystems."/" = {
-    device = "/dev/disk/by-uuid/8cfaf3d2-1cae-48b0-a37b-6c192f0b2680";
+    device = "/dev/disk/by-uuid/a6723178-6f18-428e-b541-9ac901861125";
     fsType = "ext4";
   };
 
-  fileSystems."/boot" = {
-    device = "/dev/disk/by-uuid/2368-A8CE";
+  fileSystems."/boot/efi" = {
+    device = "/dev/disk/by-uuid/3CFD-D749";
     fsType = "vfat";
   };
 
-  swapDevices = [{device = "/dev/disk/by-uuid/aca92a73-2941-40ca-88c4-0dd8607d232a";}];
-
-  fileSystems."/mnt/storage" = {
-    device = "/dev/disk/by-uuid/0f592fca-1d4e-43f7-9bf4-f1c3e19e841f";
-    fsType = "ext4";
-  };
-  hardware.video.hidpi.enable = lib.mkDefault true;
+  swapDevices = [
+    {device = "/dev/disk/by-uuid/5d6d0388-2b15-4ff1-9f0f-391818a76090";}
+  ];
 }
diff --git a/modules/overlays/keyleds/default.nix b/modules/overlays/keyleds/default.nix
index 543078b..23001d7 100644
--- a/modules/overlays/keyleds/default.nix
+++ b/modules/overlays/keyleds/default.nix
@@ -28,6 +28,6 @@ stdenv.mkDerivation rec {
     chmod +x $out/bin/set-leds.sh
   '';
 
-  nativeBuildInputs = with pkgs; [cmake pkgconfig];
+  nativeBuildInputs = with pkgs; [cmake pkg-config];
   buildInputs = with pkgs; [xlibsWrapper xorg.libXi libuv systemd luajit libyaml];
 }
diff --git a/packages/common.nix b/packages/common.nix
index f3d4ad3..f6cb15f 100644
--- a/packages/common.nix
+++ b/packages/common.nix
@@ -103,7 +103,7 @@ in {
       openssl
       openvpn
       sshfs # mac requires https://osxfuse.github.io/
-      vpngate
+      #vpngate
       whois
 
       # backup
diff --git a/packages/desktop.nix b/packages/desktop.nix
index 3989425..fb4ffa6 100644
--- a/packages/desktop.nix
+++ b/packages/desktop.nix
@@ -19,7 +19,7 @@ in {
       firefox
       ghostscript
       gimp-with-plugins
-      gnome3.gnome-tweaks
+      gnome.gnome-tweaks
       gnomeExtensions.appindicator
       guake
       i3lock-fancy-rapid
@@ -34,7 +34,7 @@ in {
       spotify
       steam
       usbutils
-      virtmanager
+      virt-manager
       vlc
       wireshark-qt
       xautolock