tidy up
This commit is contained in:
parent
eaa734e091
commit
64ef819cfb
2 changed files with 32 additions and 53 deletions
|
|
@ -10,48 +10,11 @@
|
||||||
|
|
||||||
];
|
];
|
||||||
|
|
||||||
## trim to keep SSDs healthy-ish
|
|
||||||
services.fstrim.enable = true;
|
|
||||||
|
|
||||||
#powerManagement = {
|
|
||||||
#enable = true;
|
|
||||||
|
|
||||||
#powertop.enable = true;
|
|
||||||
|
|
||||||
#cpuFreqGovernor = Lib.mkDefault "performance";
|
|
||||||
|
|
||||||
#cpufreq = {
|
|
||||||
#min = 1500000;
|
|
||||||
#max = 4400000;
|
|
||||||
#};
|
|
||||||
#};
|
|
||||||
|
|
||||||
hardware = {
|
|
||||||
|
|
||||||
cpu.intel.updateMicrocode = true;
|
|
||||||
|
|
||||||
enableAllFirmware = false;
|
|
||||||
|
|
||||||
#bluetooth.enable = true;
|
|
||||||
|
|
||||||
opengl = {
|
|
||||||
enable = true;
|
|
||||||
extraPackages = with pkgs; [
|
|
||||||
intel-compute-runtime
|
|
||||||
intel-media-driver
|
|
||||||
vaapiIntel
|
|
||||||
vaapiVdpau
|
|
||||||
libvdpau-va-gl
|
|
||||||
];
|
|
||||||
};
|
|
||||||
|
|
||||||
};
|
|
||||||
|
|
||||||
nix = {
|
nix = {
|
||||||
#settings = {
|
#settings = {
|
||||||
#};
|
#};
|
||||||
gc = {
|
gc = {
|
||||||
## every day, automatically collect garbage older than 10 days
|
## Every day, automatically collect garbage older than 10 days
|
||||||
automatic = true;
|
automatic = true;
|
||||||
dates = "daily";
|
dates = "daily";
|
||||||
options = "--delete-older-than 3d";
|
options = "--delete-older-than 3d";
|
||||||
|
|
|
||||||
|
|
@ -3,8 +3,8 @@
|
||||||
{
|
{
|
||||||
imports = [
|
imports = [
|
||||||
(modulesPath + "/installer/scan/not-detected.nix")
|
(modulesPath + "/installer/scan/not-detected.nix")
|
||||||
## commented out disko for now as I have broken it :D
|
## Commented out disko for now as I have broken it :c
|
||||||
#./disko.nix
|
#./disko.nix
|
||||||
];
|
];
|
||||||
|
|
||||||
fileSystems."/" =
|
fileSystems."/" =
|
||||||
|
|
@ -20,24 +20,24 @@
|
||||||
kernelModules = [ "kvm-intel" ];
|
kernelModules = [ "kvm-intel" ];
|
||||||
extraModulePackages = [ ];
|
extraModulePackages = [ ];
|
||||||
initrd = {
|
initrd = {
|
||||||
availableKernelModules = [ "xhci_pci" "ehci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" ];
|
availableKernelModules = [ "xhci_pci" "ehci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" ];
|
||||||
kernelModules = [ ];
|
kernelModules = [ ];
|
||||||
systemd.enable = true;
|
systemd.enable = true;
|
||||||
secrets = {
|
secrets = {
|
||||||
"/boot/crypto_keyfile.bin" = null;
|
"/boot/crypto_keyfile.bin" = null;
|
||||||
};
|
};
|
||||||
luks = {
|
luks = {
|
||||||
devices."luks-3de671ef-22a3-4f28-9251-a0687ab44f96" = {
|
devices."luks-3de671ef-22a3-4f28-9251-a0687ab44f96" = {
|
||||||
device = "/dev/disk/by-uuid/3de671ef-22a3-4f28-9251-a0687ab44f96";
|
device = "/dev/disk/by-uuid/3de671ef-22a3-4f28-9251-a0687ab44f96";
|
||||||
#keyFile = "/boot/crypto_keyfile.bin";
|
#keyFile = "/boot/crypto_keyfile.bin";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
loader = {
|
loader = {
|
||||||
efi = {
|
efi = {
|
||||||
canTouchEfiVariables = true;
|
canTouchEfiVariables = true;
|
||||||
};
|
};
|
||||||
## for some reason GPT/UEFI didn't work, so neither does systemd-boot
|
## For some reason GPT/UEFI didn't work, so neither does systemd-boot
|
||||||
## stuck using MBR/DOS and GRUB instead
|
## stuck using MBR/DOS and GRUB instead
|
||||||
grub = {
|
grub = {
|
||||||
enable = true;
|
enable = true;
|
||||||
|
|
@ -48,18 +48,34 @@
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|
||||||
## trim to keep SSDs healthy-ish
|
## Trim to keep SSDs healthy-ish
|
||||||
services.fstrim.enable = true;
|
services.fstrim.enable = true;
|
||||||
|
|
||||||
|
#powerManagement = {
|
||||||
|
#enable = true;
|
||||||
|
|
||||||
|
#powertop.enable = true;
|
||||||
|
|
||||||
|
#cpuFreqGovernor = Lib.mkDefault "performance";
|
||||||
|
|
||||||
|
#cpufreq = {
|
||||||
|
#min = 1500000;
|
||||||
|
#max = 4400000;
|
||||||
|
#};
|
||||||
|
#};
|
||||||
|
|
||||||
hardware = {
|
hardware = {
|
||||||
## Pick either "true" OR "lib.mkDefault -"
|
## Pick either "true" OR "lib.mkDefault -"
|
||||||
#cpu.intel.updateMicrocode = true;
|
|
||||||
cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
|
cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
|
||||||
|
#cpu.intel.updateMicrocode = true;
|
||||||
|
|
||||||
enableAllFirmware = true;
|
enableAllFirmware = true;
|
||||||
|
|
||||||
bluetooth.enable = false;
|
bluetooth.enable = false;
|
||||||
|
|
||||||
graphics = {
|
graphics = {
|
||||||
enable = true;
|
enable = true;
|
||||||
## packages for integrated graphics inside Hades
|
## Packages for integrated graphics inside Hades
|
||||||
extraPackages = with pkgs; [
|
extraPackages = with pkgs; [
|
||||||
intel-compute-runtime
|
intel-compute-runtime
|
||||||
intel-media-driver
|
intel-media-driver
|
||||||
|
|
@ -70,7 +86,7 @@
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
## some packages for managing the radeon GPU inside Hades
|
## Some packages for managing the radeon GPU inside Hades
|
||||||
environment.systemPackages = with pkgs; [
|
environment.systemPackages = with pkgs; [
|
||||||
umr
|
umr
|
||||||
radeontop
|
radeontop
|
||||||
|
|
@ -84,8 +100,8 @@
|
||||||
## 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
|
||||||
## with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
|
## with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
|
||||||
networking.useDHCP = lib.mkDefault true;
|
networking.useDHCP = lib.mkDefault true;
|
||||||
#networking.interfaces.enp0s31f6.useDHCP = lib.mkDefault true;
|
#networking.interfaces.enp0s31f6.useDHCP = lib.mkDefault true;
|
||||||
#networking.interfaces.wlp58s0.useDHCP = lib.mkDefault true;
|
#networking.interfaces.wlp58s0.useDHCP = lib.mkDefault true;
|
||||||
|
|
||||||
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
|
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue