flake.nix

@@ -31,16 +31,7 @@
     intake,
     intake-sources,
   }: {
-    nixosModules.beatific = import ./modules/beatific.nix;
-
     nixosConfigurations = {
-      backyard = nixpkgs-next.lib.nixosSystem {
-        system = "x86_64-linux";
-        modules = [
-          self.nixosModules.beatific
-          ./machine/backyard
-        ];
-      };
       catacomb = nixpkgs.lib.nixosSystem {
         system = "aarch64-linux";
         modules = [ ./machine/catacomb ];

machine/backyard/default.nix

@@ -1,79 +0,0 @@
-{ pkgs, ... }:
-
-{
-  imports = [
-    ./hardware-configuration.nix
-  ];
-
-  # Bootloader.
-  boot.loader = {
-    systemd-boot.enable = true;
-    efi.canTouchEfiVariables = true;
-  };
-
-  beatific.hostName = "backyard";
-  # networking.wireless.enable = true;  # Enables wireless support via wpa_supplicant.
-
-  # Enable networking
-  networking.networkmanager.enable = true;
-
-  # Set your time zone.
-  time.timeZone = "UTC";
-
-  services.ntp = {
-    enable = true;
-    servers = [ "time.nist.gov" ];
-  };
-
-  # Select internationalisation properties.
-  i18n.defaultLocale = "en_US.UTF-8";
-
-  i18n.extraLocaleSettings = {
-    LC_ADDRESS = "en_US.UTF-8";
-    LC_IDENTIFICATION = "en_US.UTF-8";
-    LC_MEASUREMENT = "en_US.UTF-8";
-    LC_MONETARY = "en_US.UTF-8";
-    LC_NAME = "en_US.UTF-8";
-    LC_NUMERIC = "en_US.UTF-8";
-    LC_PAPER = "en_US.UTF-8";
-    LC_TELEPHONE = "en_US.UTF-8";
-    LC_TIME = "en_US.UTF-8";
-  };
-
-  # Define a user account. Don't forget to set a password with ‘passwd’.
-  users.users.tvb = {
-    isNormalUser = true;
-    group = "tvb";
-    extraGroups = [ "networkmanager" "wheel" ];
-    openssh.authorizedKeys.keyFiles = [
-      ../../keys/tvb.palamas.pub
-      ../../keys/tvb.stagirite.pub
-      ../../keys/tvb.catacomb.pub
-      ../../keys/tvb.unfolder.pub
-    ];
-  };
-  users.groups.tvb = {};
-
-  environment.systemPackages = with pkgs; [
-    vim
-    git
-  ];
-
-  # Enable the OpenSSH daemon.
-  services.openssh.enable = true;
-
-  # Open ports in the firewall.
-  # networking.firewall.allowedTCPPorts = [ ... ];
-  # networking.firewall.allowedUDPPorts = [ ... ];
-  # Or disable the firewall altogether.
-  networking.firewall.enable = false;
-
-  # This value determines the NixOS release from which the default
-  # settings for stateful data, like file locations and database versions
-  # on your system were taken. It‘s perfectly fine and recommended to leave
-  # this value at the release version of the first install of this system.
-  # Before changing this value read the documentation for this option
-  # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
-  system.stateVersion = "23.05"; # Did you read the comment?
-
-}

machine/backyard/hardware-configuration.nix

@@ -1,46 +0,0 @@
-# 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, pkgs, modulesPath, ... }:
-
-{
-  imports =
-    [ (modulesPath + "/installer/scan/not-detected.nix")
-    ];
-
-  boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usb_storage" "usbhid" "sd_mod" "sr_mod" ];
-  boot.initrd.kernelModules = [ ];
-  boot.kernelModules = [ "kvm-intel" ];
-  boot.extraModulePackages = [ ];
-
-  fileSystems."/" =
-    { device = "/dev/disk/by-uuid/dd02cbda-2dd1-450d-9ece-92965ea3c3b8";
-      fsType = "ext4";
-    };
-
-  fileSystems."/nix" =
-    { device = "/dev/disk/by-uuid/0d031c2d-e66e-41d2-906f-1955b5a26f23";
-      fsType = "ext4";
-    };
-
-  fileSystems."/boot" =
-    { device = "/dev/disk/by-uuid/971B-96E8";
-      fsType = "vfat";
-    };
-
-  swapDevices =
-    [ { device = "/dev/disk/by-uuid/f55dc7e7-eeec-4be6-88e4-f3e94e749fd2"; }
-    ];
-
-  # 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.eno1.useDHCP = lib.mkDefault true;
-  # networking.interfaces.wlp0s20f0u14.useDHCP = lib.mkDefault true;
-
-  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
-  powerManagement.cpuFreqGovernor = lib.mkDefault "powersave";
-  hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
-}

machine/catacomb/default.nix

@@ -1,7 +1,7 @@
 { pkgs, lib, ... }:
 
 let
-  beatific = import ../../modules/beatific-config.nix;
+  beatific = import ../../modules/beatific.nix;
 in {
   imports = [
     ./hardware-configuration.nix

modules/beatific-config.nix

@@ -1,23 +0,0 @@
-# Shared configuration values
-let
-  nebula-port = 4242;
-  empyrean-vpn-ip = "10.22.20.1";
-  empyrean-ext-dns = "vpn.alogoulogoi.com";
-in {
-  nebula-defaults = {
-    listen.port = nebula-port;
-
-    # Don't filter at the VPN level
-    firewall.outbound = [ { port = "any"; proto = "any"; host = "any"; } ];
-    firewall.inbound  = [ { port = "any"; proto = "any"; host = "any"; } ];
-
-    settings = {
-      # Enable UDP holepunching both ways, which allows nodes to establish more direct connections with each other
-      punchy = { punch = true; response = true; };
-    };
-  };
-
-  inherit empyrean-vpn-ip;
-  empyrean-host-map = { ${empyrean-vpn-ip} = [ "${empyrean-ext-dns}:${toString nebula-port}" ]; };
-}
-

modules/beatific.nix

@@ -1,18 +1,23 @@
-{ config, lib, pkgs, ... }:
-
+# Shared configuration values
 let
-  inherit (lib) mkOption types;
-  cfg = config.beatific;
+  nebula-port = 4242;
+  empyrean-vpn-ip = "10.22.20.1";
+  empyrean-ext-dns = "vpn.alogoulogoi.com";
 in {
-  options = {
-    beatific.hostName = mkOption {
-      type = types.str;
-      description = "Hostname";
+  nebula-defaults = {
+    listen.port = nebula-port;
+
+    # Don't filter at the VPN level
+    firewall.outbound = [ { port = "any"; proto = "any"; host = "any"; } ];
+    firewall.inbound  = [ { port = "any"; proto = "any"; host = "any"; } ];
+
+    settings = {
+      # Enable UDP holepunching both ways, which allows nodes to establish more direct connections with each other
+      punchy = { punch = true; response = true; };
     };
   };
 
-  config = let
-  in {
-    networking.hostName = cfg.hostName;
-  };
+  inherit empyrean-vpn-ip;
+  empyrean-host-map = { ${empyrean-vpn-ip} = [ "${empyrean-ext-dns}:${toString nebula-port}" ]; };
 }
+