move some graphics stuff into individual modules/files

This commit is contained in:
Schrottkatze 2024-08-01 08:37:19 +02:00
parent b63db1934d
commit ddd6ecd055
Signed by: schrottkatze
SSH key fingerprint: SHA256:hXb3t1vINBFCiDCmhRABHX5ocdbLiKyCdKI4HK2Rbbc
9 changed files with 31 additions and 16 deletions

View file

@ -138,7 +138,6 @@ with builtins; {
boot.kernel.sysctl."vm.max_map_count" = 2147483642; boot.kernel.sysctl."vm.max_map_count" = 2147483642;
hardware = { hardware = {
opengl.enable = true;
uinput.enable = true; uinput.enable = true;
bluetooth.enable = true; bluetooth.enable = true;
# keyboard.uhk.enable = true; # keyboard.uhk.enable = true;

View file

@ -46,18 +46,6 @@
S10E_JRNL_FILE_LOC = "/home/jade/Docs/jrnl.md"; S10E_JRNL_FILE_LOC = "/home/jade/Docs/jrnl.md";
}; };
hardware.opengl = {
enable = true;
extraPackages = with pkgs; [
intel-ocl
intel-media-driver
intel-vaapi-driver
intel-compute-runtime
libvdpau-va-gl
mesa.drivers
];
};
programs.wireshark.enable = true; programs.wireshark.enable = true;
boot.resumeDevice = "/dev/disk/by-uuid/4f9e8afa-f8d7-40bf-b3ea-17e8e8fbb694"; boot.resumeDevice = "/dev/disk/by-uuid/4f9e8afa-f8d7-40bf-b3ea-17e8e8fbb694";

View file

@ -1,5 +1,6 @@
{...}: { {...}: {
imports = [ imports = [
./input.nix ./input.nix
./graphics.nix
]; ];
} }

View file

@ -0,0 +1,12 @@
{pkgs, ...}: {
hardware.graphics = {
extraPackages = with pkgs; [
intel-ocl
intel-media-driver
intel-vaapi-driver
intel-compute-runtime
libvdpau-va-gl
mesa.drivers
];
};
}

View file

@ -6,9 +6,11 @@
./hardware-configuration.nix ./hardware-configuration.nix
../../common.nix ../../common.nix
../../modules ../../modules
./modules
]; ];
jade = { jade = {
hwKey.pamAuth.enable = true;
desktop = { desktop = {
syncthing.enable = true; syncthing.enable = true;
kdeconnect.enable = true; kdeconnect.enable = true;
@ -57,9 +59,6 @@
# TODO: clean up. # TODO: clean up.
zenstates zenstates
zenmonitor zenmonitor
nvtop-amd
radeontop
rgp
tea tea
blender-hip blender-hip
]; ];

View file

@ -0,0 +1,5 @@
{}: {
imports = [
./graphics.nix
];
}

View file

@ -0,0 +1,7 @@
{pkgs, ...}: {
environment.systemPackages = [
pkgs.nvtop-amd
pkgs.radeontop
pkgs.rgp
];
}

View file

@ -6,5 +6,6 @@
./firewall.nix ./firewall.nix
./desktop-environment ./desktop-environment
./input ./input
./graphics.nix
]; ];
} }

3
modules/graphics.nix Normal file
View file

@ -0,0 +1,3 @@
{}: {
graphics.enable = true;
}