I am going insane

This commit is contained in:
Charlie Root 2024-08-16 23:05:45 +02:00
commit 75854e1455
5 changed files with 13 additions and 18 deletions

View file

@ -25,6 +25,7 @@
programs.dconf.enable = true; programs.dconf.enable = true;
virtualisation.docker.enable = true; virtualisation.docker.enable = true;
boot.kernelPackages = pkgs.linuxPackages_xanmod_latest; boot.kernelPackages = pkgs.linuxPackages_xanmod_latest;
modules = { modules = {
system = { system = {
hardware = { hardware = {
@ -108,7 +109,6 @@
newsboat.enable = true; newsboat.enable = true;
fish.enable = true; fish.enable = true;
nh.enable = true; nh.enable = true;
steam.enable = true;
waybar.enable = true; waybar.enable = true;
}; };
services = { services = {
@ -116,11 +116,6 @@
}; };
theming = { theming = {
quickshell.enable = true; quickshell.enable = true;
qt = {
enable = false;
package = pkgs.kde-gruvbox;
name = "Gruvbox-Dark";
};
}; };
}; };
system.stateVersion = "23.11"; system.stateVersion = "23.11";

View file

@ -1,15 +1,10 @@
{ {lib, ...}: let
config,
lib,
pkgs,
...
}: let
inherit (lib) mkOption mkEnableOption; inherit (lib) mkOption mkEnableOption;
inherit (lib.types) str package int;
in { in {
options.modules.system.hardware = { options.modules.system.hardware = {
nvidia = { nvidia = {
enable = mkEnableOption "Nvidia Nvidia graphics drivers"; enable = mkEnableOption "Nvidia Nvidia graphics drivers";
}; };
amd.enable = mkEnableOption "AMD graphics drivers";
}; };
} }

View file

@ -97,6 +97,12 @@ in {
nvidia = mkEnableOption "Nvidia graphics drivers"; nvidia = mkEnableOption "Nvidia graphics drivers";
amd = mkEnableOption "AMD graphics drivers"; amd = mkEnableOption "AMD graphics drivers";
}; };
hardware = {
nvidia = {
enable = mkEnableOption "Nvidia Nvidia graphics drivers";
};
amd.enable = mkEnableOption "AMD graphics drivers";
};
hardware.bluetooth = { hardware.bluetooth = {
enable = mkEnableOption "bluetooth modules, drivers and configuration program(s)"; enable = mkEnableOption "bluetooth modules, drivers and configuration program(s)";

View file

@ -4,8 +4,7 @@
pkgs, pkgs,
... ...
}: let }: let
cfg = config.modules.system.hardware; inherit (config.modules.system.hardware) nvidia amd;
inherit (cfg) amd nvidia;
inherit (lib) mkIf; inherit (lib) mkIf;
in { in {
config = { config = {
@ -16,7 +15,7 @@ in {
mkIf amd.enable [ mkIf amd.enable [
mesa mesa
libva libva
vaapiVdpau vaapiVdpa
]; ];
}; };
}; };
@ -27,7 +26,7 @@ in {
enable = true; enable = true;
finegrained = false; finegrained = false;
nvidiaSettings = false; nvidiaSettings = false;
package = config.boot.kernelPackges.nvidiaPackages.beta; package = config.boot.kernelPackages.nvidiaPackages.beta;
}; };
}; };
boot.initrd.kernelModules = mkIf amd.enable ["amdgpu"]; boot.initrd.kernelModules = mkIf amd.enable ["amdgpu"];

View file

@ -13,7 +13,7 @@ in {
]; ];
wifi = { wifi = {
# Generate a randomized value upon each connect # Generate a randomized value upon each connect
macAdress = "random"; macAddress = "random";
# Enable Wi-Fi power saving # Enable Wi-Fi power saving
powersave = true; powersave = true;