sorted some hardware stuff, moved group declarations to respective modules

This commit is contained in:
serenity-F 2026-04-19 16:03:16 +10:00
parent d26bfde998
commit 97cbf36a50
No known key found for this signature in database
4 changed files with 58 additions and 52 deletions

View file

@ -3,10 +3,12 @@
## https://github.com/musnix/musnix ## https://github.com/musnix/musnix
## https://nixos.wiki/wiki/Audio_production ## https://nixos.wiki/wiki/Audio_production
{ pkgs, ... }: { pkgs, user, ... }:
{ {
users.users.${user}.extraGroups = [ "audio" ];
## SHOULD BE ELSEWHERE - temporary testing declarations ## SHOULD BE ELSEWHERE - temporary testing declarations
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
helm helm

View file

@ -1,45 +1,33 @@
{ pkgs, inputs, user, ... }: { pkgs, inputs, user, ... }:
{ {
# Adding primary user to gamemode group
users.users.${user}.extraGroups = [ "gamemode" ];
# Gaming mouse config
services.ratbagd.enable = true;
# Enable 32bit graphics support
hardware.graphics.enable32Bit = true;
# Open tablet driver, for Osu!, mainly. # Open tablet driver, for Osu!, mainly.
hardware.opentabletdriver = { hardware.opentabletdriver = {
enable = true; # Enables the driver lol enable = true; # Enables the driver lol
daemon.enable = true; # Enables the daemon via systemd daemon.enable = true; # Enables the daemon via systemd
blacklistedKernelModules = [ blacklistedKernelModules = [ # Disable conflicting drivers
# Disable conflicting drivers
"hid-uclogic" "hid-uclogic"
"wacom" "wacom"
]; ];
}; };
# Open Razer stuff
hardware.openrazer = {
enable = true;
users = [ "${user}" ];
};
hardware.graphics.enable32Bit = true;
services.ratbagd.enable = true; # ratbagd for gaming mouse config
environment = { environment = {
# Games and misc. # Games and misc.
systemPackages = with pkgs; [ systemPackages = with pkgs; [
piper # Open mouse config piper # Open mouse config
razergenie # Razer peripherals
openrazer-daemon # Razer peripherals
vassal # FOSSy board game sim vassal # FOSSy board game sim
cockatrice # Magical the gathering, but free cockatrice # Magical the gathering, but free
prismlauncher # Modded Minecraft client prismlauncher # Modded Minecraft client
osu-lazer-bin # Rhythm is just a click away! osu-lazer-bin # Rhythm is just a click away!
inputs.nix-gaming.packages.${pkgs.system}.osu-mime inputs.nix-gaming.packages.${pkgs.system}.osu-mime
#inputs.nix-gaming.packages.${pkgs.system}.osu-lazer-bin # Not using this one but still want it here lol #inputs.nix-gaming.packages.${pkgs.system}.osu-lazer-bin
]; ];
# These are important apparently :uh: # These are important apparently :uh:
@ -48,21 +36,21 @@
XDG_CONFIG_HOME = "$HOME/.config"; XDG_CONFIG_HOME = "$HOME/.config";
XDG_BIN_HOME = "$HOME/.local/bin"; XDG_BIN_HOME = "$HOME/.local/bin";
XDG_DATA_HOME = "$HOME/.local/share"; XDG_DATA_HOME = "$HOME/.local/share";
## Steam needs this to find Proton-GE # Steam needs this to find Proton-GE
STEAM_EXTRA_COMPAT_TOOLS_PATHS = "\${HOME}/.steam/root/compatibilitytools.d"; STEAM_EXTRA_COMPAT_TOOLS_PATHS = "\${HOME}/.steam/root/compatibilitytools.d";
## Note: this doesn't replace PATH, it just adds this to it # Note: this doesn't replace PATH, it just adds this to it
PATH = [ "\${XDG_BIN_HOME}" ]; PATH = [ "\${XDG_BIN_HOME}" ];
NIXOS_OZONE_WL = "1"; NIXOS_OZONE_WL = "1";
SDL_VIDEODRIVER = "x11,wayland,windows"; SDL_VIDEODRIVER = "x11,wayland,windows";
}; };
}; };
## TIDY BELOW ##
programs = { programs = {
# Java, just in case i guess ? # Java, just in case i guess ?
java.enable = true; java.enable = true;
# This should help games run more betterer # This should help games run more betterer
gamescope = { gamescope = {
enable = true; enable = true;
@ -117,7 +105,6 @@
# Gotta have the glorious eggroll # Gotta have the glorious eggroll
extraCompatPackages = with pkgs; [ proton-ge-bin ]; extraCompatPackages = with pkgs; [ proton-ge-bin ];
}; };
}; };
} }

View file

@ -1,21 +1,21 @@
{ pkgs, ... }: { pkgs, user, ... }:
{ {
imports = [ imports = [
## Host-specific config files # Host-specific config files
./network.nix ./network.nix
./hardware.nix ./hardware.nix
./bluetooth.nix ./bluetooth.nix
## Shared 'core' config options # Shared 'core' config options
../../../core ../../../core
## Host-specific core modules # Host-specific core modules
../../../core/zfs.nix ../../../core/zfs.nix
../../../core/gaming.nix ../../../core/gaming.nix
]; ];
## ooh, hostname - this one's important! # ooh, hostname - this one's important!
networking.hostName = "hades"; networking.hostName = "hades";
## ## ## ## ## ## ## ## ## ##
@ -36,7 +36,7 @@
initrd.luks.devices."luks-55f7d546-fac9-4ea0-a21e-4c50ecc0d67d".device = "/dev/disk/by-uuid/55f7d546-fac9-4ea0-a21e-4c50ecc0d67d"; initrd.luks.devices."luks-55f7d546-fac9-4ea0-a21e-4c50ecc0d67d".device = "/dev/disk/by-uuid/55f7d546-fac9-4ea0-a21e-4c50ecc0d67d";
## Uhhhhhhh # Uhhhhhhh
#Asphodel = { # secondary partition on Tartarus drive #Asphodel = { # secondary partition on Tartarus drive
#device = "/dev/disk/by-uuid/45f5f6ad-a676-4bc1-ad4b-e3e26b5697f4"; #device = "/dev/disk/by-uuid/45f5f6ad-a676-4bc1-ad4b-e3e26b5697f4";
#preLVM =false; #preLVM =false;
@ -47,14 +47,21 @@
## ## ## ## ## ## ## ## ## ##
# Hades specific Razer peripherals
users.users.${user}.extraGroups = [ "openrazer" ];
hardware.openrazer = {
enable = true;
users = [ "${user}" ];
};
hardware = { hardware = {
## GPU and graphics # GPU and graphics
graphics = { graphics = {
enable = true; enable = true;
enable32Bit = true; enable32Bit = true;
## Packages for the iGPU inside Hades # Packages for the iGPU inside Hades
## - disabled for now:tm: # - disabled for now:tm:
extraPackages = with pkgs; extraPackages = with pkgs;
[ [
#intel-compute-runtime #intel-compute-runtime
@ -64,7 +71,7 @@
#vaapiVdpau #vaapiVdpau
]; ];
}; };
## Driver packages for the dGPU inside Hades # Driver packages for the dGPU inside Hades
amdgpu = { amdgpu = {
initrd.enable = true; initrd.enable = true;
opencl.enable = true; opencl.enable = true;
@ -80,17 +87,17 @@
}; };
programs = { programs = {
## For tweaking system performance # For tweaking system performance
#corectrl = { #corectrl = {
#enable = true; #enable = true;
## Allows tweaking GPU performance # Allows tweaking GPU performance
#gpuOverclock = { #gpuOverclock = {
#enable = true; #enable = true;
## Needed for radeon GPU overclocking # Needed for radeon GPU overclocking
#ppfeaturemask = "0xfffd7fff"; #ppfeaturemask = "0xfffd7fff";
#}; #};
#}; #};
## Performance tweaking continued # Performance tweaking continued
#tuxclocker = { #tuxclocker = {
#enable = true; #enable = true;
#enableAMD = true; #enableAMD = true;
@ -98,19 +105,29 @@
#}; #};
}; };
## Some packages for managing the hardware inside Hades # Some packages for managing the hardware inside Hades
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
openrgb-with-all-plugins
#umr # GPU firmware and control
lact #umr # tweaking
radeontop lact # tweaking
#amdgpu_top radeontop # monitoring
#radeontools #amdgpu_top # monitoring
#radeon-profile #radeontools # tweaking
nvtopPackages.amd #radeon-profile # tweaking
nvtopPackages.amd # monitoring
# RGB lighting control
openrgb-with-all-plugins # frontend
# Razer peripherals
#openrazer #firmware
openrazer-daemon # daemon
razergenie # frontend
polychromatic # frontent
]; ];
## Systemd services for lact # Systemd services for lact
systemd = { systemd = {
packages = with pkgs; [ lact ]; packages = with pkgs; [ lact ];
services.lactd.wantedBy = [ "multi-user.target" ]; services.lactd.wantedBy = [ "multi-user.target" ];

View file

@ -30,7 +30,7 @@ in {
${user} = { ${user} = {
description = "${userDescription}"; description = "${userDescription}";
isNormalUser = true; isNormalUser = true;
extraGroups = [ "wheel" "networkmanager" "gamemode" "audio" ]; extraGroups = [ "wheel" "networkmanager" ];
#hashedPasswordFile = config.sops.secrets.loginPassword.path; #hashedPasswordFile = config.sops.secrets.loginPassword.path;
## A catgirl's favourite shell ## A catgirl's favourite shell
shell = pkgs.fish; shell = pkgs.fish;