From 1f2d56e0c9e2a804074217fb267ec9102672b36f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjamin=20B=C3=A4dorf?= <hello@benjaminbaedorf.eu>
Date: Sat, 26 Nov 2022 02:40:51 +0100
Subject: [PATCH] Rename flora6 to flora-6

This aligns with the coming changes in hostnames in the terraform
infrastructure.
---
 hosts/{flora6 => flora-6}/default.nix                |  0
 hosts/{flora6/flora6.nix => flora-6/flora-6.nix}     | 12 ++++++------
 hosts/{flora6 => flora-6}/hardware-configuration.nix |  9 ++++++---
 hosts/flora-6/triton-vmtools.nix                     |  6 ++++++
 hosts/flora6/triton-vmtools.nix                      |  6 ------
 users/barkeeper/default.nix                          |  2 +-
 6 files changed, 19 insertions(+), 16 deletions(-)
 rename hosts/{flora6 => flora-6}/default.nix (100%)
 rename hosts/{flora6/flora6.nix => flora-6/flora-6.nix} (96%)
 rename hosts/{flora6 => flora-6}/hardware-configuration.nix (85%)
 create mode 100644 hosts/flora-6/triton-vmtools.nix
 delete mode 100644 hosts/flora6/triton-vmtools.nix

diff --git a/hosts/flora6/default.nix b/hosts/flora-6/default.nix
similarity index 100%
rename from hosts/flora6/default.nix
rename to hosts/flora-6/default.nix
diff --git a/hosts/flora6/flora6.nix b/hosts/flora-6/flora-6.nix
similarity index 96%
rename from hosts/flora6/flora6.nix
rename to hosts/flora-6/flora-6.nix
index 1c7c3113..d7fca297 100644
--- a/hosts/flora6/flora6.nix
+++ b/hosts/flora-6/flora-6.nix
@@ -20,7 +20,7 @@ in
     # # #
     # # # pub.solar options
     # # #
-    pub-solar.core ={
+    pub-solar.core = {
       disk-encryption-active = false;
       iso-options.enable = true;
       lite = true;
@@ -100,11 +100,11 @@ in
       rootUrl = "https://git.pub.solar";
       settings = {
         mailer = {
-            ENABLED     = true;
-            MAILER_TYPE = "smtp";
-            HOST        = "mail.greenbaum.cloud:465";
-            FROM        = ''"pub.solar git server" <gitea@pub.solar>'';
-            USER        = "admins@pub.solar";
+          ENABLED = true;
+          MAILER_TYPE = "smtp";
+          HOST = "mail.greenbaum.cloud:465";
+          FROM = ''"pub.solar git server" <gitea@pub.solar>'';
+          USER = "admins@pub.solar";
         };
         "repository.signing" = {
           SIGNING_KEY = "default";
diff --git a/hosts/flora6/hardware-configuration.nix b/hosts/flora-6/hardware-configuration.nix
similarity index 85%
rename from hosts/flora6/hardware-configuration.nix
rename to hosts/flora-6/hardware-configuration.nix
index 7dbf9542..0dd0cd95 100644
--- a/hosts/flora6/hardware-configuration.nix
+++ b/hosts/flora-6/hardware-configuration.nix
@@ -12,18 +12,21 @@
   boot.extraModulePackages = [ ];
 
   fileSystems."/" =
-    { device = "/dev/disk/by-label/nixos";
+    {
+      device = "/dev/disk/by-label/nixos";
       autoResize = true;
       fsType = "ext4";
     };
 
   fileSystems."/boot" =
-    { device = "/dev/disk/by-label/boot";
+    {
+      device = "/dev/disk/by-label/boot";
       fsType = "vfat";
     };
 
   fileSystems."/data" =
-    { device = "/dev/disk/by-label/ephemeral0";
+    {
+      device = "/dev/disk/by-label/ephemeral0";
       fsType = "ext4";
       options = [
         "defaults"
diff --git a/hosts/flora-6/triton-vmtools.nix b/hosts/flora-6/triton-vmtools.nix
new file mode 100644
index 00000000..4d0896a8
--- /dev/null
+++ b/hosts/flora-6/triton-vmtools.nix
@@ -0,0 +1,6 @@
+{ pkgs, inputs, ... }:
+{
+  environment.systemPackages = with pkgs; [
+    inputs.triton-vmtools.packages.${pkgs.system}.default
+  ];
+}
diff --git a/hosts/flora6/triton-vmtools.nix b/hosts/flora6/triton-vmtools.nix
deleted file mode 100644
index bbceeaab..00000000
--- a/hosts/flora6/triton-vmtools.nix
+++ /dev/null
@@ -1,6 +0,0 @@
-{ pkgs, inputs, ... }:
-{
-   environment.systemPackages = with pkgs; [
-     inputs.triton-vmtools.packages.${pkgs.system}.default
-   ];
-}
diff --git a/users/barkeeper/default.nix b/users/barkeeper/default.nix
index 58e250e1..85ef1a98 100644
--- a/users/barkeeper/default.nix
+++ b/users/barkeeper/default.nix
@@ -15,7 +15,7 @@ in
         description = "pub.solar infra user";
         password = "$6$pHMaL9DfxhvnLGy5$ka9bRU5p1lPTF0YHPZDM9Miq79iXuaXb6GLeALM1eX5djdsHYnpvVWjrmImWmcghGXsrDwpmXZPSJUU.gFpuA1";
         fullName = "pub.solar infra barkeeper";
-        email = "crew@pub.solar";
+        email = "admins@pub.solar";
         gpgKeyId = "";
         publicKeys = [
           "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCmiF8ndGhnx2YAWbPDq14fftAwcJ0xnjJIVTotI12OO4SPX/SwH5Yp8C8Kf002qN9FbFmaONzq3s8TYpej13JubhfsQywNuFKZuZvJeHzmOwxsANW86RVrWT0WZmYx9a/a1TF9rPQpibDVt60wX8yLdExaJc5F1SvIIuyz1kxYpz36wItfR6hcwoLGh1emFCmfCpebJmp3hsrMDTTtTW/YNhyeSZW74ckyvZyjCYtRCJ8uF0ZmOSKRdillv4Ztg8MsUubGn+vaMl6V6x/QuDuehEPoM/3wBx9o22nf+QVbk7S1PC8EdT/K5vskn4/pfR7mDCyQOq1hB4w4Oyn0dsfX pi@ssrtc"