pls be fix
This commit is contained in:
parent
09bf89f02b
commit
22ad8fb70d
7 changed files with 6 additions and 119 deletions
|
|
@ -2,9 +2,13 @@
|
||||||
|
|
||||||
{
|
{
|
||||||
imports = [
|
imports = [
|
||||||
./hardware
|
./hardware-configuration.nix
|
||||||
./network
|
./network-configuration.nix
|
||||||
../../config.nix
|
../../config.nix
|
||||||
|
|
||||||
|
./modules/syncthing.nix
|
||||||
|
./modules/disko.nix
|
||||||
|
./modules/zfs.nix
|
||||||
];
|
];
|
||||||
|
|
||||||
nix = {
|
nix = {
|
||||||
|
|
|
||||||
|
|
@ -2,22 +2,10 @@
|
||||||
|
|
||||||
{
|
{
|
||||||
imports = [
|
imports = [
|
||||||
|
|
||||||
## Import necessary flake modules
|
|
||||||
#"${builtins.fetchTarball "https://github.com/nix-community/disko/archive/master.tar.gz"}/module.nix"
|
|
||||||
|
|
||||||
## Include results from the (non-existent) hardware scan
|
## Include results from the (non-existent) hardware scan
|
||||||
## as well as the host-specific hardware config options
|
## as well as the host-specific hardware config options
|
||||||
(modulesPath + "/installer/scan/not-detected.nix")
|
(modulesPath + "/installer/scan/not-detected.nix")
|
||||||
|
|
||||||
## Disko config, should eventually let us nuke our boot drive and reinstall
|
|
||||||
## with zero worries.
|
|
||||||
## commented out for now as we have "broken" it
|
|
||||||
#./disko.nix
|
|
||||||
|
|
||||||
## ZFS module, separated to help keep us sane while we set it up lol
|
|
||||||
./zfs.nix
|
|
||||||
|
|
||||||
];
|
];
|
||||||
|
|
||||||
fileSystems."/" = {
|
fileSystems."/" = {
|
||||||
|
|
@ -89,89 +77,6 @@
|
||||||
};
|
};
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|
||||||
## Hardware-related services
|
|
||||||
services = {
|
|
||||||
## TRIM to keep SSDs healthy-ish
|
|
||||||
fstrim.enable = true;
|
|
||||||
|
|
||||||
};
|
|
||||||
|
|
||||||
#powerManagement = {
|
|
||||||
#enable = true;
|
|
||||||
|
|
||||||
#powertop.enable = true;
|
|
||||||
|
|
||||||
#cpuFreqGovernor = Lib.mkDefault "performance";
|
|
||||||
|
|
||||||
#cpufreq = {
|
|
||||||
#min = 1500000;
|
|
||||||
#max = 4400000;
|
|
||||||
#};
|
|
||||||
#};
|
|
||||||
|
|
||||||
hardware = {
|
|
||||||
|
|
||||||
enableAllFirmware = true;
|
|
||||||
bluetooth.enable = false;
|
|
||||||
|
|
||||||
graphics = {
|
|
||||||
enable = true;
|
|
||||||
## Packages for integrated graphics inside Hades
|
|
||||||
extraPackages = with pkgs; [
|
|
||||||
intel-compute-runtime
|
|
||||||
intel-media-driver
|
|
||||||
vaapiIntel
|
|
||||||
vaapiVdpau
|
|
||||||
libvdpau-va-gl
|
|
||||||
];
|
|
||||||
};
|
|
||||||
|
|
||||||
amdgpu = {
|
|
||||||
initrd.enable = true;
|
|
||||||
opencl.enable = true;
|
|
||||||
|
|
||||||
amdvlk = {
|
|
||||||
enable = true;
|
|
||||||
#package = [ ];
|
|
||||||
support32Bit.enable = true;
|
|
||||||
supportExperimental.enable = true;
|
|
||||||
#settings = {
|
|
||||||
#};
|
|
||||||
};
|
|
||||||
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
programs = {
|
|
||||||
## For tweaking Radeon GPUs
|
|
||||||
corectrl = {
|
|
||||||
enable = true;
|
|
||||||
gpuOverclock = {
|
|
||||||
enable = true;
|
|
||||||
## Allows changing clocks and volts
|
|
||||||
ppfeaturemask = "0xfffd7fff";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
tuxclocker = {
|
|
||||||
enable = true;
|
|
||||||
enableAMD = true;
|
|
||||||
useUnfree = true;
|
|
||||||
};
|
|
||||||
|
|
||||||
};
|
|
||||||
|
|
||||||
## Some packages for managing the radeon GPU inside Hades
|
|
||||||
environment.systemPackages = with pkgs; [
|
|
||||||
umr
|
|
||||||
radeontop
|
|
||||||
amdgpu_top
|
|
||||||
radeontools
|
|
||||||
radeon-profile
|
|
||||||
nvtopPackages.amd
|
|
||||||
];
|
|
||||||
|
|
||||||
## Enables DHCP on each ethernet and wireless interface. In case of scripted networking
|
## Enables DHCP on each ethernet and wireless interface. In case of scripted networking
|
||||||
## (the default) this is the recommended approach. When using systemd-networkd it's
|
## (the default) this is the recommended approach. When using systemd-networkd it's
|
||||||
## still possible to use this option, but it's recommended to use it in conjunction
|
## still possible to use this option, but it's recommended to use it in conjunction
|
||||||
|
|
@ -1,18 +0,0 @@
|
||||||
{ lib, config, pkgs, modulesPath, ... }:
|
|
||||||
|
|
||||||
{
|
|
||||||
imports = [
|
|
||||||
|
|
||||||
## Hardware config
|
|
||||||
./config.nix
|
|
||||||
|
|
||||||
## Disko config, should eventually let us nuke our boot drive and reinstall
|
|
||||||
## with zero worries.
|
|
||||||
#./disko.nix # broken for now
|
|
||||||
|
|
||||||
## ZFS module, separated to help keep us sane while we set it up lol
|
|
||||||
./zfs.nix
|
|
||||||
|
|
||||||
];
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
@ -47,10 +47,6 @@
|
||||||
#];
|
#];
|
||||||
};
|
};
|
||||||
|
|
||||||
services.jellyfin = {
|
|
||||||
enable = true;
|
|
||||||
openFirewall = true;
|
|
||||||
};
|
|
||||||
|
|
||||||
## syncthing for device <-> device filesharing and,,, syncing
|
## syncthing for device <-> device filesharing and,,, syncing
|
||||||
## still not set up, grrrr
|
## still not set up, grrrr
|
||||||
Loading…
Add table
Add a link
Reference in a new issue