cleanup before merge

This commit is contained in:
Aly Raffauf 2024-10-13 18:11:33 -04:00
parent d01bf277cf
commit 09b3b55b98
3 changed files with 15 additions and 21 deletions

View file

@ -5,7 +5,10 @@
lib, lib,
self, self,
... ...
}: { }: let
adjustor = pkgs.callPackage ./adjustor.nix {};
hhd-ui = pkgs.callPackage ./hhd-ui.nix {};
in {
imports = [ imports = [
./home.nix ./home.nix
./secrets.nix ./secrets.nix
@ -23,10 +26,7 @@
]; ];
boot = { boot = {
initrd = { initrd.systemd.enable = true;
kernelModules = ["amdgpu"];
systemd.enable = true;
};
lanzaboote = { lanzaboote = {
enable = true; enable = true;
@ -44,17 +44,15 @@
}; };
environment = { environment = {
systemPackages = [ systemPackages = [hhd-ui];
(pkgs.callPackage ./hhd-ui.nix {})
];
variables = { variables = {
FLAKE = lib.mkForce "github:alyraffauf/nixcfg/add-pacifidlog"; FLAKE = lib.mkForce "github:alyraffauf/nixcfg/24.11";
GDK_SCALE = "2"; 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 = { jovian = {
decky-loader = { decky-loader = {
@ -96,11 +94,10 @@
}) })
]; ];
services.handheld-daemon = let services.handheld-daemon = {
adjustor = pkgs.callPackage ./adjustor.nix {};
in {
enable = true; enable = true;
user = "aly"; user = "aly";
package = with pkgs; package = with pkgs;
handheld-daemon.overrideAttrs (oldAttrs: { handheld-daemon.overrideAttrs (oldAttrs: {
propagatedBuildInputs = propagatedBuildInputs =

View file

@ -18,13 +18,6 @@
laptopMonitors = ["desc:Lenovo Group Limited Go Display 0x00888888, 1600x2560@144, 0x0, 2, transform, 1"]; laptopMonitors = ["desc:Lenovo Group Limited Go Display 0x00888888, 1600x2560@144, 0x0, 2, transform, 1"];
tabletMode.enable = true; tabletMode.enable = true;
}; };
# services = {
# easyeffects = {
# enable = true;
# preset = "fw13-easy-effects";
# };
# };
}; };
} }
]; ];

View file

@ -13,7 +13,11 @@
]; ];
boot = { 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]; extraModulePackages = with config.boot.kernelPackages; [acpi_call];
kernelPackages = lib.mkDefault pkgs.linuxPackages_latest; kernelPackages = lib.mkDefault pkgs.linuxPackages_latest;
}; };