tidied hosts/ directory, updated hosts/persephone/ structure

This commit is contained in:
serenity-F 2024-11-13 00:13:52 +10:00
parent 709d746617
commit 1798520906
No known key found for this signature in database
14 changed files with 96 additions and 58 deletions

View file

@ -45,6 +45,7 @@
"flakes" "flakes"
]; ];
}; };
gc = { gc = {
## Automatically run 'nix-collect-garbage' ## Automatically run 'nix-collect-garbage'
automatic = true; automatic = true;
@ -58,6 +59,12 @@
}; };
hardware = {
enableAllFirmware = true;
};
## Apparently prevents getting stuck at shutdown ## Apparently prevents getting stuck at shutdown
systemd.extraConfig = "DefaultTimeoutStopSec=10s"; systemd.extraConfig = "DefaultTimeoutStopSec=10s";

View file

@ -1,23 +0,0 @@
{
self,
inputs,
outputs,
lib,
config,
pkgs,
...
}:
{
imports = [
./git.nix
#./btop.nix
./yazi.nix
./kitty.nix
#./nixvim
./neofetch.nix
];
}

View file

@ -1,24 +1,27 @@
{ lib, config, pkgs, modulesPath, ... }: { inputs, outputs, modulesPath, lib, config, pkgs, ... }:
{ {
imports = [ imports = [
./hardware-configuration.nix
./network-configuration.nix
../../core/config.nix
#./modules/syncthing.nix # got nuked, wasn't functional anyway :shrug: ## Host specific files
#./modules/disko.nix # BROKEN ./hardware-configuration.nix # hardware config
./modules/zfs.nix ./network-configuration.nix # network config
./modules # more host specific configs
## Shared 'core' config options
../../config.nix
]; ];
hardware = { hardware = {
enableAllFirmware = true; ## No bluetooth inside Hades (yet)
bluetooth.enable = false; bluetooth.enable = false;
graphics = { graphics = {
enable = true; enable = true;
## Packages for integrated graphics inside Hades
## Packages for the iGPU inside Hades
extraPackages = with pkgs; [ extraPackages = with pkgs; [
#intel-compute-runtime #intel-compute-runtime
#intel-media-driver #intel-media-driver
@ -26,12 +29,14 @@
#vaapiVdpau #vaapiVdpau
#libvdpau-va-gl #libvdpau-va-gl
]; ];
}; };
## Packages for the dGPU inside Hades
amdgpu = { amdgpu = {
initrd.enable = true; initrd.enable = true;
opencl.enable = true; opencl.enable = true;
## Vulkan packages for the dGPU inside Hades
amdvlk = { amdvlk = {
enable = true; enable = true;
#package = [ ]; #package = [ ];
@ -40,21 +45,23 @@
#settings = { #settings = {
#}; #};
}; };
}; };
}; };
programs = { programs = {
## For tweaking Radeon GPUs
## For tweaking system performance
corectrl = { corectrl = {
enable = true; enable = true;
## Allows tweaking GPU performance
gpuOverclock = { gpuOverclock = {
enable = true; enable = true;
## Allows changing clocks and volts ## Needed for radeon GPU overclocking
ppfeaturemask = "0xfffd7fff"; ppfeaturemask = "0xfffd7fff";
}; };
}; };
## Performance tweaking continued
tuxclocker = { tuxclocker = {
enable = true; enable = true;
enableAMD = true; enableAMD = true;
@ -63,7 +70,7 @@
}; };
## Some packages for managing the radeon GPU inside Hades ## Some packages for managing the hardware inside Hades
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
umr umr
radeontop radeontop

View file

@ -0,0 +1,14 @@
{ inputs, outputs, modulesPath, lib, config, pkgs, ... }:
{
imports = [
## Selected modules for import
./zfs.nix # zfs storage config
./disko.nix # disk/partition config
./network.nix # network/internet config
./syncthing.nix # syncthing config
];
}

View file

@ -1,36 +1,56 @@
{ inputs, outputs, lib, config, pkgs, ... }: { inputs, outputs, modulesPath, lib, config, pkgs, ... }:
{ {
imports = [ imports = [
## Import necessary flake modules ## Host specific files
#"${builtins.fetchTarball "<flake module url>"}/module.nix" ./hardware-configuration.nix # hardware config
./network-configuration.nix # network config
./modules # more host specific configs
## Include host specific options ## Shared 'core' config options
./hardware
./network
## Include core config options
../../config.nix ../../config.nix
]; ];
nix = { hardware = {
#settings = { ## Enable bluetooth inside Persephone
#}; bluetooth.enable = true;
gc = { graphics = {
## Automatically run 'nix-collect-garbage', enable = true;
automatic = true;
## every day, ## Packages for the iGPU inside Persephone
dates = "daily"; extraPackages = with pkgs; [
## and clear junk older than 1 day intel-compute-runtime
options = "--delete-older-than 1d"; intel-media-driver
vaapiIntel
vaapiVdpau
libvdpau-va-gl
];
## No clue what this does lol.
persistent = true;
}; };
}; };
programs = {
## For tweaking system performance
corectrl = {
enable = true;
};
## Performance tweaking continued
tuxclocker = {
enable = true;
useUnfree = true;
};
};
## Some packages for managing the hardware inside Persephone
environment.systemPackages = with pkgs; [
nvtopPackages.intel
];
} }

View file

@ -0,0 +1,13 @@
{ inputs, outputs, modulesPath, lib, config, pkgs, ... }:
{
imports = [
## Selected modules for import
./disko.nix # disk/partition config
./network.nix # network/internet config
./syncthing.nix # syncthing config
];
}