more tidying - commented most of hosts/hades

This commit is contained in:
serenity-F 2024-09-14 01:56:29 +10:00
parent b91d96a84c
commit 5ccd508676
No known key found for this signature in database
6 changed files with 141 additions and 148 deletions

View file

@ -1,12 +1,10 @@
# Do not modify this file! It was generated by ‘nixos-generate-config’
# and may be overwritten by future invocations. Please make changes
# to /etc/nixos/configuration.nix instead.
{ config, lib, pkgs, modulesPath, ... }:
{
imports = [
(modulesPath + "/installer/scan/not-detected.nix")
#./disko-config.nix
## commented out disko for now as I have broken it :D
#./disko.nix
];
fileSystems."/" =
@ -15,17 +13,9 @@
options = [ "subvol=@" ];
};
#fileSystems."/boot" =
#{ device = "/dev/disk/by-uuid/5cbed60c-33e3-4d69-a39e-c1d6d19406ea";
#fsType = "btrfs";
#options = [ "subvol=@" ];
#};
#boot.initrd.luks.devices."luks-3de671ef-22a3-4f28-9251-a0687ab44f96".device = "/dev/disk/by-uuid/3de671ef-22a3-4f28-9251-a0687ab44f96";
swapDevices = [ ];
# Enable swap on luks
## Enable swap on luks
boot = {
kernelModules = [ "kvm-intel" ];
extraModulePackages = [ ];
@ -46,44 +36,41 @@
loader = {
efi = {
canTouchEfiVariables = true;
#efiSysMountPoint = "/boot/efi";
};
#systemd-boot = {
#enable = false;
#configurationLimit = 10;
#};
};
## for some reason GPT/UEFI didn't work, so neither does systemd-boot
## stuck using MBR/DOS and GRUB instead
grub = {
enable = true;
#efiSupport = true;
#efiInstallAsRemovable = true;
device = "/dev/sda";
#useOSProber = true;
enableCryptodisk = true;
};
};
};
## trim to keep SSDs healthy-ish
services.fstrim.enable = true;
hardware = {
#cpu.intel.updateMicrocode = true;
## Pick either "true" OR "lib.mkDefault -"
#cpu.intel.updateMicrocode = true;
cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
enableAllFirmware = true;
bluetooth.enable = false;
graphics = {
enable = true;
extraPackages = with pkgs; [
intel-compute-runtime
intel-media-driver
vaapiIntel
vaapiVdpau
libvdpau-va-gl
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
];
};
};
};
## some packages for managing the radeon GPU inside Hades
environment.systemPackages = with pkgs; [
umr
radeontop
@ -92,10 +79,10 @@
radeon-profile
];
# 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
# 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`.
## 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
## 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`.
networking.useDHCP = lib.mkDefault true;
#networking.interfaces.enp0s31f6.useDHCP = lib.mkDefault true;
#networking.interfaces.wlp58s0.useDHCP = lib.mkDefault true;