moved hosts/ to top level

This commit is contained in:
serenity-F 2024-11-07 15:30:18 +10:00
parent 0cddc8eede
commit 09bf89f02b
No known key found for this signature in database
12 changed files with 0 additions and 0 deletions

View file

@ -1,91 +0,0 @@
{ lib, config, pkgs, modulesPath, ... }:
{
imports = [
./hardware
./network
../../config.nix
];
nix = {
settings = {
};
gc = {
## Automatically run 'nix-collect-garbage'
automatic = true;
## Ever day.
dates = "daily";
## and clear junk older than x days
options = "--delete-older-than 3d";
## No clue what this does lol.
#persistent = true;
};
};
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
];
}

View file

@ -1,185 +0,0 @@
{ lib, config, pkgs, modulesPath, ... }:
{
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
## as well as the host-specific hardware config options
(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."/" = {
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;
};
};
};
## 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
## (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

@ -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
];
}

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

@ -1,68 +0,0 @@
## ZFS Support NixOS module
## temporary location while we figure out how ZFS works,
## eventually this will be embedded into the flake in a better way
{ config, lib, pkgs, ... }:
let
## This 'let' binding creates an attribute set
## called "LatestZfsLinux", which we can call as
## a package to specify when building our kernel.
latestZfsLinux = lib.pipe pkgs.linuxKernel.packages [
builtins.attrValues
(builtins.filter (
kPkgs:
(builtins.tryEval kPkgs).success
&& kPkgs ? kernel
&& kPkgs.kernel.pname == "linux"
&& !kPkgs.zfs.meta.broken
))
(builtins.sort (a: b: (lib.versionOlder a.kernel.version b.kernel.version)))
lib.last
];
in
{
imports = [
];
## Enable zfs in kernel and boot
boot = {
kernelPackages = latestZfsLinux;
supportedFilesystems = [ "zfs" ];
zfs = {
extraPools = [ "orcus" ];
forceImportRoot = false;
};
};
#fileSystems."/home/serenity/Disks/Orcus" = {
#device = "orcus";
#fsType = "zfs";
#options = [ "users" ];
#};
environment.systemPackages = with pkgs; [
zfs
];
## Enable trim for ZFS SSDs
services = {
zfs = {
## Trim for SSSds with ZFS
#trim.enable = true;
## Autoscrub data integrity ZFS service,
## more to be added soon
autoScrub = {
enable = true;
};
};
};
networking = {
hostId = "603b0c8b";
};
}

View file

@ -1,82 +0,0 @@
{ pkgs, lib, config, ... }:
{
imports = [
# ./file.nix
];
networking = {
## ooh, hostname - that one's important!
hostName = "hades";
wireless.enable = false;
networkmanager = {
enable = true;
};
#nameservers = [
#"1.1.1.1"
#];
#proxy = {
#default = "https://user:password@proxy:port/";
#noProxy = "127.0.0.1, localhost, internal.domain";
#};
};
## i knooooowwwwwww i need a firewall but im laaaazzyyyyyyyyyy
networking.firewall = rec {
enable = true;
#checkReversePath = "loose";
#allowedTCPPortRanges = [ { from = 1720; to = 1770; } ];
#allowedUDPPortRanges = allowedTCPPortRanges;
#interfaces."DEVICENAME".allowedTCPPorts = [
#22999
#]
#allowedTCPPorts = [
#22000
#21027
#25565
#];
#allowedUDPPorts = [
#22000
#21027
#41641
#51820
#];
};
services.jellyfin = {
enable = true;
openFirewall = true;
};
## 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/";
#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";
};
## 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" "persephone" ];
#};
};
};
}

View file

@ -1,36 +0,0 @@
{ inputs, outputs, lib, config, pkgs, ... }:
{
imports = [
## Import necessary flake modules
#"${builtins.fetchTarball "<flake module url>"}/module.nix"
## Include host specific options
./hardware
./network
## Include core config options
../../config.nix
];
nix = {
#settings = {
#};
gc = {
## Automatically run 'nix-collect-garbage',
automatic = true;
## every day,
dates = "daily";
## and clear junk older than 1 day
options = "--delete-older-than 1d";
## No clue what this does lol.
persistent = true;
};
};
}

View file

@ -1,112 +0,0 @@
{ config, lib, pkgs, modulesPath, ... }:
{
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
## as well as the host-specific hardware config options
(modulesPath + "/installer/scan/not-detected.nix")
## Disko config, should eventually let us nuke our boot drive and reinstall
## with zero worries.
./disko.nix
];
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 = {
#"crypto_keyfile.bin" = null;
};
#luks = {
#devices."luks-DISK_UUID" = {
#device = "/dev/disk/by-uuid/DISK_UUID";
#keyfile = "/crypto_keyfile.bin";
#};
#};
};
loader = {
systemd-boot = {
enable = true;
configurationLimit = 5;
};
efi = {
canTouchEfiVariables = true;
#efiSysMountPoint = "/boot/efi";
};
};
};
## 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 = {
## Pick either "true" OR "lib.mkDefault -"
cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
#cpu.intel.updateMicrocode = true;
enableAllFirmware = true;
bluetooth.enable = false;
graphics = {
enable = true;
## Packages for integrated graphics inside Persephone
extraPackages = with pkgs; [
intel-compute-runtime
intel-media-driver
vaapiIntel
vaapiVdpau
libvdpau-va-gl
];
};
};
## Trying out an alternate memory allocator
environment.memoryAllocator.provider = "graphene-hardened-light";
## 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";
}

View file

@ -1,66 +0,0 @@
{
disko.devices = {
disk = {
sda = {
type = "disk";
device = "/dev/sda";
content = {
type = "gpt";
partitions = {
ESP = {
size = "512M";
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" ];
};
};
};
};
};
};
};
};
};
};
}

View file

@ -1,66 +0,0 @@
{ pkgs, lib, config, ... }:
{
imports = [
#./file.nix
];
networking = {
hostName = "persephone";
wireless.enable = false;
networkmanager = {
enable = true;
};
#nameservers = [
#"1.1.1.1"
#];
#proxy = {
#default = "https://user:password@proxy:port/";
#noProxy = "127.0.0.1, localhost, internal.comain";
#};
firewall = {
enable = false;
#checkReversePath = "loose";
#allowedTCPPorts = [ 22000 21027 25565 ];
#allowedUDPPorts = [ 22000 21027 41641 51820 ];
#allowedTCPPortRanges = [
#{ from = 9999; to = 9999; } # KDE COnnect
#{ from = 9999; to = 9999; } # Nicotine+
#];
#allowedUDPPortRanges = [
#{ from = 9999; to = 9999; } # KDE COnnect
#];
#interfaces."DEVICENAME".allowedTCPPorts = [ 22999 ]
};
};
services.syncthing = {
enable = false;
dataDir = "/home/serenity/sync/";
configDir = "/home/serenity/flakes/nixdots/home/common/dotconfig/syncthing/";
user = "serenity";
settings = {
devices = {
#hades.id = "DEVICE_ID";
#proserpina.id = "DEVICE_ID";
#hecate.id = "DEVICE_ID";
};
folders = {
#"FOLDER_ID" = {
#path = "/home/serenity/Documents/Notes";
#devices = [ "hecate" "hades" "proserpina" ];
#};
#"FOLDER_ID" = {
#path = "/home/serenity/Documents/Notes";
#devices = [ "hecate" "hades" "proserpina" ];
#};
#"FOLDER_ID" = {
#path = "/home/serenity/Documents/Notes";
#devices = [ "hecate" "hades" "proserpina" ];
#};
};
};
};
}