tidying hosts/ directory

This commit is contained in:
serenity-F 2024-11-16 22:33:35 +10:00
parent fe7591f977
commit e2a2602a7e
No known key found for this signature in database
11 changed files with 104 additions and 270 deletions

View file

@ -20,21 +20,19 @@
## No bluetooth inside Hades (yet)
bluetooth.enable = false;
## GPU and graphics
graphics = {
enable = true;
#enable32Bit = false;
## Packages for the iGPU inside Hades
extraPackages = with pkgs; [
#intel-compute-runtime
#intel-media-driver
#libvdpau-va-gl
#vaapiIntel
#vaapiVdpau
#libvdpau-va-gl
];
};
## Packages for the dGPU inside Hades
amdgpu = {
initrd.enable = true;
@ -49,11 +47,9 @@
#};
};
};
};
programs = {
## For tweaking system performance
corectrl = {
enable = true;
@ -66,11 +62,10 @@
};
## Performance tweaking continued
tuxclocker = {
enable = false;
enable = true;
enableAMD = true;
useUnfree = true;
};
};
## Some packages for managing the hardware inside Hades
@ -84,6 +79,7 @@
nvtopPackages.amd
];
## Systemd services for lact
systemd = {
packages = with pkgs; [
lact

View file

@ -2,13 +2,9 @@
{
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

@ -13,43 +13,31 @@
];
## ooh, hostname - this one's important!
networking.hostName = "hades";
networking.hostName = "orcus";
hardware = {
## No bluetooth inside Hades (yet)
## No bluetooth inside Orcus
bluetooth.enable = false;
## Packages for the iGPU inside Orcus
graphics = {
enable = true;
#enable32Bit = false;
## Packages for the iGPU inside Hades
enable32Bit = true;
extraPackages = with pkgs; [
#intel-compute-runtime
#intel-media-driver
#vaapiIntel
#vaapiVdpau
#libvdpau-va-gl
intel-compute-runtime
intel-media-driver
libvdpau-va-gl
vaapiIntel
vaapiVdpau
];
};
};
## Packages for the dGPU inside Hades
amdgpu = {
initrd.enable = true;
opencl.enable = true;
## Vulkan packages for the dGPU inside Hades
amdvlk = {
#enable = false;
#package = [ ];
#support32Bit.enable = false;
#supportExperimental.enable = false;
#settings = {
#};
};
};
services = {
};
programs = {
@ -57,38 +45,14 @@
## For tweaking system performance
corectrl = {
enable = true;
## Allows tweaking GPU performance
gpuOverclock = {
enable = true;
## Needed for radeon GPU overclocking
ppfeaturemask = "0xfffd7fff";
};
};
## Performance tweaking continued
tuxclocker = {
enable = false;
enableAMD = true;
useUnfree = true;
};
};
## Some packages for managing the hardware inside Hades
environment.systemPackages = with pkgs; [
#umr
lact
radeontop
#amdgpu_top
#radeontools
#radeon-profile
nvtopPackages.amd
];
systemd = {
packages = with pkgs; [
lact
];
services.lactd.wantedBy = [ "multi-user.target" ];
};
}

View file

@ -1,90 +0,0 @@
{ lib, config, pkgs, modulesPath, ... }:
{
imports = [
## Include results from the (non-existent) hardware scan
## as well as the host-specific hardware config options
(modulesPath + "/installer/scan/not-detected.nix")
];
fileSystems."/" = {
device = "/dev/disk/by-uuid/5cbed60c-33e3-4d69-a39e-c1d6d19406ea";
fsType = "btrfs";
options = [ "subvol=@" ];
};
fileSystems."/home/serenity/Disks/Tartarus" = {
device = "/dev/disk/by-uuid/26d8d9d1-67d2-4d61-a092-10ed7368b9f6";
fsType = "ext4";
options = [ "users" ];
};
#fileSystems."/home/serenity/Disks/Orcus" = {
#device = "/dev/disk/???";
#fsType = "zfs";
#options = [ ];
#};
swapDevices = [ ];
## Enable swap on luks
boot = {
kernelModules = [ "kvm-intel" ];
extraModulePackages = [ ];
supportedFilesystems = [
"btrfs"
"xfs"
"ntfs"
];
initrd = {
systemd.enable = true;
kernelModules = [ ];
availableKernelModules = [
"xhci_pci"
"ehci_pci"
"ahci"
"usbhid"
"usb_storage"
"sd_mod"
];
secrets = {
"/boot/crypto_keyfile.bin" = null;
};
luks = {
devices."luks-3de671ef-22a3-4f28-9251-a0687ab44f96" = {
device = "/dev/disk/by-uuid/3de671ef-22a3-4f28-9251-a0687ab44f96";
#keyFile = "/boot/crypto_keyfile.bin";
};
};
};
loader = {
efi = {
canTouchEfiVariables = true;
};
## For some reason GPT/UEFI didn't work, so neither does systemd-boot
## stuck using MBR/DOS and GRUB instead
grub = {
enable = true;
device = "/dev/sda";
enableCryptodisk = true;
};
};
};
## 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;
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
}

View file

@ -2,13 +2,9 @@
{
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,69 +0,0 @@
{
disko.devices = {
disk = {
sda = {
type = "disk";
device = "/dev/disk/by-id/ata-SAMSUNG_MZNLN128HAHQ-000H1_S3T8NF0K724651";
content = {
type = "gpt";
partitions = {
ESP = {
size = "1024M";
type = "EF00";
content = {
type = "filesystem";
format = "vfat";
mountpoint = "/boot";
mountOptions = [
"defaults"
];
};
};
luks = {
size = "100%";
content = {
type = "luks";
name = "pomegranate";
## disable settings.keyFile if you want to use interactive password entry
#passwordFile = "/tmp/secret.key"; # Interactive
settings = {
allowDiscards = true;
#keyFile = "/tmp/secret.key";
};
#additionalKeyFiles = [ "/tmp/additionalSecret.key" ];
content = {
type = "btrfs";
extraArgs = [ "-f" ];
subvolumes = {
"/root" = {
mountpoint = "/";
mountOptions = [ "compress=zstd" "noatime" ];
};
"/home" = {
mountpoint = "/home";
mountOptions = [ "compress=zstd" "noatime" ];
};
"/nix" = {
mountpoint = "/nix";
mountOptions = [ "compress=zstd" "noatime" ];
};
"/swap" = {
mountpoint = "/.swapvol";
swap.swapfile.size = "8192M";
};
};
};
};
};
};
};
};
};
};
}

View file

@ -21,16 +21,16 @@
## Enable bluetooth inside Persephone
bluetooth.enable = true;
## Packages for the iGPU inside Persephone
graphics = {
enable = true;
## Packages for the iGPU inside Persephone
enable32Bit = true;
extraPackages = with pkgs; [
intel-compute-runtime
intel-media-driver
libvdpau-va-gl
vaapiIntel
vaapiVdpau
libvdpau-va-gl
];
};

View file

@ -6,8 +6,6 @@
## Selected modules for import
./disko.nix # disk/partition config
./network.nix # network/internet config
#./syncthing.nix # syncthing config
];
}

View file

@ -3,62 +3,105 @@
{
imports = [
#./file.nix
# ./file.nix
];
networking = {
wireless.enable = false;
nameservers = [ "127.0.0.1" "::1" ];
networkmanager = {
enable = true;
dns = "none";
};
#nameservers = [
#"1.1.1.1"
#];
#proxy = {
#default = "https://user:password@proxy:port/";
#noProxy = "127.0.0.1, localhost, internal.comain";
#noProxy = "127.0.0.1, localhost, internal.domain";
#};
firewall = {
enable = false;
};
## i knooooowwwwwww i need a proper firewall config but im laaaazzyyyyyyyyyy
networking.firewall = rec {
enable = true;
#checkReversePath = "loose";
#allowedTCPPorts = [ 22000 21027 25565 ];
#allowedUDPPorts = [ 22000 21027 41641 51820 ];
#allowedTCPPortRanges = [
#{ from = 9999; to = 9999; } # KDE COnnect
#{ from = 9999; to = 9999; } # Nicotine+
#allowedTCPPortRanges = [ { from = 1720; to = 1770; } ];
#allowedUDPPortRanges = allowedTCPPortRanges;
#interfaces."DEVICENAME".allowedTCPPorts = [
#22999
#]
#allowedTCPPorts = [
#22000
#21027
#25565
#];
#allowedUDPPortRanges = [
#{ from = 9999; to = 9999; } # KDE COnnect
#allowedUDPPorts = [
#22000
#21027
#41641
#51820
#];
#interfaces."DEVICENAME".allowedTCPPorts = [ 22999 ]
};
services.dnscrypt-proxy2 = {
enable = true;
settings = {
ipv6_servers = true;
require_dnssec = true;
sources.public-resolvers = {
urls = [
"https://raw.githubusercontent.com/DNSCrypt/dnscrypt-resolvers/master/v3/public-resolvers.md"
"https://download.dnscrypt.info/resolvers-list/v3/public-resolvers.md"
];
cache_file = "/var/lib/dnscrypt-proxy2/public-resolvers.md";
minisign_key = "RWQf6LRCGA9i53mlYecO4IzT51TGPpvWucNSCh1CBM0QTaLn73Y7GFO3";
};
# You can choose a specific set of servers from https://github.com/DNSCrypt/dnscrypt-resolvers/blob/master/v3/public-resolvers.md
server_names = [
"adfilter-syd"
"adfilter-syd-ipv6"
"cs-sydney"
"cs-singapore"
"userspace-australia"
"userspace-australia-ipv6"
];
};
};
systemd.services.dnscrypt-proxy2.serviceConfig = {
StateDirectory = "dnscrypt-proxy";
};
## syncthing for device <-> device filesharing and,,, syncing
## still not set up, grrrr
services.syncthing = {
enable = false;
user = "serenity";
dataDir = "/home/serenity/sync/";
configDir = "/home/serenity/flakes/nixdots/home/common/dotconfig/syncthing/";
user = "serenity";
settings = {
devices = {
#overrideDevices = true;
#overrideFolder = true;
## these 3 devices are pretty much my entire ecosystem for now
settings.devices = {
#hades.id = "DEVICE_ID";
#proserpina.id = "DEVICE_ID";
#hecate.id = "DEVICE_ID";
};
folders = {
## plan to have this dir automatically committed and pushed to a git repo daily
settings.folders = {
#"FOLDER_ID" = {
#path = "/home/serenity/Documents/Notes";
#devices = [ "hecate" "hades" "proserpina" ];
#devices = [ "hecate" "hades" "persephone" ];
#};
#"FOLDER_ID" = {
#path = "/home/serenity/Documents/Notes";
#devices = [ "hecate" "hades" "proserpina" ];
#};
#"FOLDER_ID" = {
#path = "/home/serenity/Documents/Notes";
#devices = [ "hecate" "hades" "proserpina" ];
#};
};
};
};