refreshed
This commit is contained in:
parent
625aeb598b
commit
634500fc5c
30 changed files with 84 additions and 172 deletions
|
|
@ -28,26 +28,21 @@
|
|||
supportedFilesystems =
|
||||
[ "vfat" "ext4" ]; # adds fat32 and ext3 filesystems to defaults
|
||||
|
||||
## Specifies where GRUB is installed
|
||||
loader = {
|
||||
grub = {
|
||||
enable = true;
|
||||
device = "/dev/nvme0n1";
|
||||
enableCryptodisk = true; # allows decrypting luks drive
|
||||
efi.canTouchEfiVariables = true;
|
||||
systemd-boot = {
|
||||
enable = true;
|
||||
};
|
||||
};
|
||||
initrd.luks.devices = { # luks options
|
||||
root = { # Use https://nixos.wiki/wiki/Full_Disk_Encryption
|
||||
device = "/dev/disk/by-uuid/5526aab7-b779-4fc8-95bd-9452bc3a9232";
|
||||
preLVM = true;
|
||||
};
|
||||
|
||||
initrd.luks.devices."luks-55f7d546-fac9-4ea0-a21e-4c50ecc0d67d".device = "/dev/disk/by-uuid/55f7d546-fac9-4ea0-a21e-4c50ecc0d67d";
|
||||
|
||||
## Uhhhhhhh
|
||||
#Asphodel = { # secondary partition on Tartarus drive
|
||||
#device = "/dev/disk/by-uuid/45f5f6ad-a676-4bc1-ad4b-e3e26b5697f4";
|
||||
#preLVM =false;
|
||||
#};
|
||||
};
|
||||
#};
|
||||
|
||||
};
|
||||
|
||||
|
|
|
|||
63
core/hosts/hades/hardware.nix
Executable file → Normal file
63
core/hosts/hades/hardware.nix
Executable file → Normal file
|
|
@ -1,57 +1,36 @@
|
|||
# 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, modulesPath, user, ... }:
|
||||
{ config, lib, pkgs, modulesPath, ... }:
|
||||
|
||||
{
|
||||
imports =
|
||||
[ (modulesPath + "/installer/scan/not-detected.nix")
|
||||
];
|
||||
|
||||
imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
|
||||
|
||||
boot = {
|
||||
|
||||
initrd = {
|
||||
availableKernelModules =
|
||||
[ "xhci_pci" "ehci_pci" "ahci" "nvme" "usbhid" "usb_storage" "sd_mod" ];
|
||||
|
||||
kernelModules = [ "dm-snapshot" ];
|
||||
boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "ehci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" ];
|
||||
boot.initrd.kernelModules = [ ];
|
||||
boot.kernelModules = [ "kvm-amd" ];
|
||||
boot.extraModulePackages = [ ];
|
||||
boot.blacklistedKernelModules = [ "ntfs3" ];
|
||||
|
||||
fileSystems."/" =
|
||||
{ device = "/dev/mapper/luks-35440a88-293e-455b-a018-ee1086b07321";
|
||||
fsType = "ext4";
|
||||
};
|
||||
|
||||
kernelModules = [ "kvm-intel" ];
|
||||
boot.initrd.luks.devices."luks-35440a88-293e-455b-a018-ee1086b07321".device = "/dev/disk/by-uuid/35440a88-293e-455b-a018-ee1086b07321";
|
||||
|
||||
extraModulePackages = [ ];
|
||||
|
||||
blacklistedKernelModules = [ "ntfs3" ];
|
||||
|
||||
};
|
||||
|
||||
fileSystems."/" = {
|
||||
device = "/dev/disk/by-uuid/ad648423-7aa4-4f0f-b157-2f6b458130f7";
|
||||
fsType = "ext4";
|
||||
};
|
||||
|
||||
fileSystems."/boot" = {
|
||||
device = "/dev/disk/by-uuid/552D-851F";
|
||||
fsType = "vfat";
|
||||
options = [ "fmask=0022" "dmask=0022" ];
|
||||
};
|
||||
|
||||
fileSystems."/run/media/${user}/Tartarus" = {
|
||||
device = "/dev/disk/by-uuid/26d8d9d1-67d2-4d61-a092-10ed7368b9f6";
|
||||
fsType = "ext4";
|
||||
};
|
||||
fileSystems."/boot" =
|
||||
{ device = "/dev/disk/by-uuid/2C83-7F40";
|
||||
fsType = "vfat";
|
||||
options = [ "fmask=0077" "dmask=0077" ];
|
||||
};
|
||||
|
||||
swapDevices =
|
||||
[{ device = "/dev/disk/by-uuid/b7ccf8c3-3641-4035-b91f-f7e54c6dd380"; }];
|
||||
|
||||
# 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;
|
||||
[ { device = "/dev/mapper/luks-55f7d546-fac9-4ea0-a21e-4c50ecc0d67d"; }
|
||||
];
|
||||
|
||||
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
|
||||
|
||||
hardware.cpu.intel.updateMicrocode =
|
||||
lib.mkDefault config.hardware.enableRedistributableFirmware;
|
||||
hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -18,20 +18,20 @@
|
|||
## Specific TCP ports to be opened
|
||||
allowedTCPPorts = [
|
||||
2234 # soulseek/nicotine-plus
|
||||
8384 # syncthing
|
||||
8096 # jellyfin http
|
||||
8920 # jellyfin https
|
||||
#8384 # syncthing
|
||||
#8096 # jellyfin http
|
||||
#8920 # jellyfin https
|
||||
];
|
||||
|
||||
## Specific UDP ports to be opened
|
||||
allowedUDPPorts = [
|
||||
2234 # soulseek/nicotine-plus
|
||||
8834 # syncthing
|
||||
7359 # jellyfin - client discovery
|
||||
#8834 # syncthing
|
||||
#7359 # jellyfin - client discovery
|
||||
];
|
||||
|
||||
## Ranges for TCP and UDP ports to be opened
|
||||
## - disabled for now as network infrastructure is minimal
|
||||
## - disabled for now, network infrastructure is minimal
|
||||
#allowedTCPPortRanges = [ { from = 1720; to = 1770; } ];
|
||||
#allowedUDPPortRanges = allowedTCPPortRanges;
|
||||
|
||||
|
|
@ -39,11 +39,11 @@
|
|||
|
||||
## Systemd service for the dnscrypt config declared below
|
||||
#systemd.services.dnscrypt-proxy2.serviceConfig = {
|
||||
#StateDirectory = "dnscrypt-proxy";
|
||||
#StateDirectory = "dnscrypt-proxy";
|
||||
#};
|
||||
|
||||
services.dnscrypt-proxy = {
|
||||
enable = false;
|
||||
enable = true;
|
||||
settings = {
|
||||
ipv6_servers = true;
|
||||
require_dnssec = true;
|
||||
|
|
@ -54,8 +54,7 @@
|
|||
"https://download.dnscrypt.info/resolvers-list/v3/public-resolvers.md"
|
||||
];
|
||||
## key and cachefile to verify servers and authenticity
|
||||
minisign_key =
|
||||
"RWQf6LRCGA9i53mlYecO4IzT51TGPpvWucNSCh1CBM0QTaLn73Y7GFO3";
|
||||
minisign_key = "RWQf6LRCGA9i53mlYecO4IzT51TGPpvWucNSCh1CBM0QTaLn73Y7GFO3";
|
||||
cache_file = "/var/lib/dnscrypt-proxy2/public-resolvers.md";
|
||||
};
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue