sorted some hardware stuff, moved group declarations to respective modules
This commit is contained in:
parent
d26bfde998
commit
97cbf36a50
4 changed files with 58 additions and 52 deletions
|
|
@ -3,10 +3,12 @@
|
|||
## https://github.com/musnix/musnix
|
||||
## https://nixos.wiki/wiki/Audio_production
|
||||
|
||||
{ pkgs, ... }:
|
||||
{ pkgs, user, ... }:
|
||||
|
||||
{
|
||||
|
||||
users.users.${user}.extraGroups = [ "audio" ];
|
||||
|
||||
## SHOULD BE ELSEWHERE - temporary testing declarations
|
||||
environment.systemPackages = with pkgs; [
|
||||
helm
|
||||
|
|
|
|||
|
|
@ -1,45 +1,33 @@
|
|||
{ 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.
|
||||
hardware.opentabletdriver = {
|
||||
enable = true; # Enables the driver lol
|
||||
daemon.enable = true; # Enables the daemon via systemd
|
||||
blacklistedKernelModules = [
|
||||
# Disable conflicting drivers
|
||||
blacklistedKernelModules = [ # Disable conflicting drivers
|
||||
"hid-uclogic"
|
||||
"wacom"
|
||||
];
|
||||
};
|
||||
|
||||
# Open Razer stuff
|
||||
hardware.openrazer = {
|
||||
enable = true;
|
||||
users = [ "${user}" ];
|
||||
};
|
||||
|
||||
hardware.graphics.enable32Bit = true;
|
||||
|
||||
services.ratbagd.enable = true; # ratbagd for gaming mouse config
|
||||
|
||||
environment = {
|
||||
|
||||
# Games and misc.
|
||||
systemPackages = with pkgs; [
|
||||
|
||||
piper # Open mouse config
|
||||
razergenie # Razer peripherals
|
||||
openrazer-daemon # Razer peripherals
|
||||
|
||||
vassal # FOSSy board game sim
|
||||
cockatrice # Magical the gathering, but free
|
||||
|
||||
prismlauncher # Modded Minecraft client
|
||||
|
||||
osu-lazer-bin # Rhythm is just a click away!
|
||||
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:
|
||||
|
|
@ -48,21 +36,21 @@
|
|||
XDG_CONFIG_HOME = "$HOME/.config";
|
||||
XDG_BIN_HOME = "$HOME/.local/bin";
|
||||
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";
|
||||
## 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}" ];
|
||||
NIXOS_OZONE_WL = "1";
|
||||
SDL_VIDEODRIVER = "x11,wayland,windows";
|
||||
};
|
||||
|
||||
};
|
||||
|
||||
## TIDY BELOW ##
|
||||
|
||||
programs = {
|
||||
|
||||
# Java, just in case i guess ?
|
||||
java.enable = true;
|
||||
|
||||
# This should help games run more betterer
|
||||
gamescope = {
|
||||
enable = true;
|
||||
|
|
@ -117,7 +105,6 @@
|
|||
# Gotta have the glorious eggroll
|
||||
extraCompatPackages = with pkgs; [ proton-ge-bin ];
|
||||
};
|
||||
|
||||
};
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,21 +1,21 @@
|
|||
{ pkgs, ... }:
|
||||
{ pkgs, user, ... }:
|
||||
|
||||
{
|
||||
imports = [
|
||||
|
||||
## Host-specific config files
|
||||
# Host-specific config files
|
||||
./network.nix
|
||||
./hardware.nix
|
||||
./bluetooth.nix
|
||||
## Shared 'core' config options
|
||||
# Shared 'core' config options
|
||||
../../../core
|
||||
## Host-specific core modules
|
||||
# Host-specific core modules
|
||||
../../../core/zfs.nix
|
||||
../../../core/gaming.nix
|
||||
|
||||
];
|
||||
|
||||
## ooh, hostname - this one's important!
|
||||
# ooh, hostname - this one's important!
|
||||
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";
|
||||
|
||||
## Uhhhhhhh
|
||||
# Uhhhhhhh
|
||||
#Asphodel = { # secondary partition on Tartarus drive
|
||||
#device = "/dev/disk/by-uuid/45f5f6ad-a676-4bc1-ad4b-e3e26b5697f4";
|
||||
#preLVM =false;
|
||||
|
|
@ -47,14 +47,21 @@
|
|||
|
||||
## ## ## ## ##
|
||||
|
||||
# Hades specific Razer peripherals
|
||||
users.users.${user}.extraGroups = [ "openrazer" ];
|
||||
hardware.openrazer = {
|
||||
enable = true;
|
||||
users = [ "${user}" ];
|
||||
};
|
||||
|
||||
hardware = {
|
||||
|
||||
## GPU and graphics
|
||||
# GPU and graphics
|
||||
graphics = {
|
||||
enable = true;
|
||||
enable32Bit = true;
|
||||
## Packages for the iGPU inside Hades
|
||||
## - disabled for now:tm:
|
||||
# Packages for the iGPU inside Hades
|
||||
# - disabled for now:tm:
|
||||
extraPackages = with pkgs;
|
||||
[
|
||||
#intel-compute-runtime
|
||||
|
|
@ -64,7 +71,7 @@
|
|||
#vaapiVdpau
|
||||
];
|
||||
};
|
||||
## Driver packages for the dGPU inside Hades
|
||||
# Driver packages for the dGPU inside Hades
|
||||
amdgpu = {
|
||||
initrd.enable = true;
|
||||
opencl.enable = true;
|
||||
|
|
@ -80,17 +87,17 @@
|
|||
};
|
||||
|
||||
programs = {
|
||||
## For tweaking system performance
|
||||
# For tweaking system performance
|
||||
#corectrl = {
|
||||
#enable = true;
|
||||
## Allows tweaking GPU performance
|
||||
# Allows tweaking GPU performance
|
||||
#gpuOverclock = {
|
||||
#enable = true;
|
||||
## Needed for radeon GPU overclocking
|
||||
# Needed for radeon GPU overclocking
|
||||
#ppfeaturemask = "0xfffd7fff";
|
||||
#};
|
||||
#};
|
||||
## Performance tweaking continued
|
||||
# Performance tweaking continued
|
||||
#tuxclocker = {
|
||||
#enable = 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; [
|
||||
openrgb-with-all-plugins
|
||||
#umr
|
||||
lact
|
||||
radeontop
|
||||
#amdgpu_top
|
||||
#radeontools
|
||||
#radeon-profile
|
||||
nvtopPackages.amd
|
||||
|
||||
# GPU firmware and control
|
||||
#umr # tweaking
|
||||
lact # tweaking
|
||||
radeontop # monitoring
|
||||
#amdgpu_top # monitoring
|
||||
#radeontools # tweaking
|
||||
#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 = {
|
||||
packages = with pkgs; [ lact ];
|
||||
services.lactd.wantedBy = [ "multi-user.target" ];
|
||||
|
|
|
|||
|
|
@ -30,7 +30,7 @@ in {
|
|||
${user} = {
|
||||
description = "${userDescription}";
|
||||
isNormalUser = true;
|
||||
extraGroups = [ "wheel" "networkmanager" "gamemode" "audio" ];
|
||||
extraGroups = [ "wheel" "networkmanager" ];
|
||||
#hashedPasswordFile = config.sops.secrets.loginPassword.path;
|
||||
## A catgirl's favourite shell
|
||||
shell = pkgs.fish;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue