From 3a5c6800faa7057471b4845bccd00541bc5ad5f0 Mon Sep 17 00:00:00 2001 From: Infinidoge Date: Tue, 11 Mar 2025 14:42:23 -0400 Subject: [PATCH] hosts/*: clean and standardize format --- hosts/Infini-DESKTOP/default.nix | 4 +-- hosts/Infini-DL360/default.nix | 20 +++++--------- hosts/Infini-FRAMEWORK/default.nix | 40 +++++----------------------- hosts/Infini-OPTIPLEX/default.nix | 26 +++--------------- hosts/Infini-RASPBERRY/default.nix | 17 ++---------- hosts/Infini-SD/default.nix | 18 +++++-------- hosts/Infini-SERVER/default.nix | 22 +++------------ hosts/data.cs.purdue.edu/default.nix | 8 +++--- hosts/hermes/default.nix | 11 ++++---- hosts/hestia/default.nix | 3 ++- hosts/iris/default.nix | 3 ++- hosts/vulcan/default.nix | 5 ++-- modules/global/nix.nix | 20 ++++++++++++++ 13 files changed, 62 insertions(+), 135 deletions(-) diff --git a/hosts/Infini-DESKTOP/default.nix b/hosts/Infini-DESKTOP/default.nix index a5f515b..bbb12c8 100644 --- a/hosts/Infini-DESKTOP/default.nix +++ b/hosts/Infini-DESKTOP/default.nix @@ -12,10 +12,10 @@ system.stateVersion = "21.11"; - info.loc.home = true; - age.rekey.hostPubkey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAID7uX1myj9ghv7wMoL038oGDCdScdyLd7RvYdnoioSBh root@Infini-DESKTOP"; + info.loc.home = true; + persist.directories = [ "/srv" ]; diff --git a/hosts/Infini-DL360/default.nix b/hosts/Infini-DL360/default.nix index 5063603..3d95d74 100644 --- a/hosts/Infini-DL360/default.nix +++ b/hosts/Infini-DL360/default.nix @@ -1,5 +1,4 @@ { - config, lib, pkgs, private, @@ -9,11 +8,8 @@ imports = [ ./hardware-configuration.nix ./disks.nix - ./secrets - ./web.nix - private.nixosModules.minecraft-servers ./authentik.nix ./conduwuit.nix @@ -33,23 +29,23 @@ ./thelounge.nix ./torrenting.nix ./vaultwarden.nix + ./web.nix ]; - networking.hostId = "8fa7a57c"; system.stateVersion = "23.11"; + age.rekey.hostPubkey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPjmvE76BcPwZSjeNGzlguDQC67Yxa3uyOf5ZmVDWNys root@Infini-DL360"; + info.loc.purdue = true; - age.rekey.hostPubkey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPjmvE76BcPwZSjeNGzlguDQC67Yxa3uyOf5ZmVDWNys root@Infini-DL360"; + networking.hostId = "8fa7a57c"; boot.binfmt.emulatedSystems = [ "aarch64-linux" ]; boot.binfmt.addEmulatedSystemsToNixSandbox = true; nix.distributedBuilds = false; - modules = { - hardware.form.server = true; - }; + modules.hardware.form.server = true; universe.programming.all.enable = true; @@ -111,9 +107,7 @@ "net.ipv6.conf.all.forwarding" = true; }; - hardware.infiniband = { - enable = true; - }; + hardware.infiniband.enable = true; services.fail2ban.enable = true; @@ -159,8 +153,6 @@ redirectCode = 302; }; - services.minecraft-servers.servers.emd-server.autoStart = lib.mkForce false; - services.borgbackup.jobs."persist" = let tmux = lib.getExe pkgs.tmux; diff --git a/hosts/Infini-FRAMEWORK/default.nix b/hosts/Infini-FRAMEWORK/default.nix index 46a90aa..d811420 100644 --- a/hosts/Infini-FRAMEWORK/default.nix +++ b/hosts/Infini-FRAMEWORK/default.nix @@ -1,5 +1,4 @@ { - config, pkgs, lib, ... @@ -14,10 +13,10 @@ system.stateVersion = "23.05"; - info.loc.purdue = true; - age.rekey.hostPubkey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIF7PmPq/7e+YIVAvIcs6EOJ3pZVJhinwus6ZauJ3aVp0 root@Infini-FRAMEWORK"; + info.loc.purdue = true; + boot.binfmt.emulatedSystems = [ "aarch64-linux" ]; boot.binfmt.addEmulatedSystemsToNixSandbox = true; @@ -68,8 +67,10 @@ extraRemotes = [ "lvfs-testing" ]; uefiCapsuleSettings.DisableCapsuleUpdateOnDisk = "true"; }; - systemd.services.fwupd-refresh.after = [ "network-online.target" ]; - systemd.services.fwupd-refresh.requires = [ "network-online.target" ]; + systemd.services.fwupd-refresh = { + after = [ "network-online.target" ]; + requires = [ "network-online.target" ]; + }; console.font = lib.mkDefault "${pkgs.terminus_font}/share/consolefonts/ter-v32n.psf.gz"; @@ -87,35 +88,6 @@ script = "${lib.getExe pkgs.brightnessctl} set 50%"; }; - nix.buildMachines = [ - #{ - # hostName = "infini-desktop"; - # system = "x86_64-linux"; - # supportedFeatures = [ "nixos-test" "benchmark" "big-parallel" "kvm" ]; - # protocol = "ssh-ng"; - # maxJobs = 16; - # speedFactor = 8; - # sshUser = "remotebuild"; - #} - { - hostName = "infini-dl360"; - systems = [ - "x86_64-linux" - "aarch64-linux" - ]; - supportedFeatures = [ - "nixos-test" - "benchmark" - "big-parallel" - "kvm" - ]; - protocol = "ssh-ng"; - maxJobs = 32; - speedFactor = 16; - sshUser = "remotebuild"; - } - ]; - networking.firewall.allowedUDPPorts = [ 51820 ]; networking.wg-quick.interfaces.wg0 = { diff --git a/hosts/Infini-OPTIPLEX/default.nix b/hosts/Infini-OPTIPLEX/default.nix index dfaaae0..4390428 100644 --- a/hosts/Infini-OPTIPLEX/default.nix +++ b/hosts/Infini-OPTIPLEX/default.nix @@ -1,4 +1,4 @@ -{ pkgs, ... }: +{ ... }: { imports = [ ./hardware-configuration.nix @@ -7,10 +7,10 @@ system.stateVersion = "23.05"; - info.loc.purdue = true; - age.rekey.hostPubkey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEG8fY684SPKeOUsJqaV6LJwwztWxztaU9nAHPBxBtyU root@Infini-OPTIPLEX"; + info.loc.purdue = true; + boot.loader.timeout = 1; modules = { @@ -30,24 +30,4 @@ defaultShared = true; openFirewall = true; }; - - nix.buildMachines = [ - { - hostName = "infini-dl360"; - systems = [ - "x86_64-linux" - "aarch64-linux" - ]; - supportedFeatures = [ - "nixos-test" - "benchmark" - "big-parallel" - "kvm" - ]; - protocol = "ssh-ng"; - maxJobs = 32; - speedFactor = 16; - sshUser = "remotebuild"; - } - ]; } diff --git a/hosts/Infini-RASPBERRY/default.nix b/hosts/Infini-RASPBERRY/default.nix index 1a6bedb..5c447f2 100644 --- a/hosts/Infini-RASPBERRY/default.nix +++ b/hosts/Infini-RASPBERRY/default.nix @@ -1,8 +1,8 @@ { inputs, config, - lib, pkgs, + lib, ... }: with lib; @@ -16,9 +16,7 @@ with lib; age.rekey.hostPubkey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIwPqTFCztLbYFFUej42hRzzCBzG6BCZIb7zXi2cxeJp root@Infini-RASPBERRY"; - modules = { - hardware.form.raspi = true; - }; + modules.hardware.form.raspi = true; nixpkgs.overlays = [ (final: super: { @@ -64,17 +62,6 @@ with lib; fsType = "ext4"; }; - home.programs.man.generateCaches = false; - - documentation = { - enable = false; - doc.enable = false; - man.enable = false; - man.man-db.enable = false; - man.mandoc.enable = false; - nixos.enable = false; - }; - hardware.deviceTree = { enable = true; # filter = "*rpi-4-*.dtb"; diff --git a/hosts/Infini-SD/default.nix b/hosts/Infini-SD/default.nix index 7d00871..ebe35f5 100644 --- a/hosts/Infini-SD/default.nix +++ b/hosts/Infini-SD/default.nix @@ -5,21 +5,17 @@ ./filesystems.nix ]; - networking.hostId = "3275c7d3"; + system.stateVersion = "23.11"; age.rekey.hostPubkey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIO8oViHNz64NG51uyll/q/hrSGwoHRgvYI3luD/IWTUT root@Infini-SD"; + networking.hostId = "3275c7d3"; + + modules.hardware.form.server = true; + boot.kernelPackages = pkgs.linuxPackages; - hardware.infiniband = { - enable = true; - }; - - modules = { - hardware = { - form.server = true; - }; - }; + hardware.infiniband.enable = true; networking = { interfaces.eno4 = { @@ -43,6 +39,4 @@ echo "eth" > /sys/bus/pci/devices/0000:04:00.0/mlx4_port2 ''; }; - - system.stateVersion = "23.11"; } diff --git a/hosts/Infini-SERVER/default.nix b/hosts/Infini-SERVER/default.nix index d7e5bb0..2aa5d1d 100644 --- a/hosts/Infini-SERVER/default.nix +++ b/hosts/Infini-SERVER/default.nix @@ -7,30 +7,14 @@ system.stateVersion = "22.05"; - info.loc.home = true; - age.rekey.hostPubkey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIO8ptHWTesaUzglq01O8OVqeAGxFhXutUZpkgPpBFqzY root@Infini-SERVER"; - modules = { - hardware = { - # gpu.nvidia = true; - form.server = true; - }; - services.apcupsd = { - enable = false; - primary = false; - config = { - address = "192.168.1.212"; - }; - }; - }; + info.loc.home = true; + + modules.hardware.form.server = true; boot.loader.timeout = 1; - services = { - avahi.reflector = true; - }; - persist.directories = [ "/srv" ]; diff --git a/hosts/data.cs.purdue.edu/default.nix b/hosts/data.cs.purdue.edu/default.nix index 39d1e5c..bdaa912 100644 --- a/hosts/data.cs.purdue.edu/default.nix +++ b/hosts/data.cs.purdue.edu/default.nix @@ -1,17 +1,15 @@ { - private, - config, lib, pkgs, + private, ... }: { + system.stateVersion = "23.11"; + modules.hardware.form.server = true; modules.secrets.enable = false; - info.loc.home = false; - - system.stateVersion = "23.11"; networking = { domain = "cs.purdue.edu"; diff --git a/hosts/hermes/default.nix b/hosts/hermes/default.nix index c42051b..db1fd54 100644 --- a/hosts/hermes/default.nix +++ b/hosts/hermes/default.nix @@ -6,17 +6,16 @@ ]; system.stateVersion = "24.11"; - networking.hostId = "deadbeef"; age.rekey.hostPubkey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIB0fWuozCHyPrkFKPcnqX1MyUAgnn2fJEpDSoD7bhDA4 root@Infini-STICK"; + networking.hostId = "deadbeef"; + boot.kernelPackages = pkgs.linuxPackages; - modules = { - hardware = { - audio.enable = true; - form.portable = true; - }; + modules.hardware = { + audio.enable = true; + form.portable = true; }; universe.programming.c.enable = false; diff --git a/hosts/hestia/default.nix b/hosts/hestia/default.nix index 630bfe8..0efb8b0 100644 --- a/hosts/hestia/default.nix +++ b/hosts/hestia/default.nix @@ -6,10 +6,11 @@ ]; system.stateVersion = "25.05"; - networking.hostId = "85eb2d89"; # "hestia" in base64->hex age.rekey.hostPubkey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBanlhzmtBf5stg2yYdxqb9FzFZmum/rlWod/akWQI3c root@hestia"; + networking.hostId = "85eb2d89"; # "hestia" in base64->hex + modules.hardware.form.server = true; modules.backups.enable = false; # hestia is a backup target boot.loader.timeout = 1; diff --git a/hosts/iris/default.nix b/hosts/iris/default.nix index 0a3e051..cbbaf86 100644 --- a/hosts/iris/default.nix +++ b/hosts/iris/default.nix @@ -6,10 +6,11 @@ ]; system.stateVersion = "25.05"; - networking.hostId = "8ab8acd3"; # "iris00" in base64->hex age.rekey.hostPubkey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGsdARqD3MibvnpcUxOZVtstIu9djk+umwFR5tzqKATH root@iris"; + networking.hostId = "8ab8acd3"; # "iris00" in base64->hex + modules.hardware.form.server = true; modules.backups.enable = false; # testing server boot.loader.timeout = 1; diff --git a/hosts/vulcan/default.nix b/hosts/vulcan/default.nix index 6801396..aa45fc2 100644 --- a/hosts/vulcan/default.nix +++ b/hosts/vulcan/default.nix @@ -1,13 +1,12 @@ { pkgs, ... }: { + system.stateVersion = "24.11"; + modules.hardware.form.server = true; modules.secrets.enable = false; - info.loc.home = false; info.loc.purdue = true; - system.stateVersion = "24.11"; - home-manager.useUserPackages = false; universe.programming.all.enable = true; diff --git a/modules/global/nix.nix b/modules/global/nix.nix index 827373f..f204730 100644 --- a/modules/global/nix.nix +++ b/modules/global/nix.nix @@ -157,4 +157,24 @@ in group = "remotebuild"; }; users.groups.remotebuild = { }; + + nix.buildMachines = [ + { + hostName = "infini-dl360"; + systems = [ + "x86_64-linux" + "aarch64-linux" + ]; + supportedFeatures = [ + "nixos-test" + "benchmark" + "big-parallel" + "kvm" + ]; + protocol = "ssh-ng"; + maxJobs = 32; + speedFactor = 16; + sshUser = "remotebuild"; + } + ]; }