From 409ce6b47dbb063e9cc3675cdb91da4a8c9237dc Mon Sep 17 00:00:00 2001 From: Franck Cuny Date: Mon, 13 Oct 2025 19:00:52 -0700 Subject: introduce a module for digital ocean droplet --- machines/nixos/x86_64-linux/do-rproxy/default.nix | 19 +----- .../nixos/x86_64-linux/do-rproxy/digitalocean.nix | 55 ----------------- modules/nixos/default.nix | 1 + modules/nixos/hardware/default.nix | 6 ++ modules/nixos/hardware/do-droplet.nix | 71 ++++++++++++++++++++++ 5 files changed, 81 insertions(+), 71 deletions(-) delete mode 100644 machines/nixos/x86_64-linux/do-rproxy/digitalocean.nix create mode 100644 modules/nixos/hardware/default.nix create mode 100644 modules/nixos/hardware/do-droplet.nix diff --git a/machines/nixos/x86_64-linux/do-rproxy/default.nix b/machines/nixos/x86_64-linux/do-rproxy/default.nix index 877f4c5..32005e0 100644 --- a/machines/nixos/x86_64-linux/do-rproxy/default.nix +++ b/machines/nixos/x86_64-linux/do-rproxy/default.nix @@ -1,30 +1,15 @@ -{ - config, - lib, - modulesPath, - ... -}: +{ config, modulesPath, ... }: { imports = [ - (modulesPath + "/profiles/qemu-guest.nix") (modulesPath + "/virtualisation/digital-ocean-config.nix") ./disks.nix - ./digitalocean.nix ./secrets.nix ./profiles/nginx.nix ]; - # do not use DHCP, as DigitalOcean provisions IPs using cloud-init - networking.useDHCP = lib.mkForce false; - networking.hostName = "do-rproxy"; - boot.loader.grub = { - efiSupport = true; - efiInstallAsRemovable = true; - }; - networking.wireguard = { enable = true; interfaces.wg0 = { @@ -44,5 +29,7 @@ networking.firewall.trustedInterfaces = [ "wg0" ]; networking.firewall.allowedUDPPorts = [ 51871 ]; + my.modules.hardware.do-droplet.enable = true; + system.stateVersion = "25.05"; # Did you read the comment? } diff --git a/machines/nixos/x86_64-linux/do-rproxy/digitalocean.nix b/machines/nixos/x86_64-linux/do-rproxy/digitalocean.nix deleted file mode 100644 index 574fe99..0000000 --- a/machines/nixos/x86_64-linux/do-rproxy/digitalocean.nix +++ /dev/null @@ -1,55 +0,0 @@ -{ ... }: -{ - # this one seems to always be broken - systemd.services.growpart.enable = false; - - # in order to get networking setup we need to enable it in cloud-init - # Disables all modules that do not work with NixOS - # Based on https://github.com/nix-community/nixos-anywhere-examples/blob/7f945ff0ae676c0eb77360b892add91328dd1f17/digitalocean.nix - services.cloud-init = { - enable = true; - network.enable = true; - settings = { - datasource_list = [ - "ConfigDrive" - "Digitalocean" - ]; - datasource.ConfigDrive = { }; - datasource.Digitalocean = { }; - # Based on https://github.com/canonical/cloud-init/blob/main/config/cloud.cfg.tmpl - cloud_init_modules = [ - "seed_random" - "bootcmd" - "write_files" - "growpart" - "resizefs" - "set_hostname" - "update_hostname" - "set_password" - ]; - cloud_config_modules = [ - "ssh-import-id" - "keyboard" - "runcmd" - "disable_ec2_metadata" - ]; - cloud_final_modules = [ - "write_files_deferred" - "puppet" - "chef" - "ansible" - "mcollective" - "salt_minion" - "reset_rmc" - "scripts_per_once" - "scripts_per_boot" - "scripts_user" - "ssh_authkey_fingerprints" - "keys_to_console" - "install_hotplug" - "phone_home" - "final_message" - ]; - }; - }; -} diff --git a/modules/nixos/default.nix b/modules/nixos/default.nix index 73e144c..bc5c6de 100644 --- a/modules/nixos/default.nix +++ b/modules/nixos/default.nix @@ -4,6 +4,7 @@ ./backups.nix ./base.nix ./cgroups.nix + ./hardware ./home-manager.nix ./nas-client.nix ./nix.nix diff --git a/modules/nixos/hardware/default.nix b/modules/nixos/hardware/default.nix new file mode 100644 index 0000000..f6ea0d9 --- /dev/null +++ b/modules/nixos/hardware/default.nix @@ -0,0 +1,6 @@ +{ ... }: +{ + imports = [ + ./do-droplet.nix + ]; +} diff --git a/modules/nixos/hardware/do-droplet.nix b/modules/nixos/hardware/do-droplet.nix new file mode 100644 index 0000000..369d600 --- /dev/null +++ b/modules/nixos/hardware/do-droplet.nix @@ -0,0 +1,71 @@ +{ lib, config, ... }: +let + cfg = config.my.modules.hardware.do-droplet; +in +{ + options.my.modules.hardware.do-droplet = { + enable = lib.mkEnableOption "DigitalOcean Droplet hardware defaults"; + }; + + config = lib.mkIf cfg.enable { + boot.loader.grub = { + efiSupport = true; + efiInstallAsRemovable = true; + }; + + networking.useDHCP = lib.mkForce false; + + # this one seems to always be broken + systemd.services.growpart.enable = lib.mkForce false; + + # in order to get networking setup we need to enable it in cloud-init + # Disables all modules that do not work with NixOS + # Based on https://github.com/nix-community/nixos-anywhere-examples/blob/7f945ff0ae676c0eb77360b892add91328dd1f17/digitalocean.nix + services.cloud-init = { + enable = true; + network.enable = true; + settings = { + datasource_list = [ + "ConfigDrive" + "Digitalocean" + ]; + datasource.ConfigDrive = { }; + datasource.Digitalocean = { }; + # Based on https://github.com/canonical/cloud-init/blob/main/config/cloud.cfg.tmpl + cloud_init_modules = [ + "seed_random" + "bootcmd" + "write_files" + "growpart" + "resizefs" + "set_hostname" + "update_hostname" + "set_password" + ]; + cloud_config_modules = [ + "ssh-import-id" + "keyboard" + "runcmd" + "disable_ec2_metadata" + ]; + cloud_final_modules = [ + "write_files_deferred" + "puppet" + "chef" + "ansible" + "mcollective" + "salt_minion" + "reset_rmc" + "scripts_per_once" + "scripts_per_boot" + "scripts_user" + "ssh_authkey_fingerprints" + "keys_to_console" + "install_hotplug" + "phone_home" + "final_message" + ]; + }; + }; + }; +} -- cgit v1.2.3