From 09b3b55b9874ed217452337ede59cd03d1244040 Mon Sep 17 00:00:00 2001
From: Aly Raffauf <aly@raffauflabs.com>
Date: Sun, 13 Oct 2024 18:11:33 -0400
Subject: [PATCH] cleanup before merge

---
 hosts/pacifidlog/default.nix           | 23 ++++++++++-------------
 hosts/pacifidlog/home.nix              |  7 -------
 hwModules/lenovo/legion/go/default.nix |  6 +++++-
 3 files changed, 15 insertions(+), 21 deletions(-)

diff --git a/hosts/pacifidlog/default.nix b/hosts/pacifidlog/default.nix
index 89b638f5..b8f89a44 100644
--- a/hosts/pacifidlog/default.nix
+++ b/hosts/pacifidlog/default.nix
@@ -5,7 +5,10 @@
   lib,
   self,
   ...
-}: {
+}: let
+  adjustor = pkgs.callPackage ./adjustor.nix {};
+  hhd-ui = pkgs.callPackage ./hhd-ui.nix {};
+in {
   imports = [
     ./home.nix
     ./secrets.nix
@@ -23,10 +26,7 @@
   ];
 
   boot = {
-    initrd = {
-      kernelModules = ["amdgpu"];
-      systemd.enable = true;
-    };
+    initrd.systemd.enable = true;
 
     lanzaboote = {
       enable = true;
@@ -44,17 +44,15 @@
   };
 
   environment = {
-    systemPackages = [
-      (pkgs.callPackage ./hhd-ui.nix {})
-    ];
+    systemPackages = [hhd-ui];
 
     variables = {
-      FLAKE = lib.mkForce "github:alyraffauf/nixcfg/add-pacifidlog";
+      FLAKE = lib.mkForce "github:alyraffauf/nixcfg/24.11";
       GDK_SCALE = "2";
     };
   };
 
-  systemd.services.handheld-daemon.path = [(pkgs.callPackage ./hhd-ui.nix {}) pkgs.lsof];
+  systemd.services.handheld-daemon.path = [hhd-ui pkgs.lsof];
 
   jovian = {
     decky-loader = {
@@ -96,11 +94,10 @@
     })
   ];
 
-  services.handheld-daemon = let
-    adjustor = pkgs.callPackage ./adjustor.nix {};
-  in {
+  services.handheld-daemon = {
     enable = true;
     user = "aly";
+
     package = with pkgs;
       handheld-daemon.overrideAttrs (oldAttrs: {
         propagatedBuildInputs =
diff --git a/hosts/pacifidlog/home.nix b/hosts/pacifidlog/home.nix
index 352e6ded..24ed60dd 100644
--- a/hosts/pacifidlog/home.nix
+++ b/hosts/pacifidlog/home.nix
@@ -18,13 +18,6 @@
             laptopMonitors = ["desc:Lenovo Group Limited Go Display 0x00888888, 1600x2560@144, 0x0, 2, transform, 1"];
             tabletMode.enable = true;
           };
-
-          # services = {
-          #   easyeffects = {
-          #     enable = true;
-          #     preset = "fw13-easy-effects";
-          #   };
-          # };
         };
       }
     ];
diff --git a/hwModules/lenovo/legion/go/default.nix b/hwModules/lenovo/legion/go/default.nix
index 0e324a99..6f83f5a3 100644
--- a/hwModules/lenovo/legion/go/default.nix
+++ b/hwModules/lenovo/legion/go/default.nix
@@ -13,7 +13,11 @@
   ];
 
   boot = {
-    initrd.availableKernelModules = ["nvme" "sdhci_pci" "thunderbolt" "usb_storage" "usbhid" "xhci_pci"];
+    initrd = {
+      availableKernelModules = ["nvme" "sdhci_pci" "thunderbolt" "usb_storage" "usbhid" "xhci_pci"];
+      kernelModules = ["amdgpu"];
+    };
+
     extraModulePackages = with config.boot.kernelPackages; [acpi_call];
     kernelPackages = lib.mkDefault pkgs.linuxPackages_latest;
   };