diff --git a/flake.nix b/flake.nix index eacbfdc..e0ec6aa 100644 --- a/flake.nix +++ b/flake.nix @@ -135,16 +135,20 @@ inherit (self) outputs; in { - ## Available through 'nixos-rebuild --flake /path/to/flake/directory#yourhostname' - nixosConfigurations = { - - ## Installer for easy nuke-n-paves + ## Installer for easy nuke-n-paves + packages.x86_64-linux = { iso = nixos-generators.nixosGenerate { system = "x86_64-linux"; modules = [ - ./hosts/iso + ./host/iso ]; + format = "iso"; + specialArgs = {inherit inputs outputs;}; }; + }; + + ## Available through 'nixos-rebuild --flake /path/to/flake/directory#yourhostname' + nixosConfigurations = { ## Desktop hades = nixpkgs.lib.nixosSystem { diff --git a/hosts/iso/default.nix b/hosts/iso/default.nix new file mode 100644 index 0000000..38ee01f --- /dev/null +++ b/hosts/iso/default.nix @@ -0,0 +1,30 @@ +{ pkgs, ... }: + +{ + imports = [ + + ## Host specific files + ./modules # more host specific configs + + ## Shared 'core' config options + ../../core/config.nix + + ]; + + ## ooh, hostname - this one's important! + networking.hostName = "orcus"; + + hardware = { + }; + + services = { + }; + + programs = { + }; + + ## Some packages for managing the hardware inside Hades + environment.systemPackages = with pkgs; [ + ]; + +} diff --git a/hosts/iso/modules/default.nix b/hosts/iso/modules/default.nix new file mode 100644 index 0000000..07d42c8 --- /dev/null +++ b/hosts/iso/modules/default.nix @@ -0,0 +1,10 @@ +{ ... }: + +{ + imports = [ + ## Selected modules for import + #./zfs.nix # zfs storage config + ./network.nix # network/internet config + ]; + +} diff --git a/hosts/iso/modules/network.nix b/hosts/iso/modules/network.nix new file mode 100644 index 0000000..57a9871 --- /dev/null +++ b/hosts/iso/modules/network.nix @@ -0,0 +1,108 @@ +{ ... }: + +{ + + imports = [ + # ./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.domain"; + #}; + + }; + + ## i knooooowwwwwww i need a proper firewall config but im laaaazzyyyyyyyyyy + networking.firewall = { + 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.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/"; + #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" ]; + #}; + + }; + }; + +} diff --git a/hosts/iso/modules/zfs.nix b/hosts/iso/modules/zfs.nix new file mode 100644 index 0000000..b40ce60 --- /dev/null +++ b/hosts/iso/modules/zfs.nix @@ -0,0 +1,68 @@ +## 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 + +{ 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"; + }; + +}