From fc0768d3531c6d7741481db79ec687a8c8295391 Mon Sep 17 00:00:00 2001
From: teutat3s <teutates@mailbox.org>
Date: Sun, 14 May 2023 15:22:54 +0200
Subject: [PATCH 1/3] gitea: use renamed options in gitea.settings.server

trace: warning: The option `services.gitea.rootUrl' defined in `hosts/flora-6/gitea.nix' has been renamed to `services.gitea.settings.server.ROOT_URL'.
trace: warning: The option `services.gitea.httpPort' defined in `hosts/flora-6/gitea.nix' has been renamed to `services.gitea.settings.server.HTTP_PORT'.
trace: warning: The option `services.gitea.httpAddress' defined in `hosts/flora-6/gitea.nix' has been renamed to `services.gitea.settings.server.HTTP_ADDR'.
trace: warning: The option `services.gitea.domain' defined in `hosts/flora-6/gitea.nix' has been renamed to `services.gitea.settings.server.DOMAIN'.
---
 hosts/flora-6/gitea.nix | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/hosts/flora-6/gitea.nix b/hosts/flora-6/gitea.nix
index d7ada722..38527124 100644
--- a/hosts/flora-6/gitea.nix
+++ b/hosts/flora-6/gitea.nix
@@ -25,13 +25,15 @@
       type = "postgres";
       passwordFile = config.age.secrets.gitea-database-password.path;
     };
-    domain = "git.pub.solar";
-    httpAddress = "127.0.0.1";
-    httpPort = 3000;
     lfs.enable = true;
     mailerPasswordFile = config.age.secrets.gitea-mailer-password.path;
-    rootUrl = "https://git.pub.solar";
     settings = {
+      server = {
+        ROOT_URL = "https://git.pub.solar";
+        DOMAIN = "git.pub.solar";
+        HTTP_ADDR = "127.0.0.1";
+        HTTP_PORT = 3000;
+      };
       mailer = {
         ENABLED = true;
         PROTOCOL = "smtps";
-- 
2.44.1


From 9dbfb4eaaad89ca31623f5b37a04c7b5a73d9e68 Mon Sep 17 00:00:00 2001
From: teutat3s <teutates@mailbox.org>
Date: Sun, 2 Jul 2023 17:12:55 +0200
Subject: [PATCH 2/3] flora-6: use renamed openssh settings

trace: warning: The option `services.openssh.permitRootLogin' defined in `/nix/store/ha98lp4l8ccspyfn5liq0k9ds3cs20zl-source/hosts/flora-6/flora-6.nix' has been renamed to `services.openssh.settings.PermitRootLogin'.
trace: warning: The option `services.openssh.passwordAuthentication' defined in `/nix/store/ha98lp4l8ccspyfn5liq0k9ds3cs20zl-source/hosts/flora-6/flora-6.nix' has been renamed to `services.openssh.settings.PasswordAuthentication'.
---
 hosts/flora-6/flora-6.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/hosts/flora-6/flora-6.nix b/hosts/flora-6/flora-6.nix
index 6e376e4f..55e88da7 100644
--- a/hosts/flora-6/flora-6.nix
+++ b/hosts/flora-6/flora-6.nix
@@ -136,8 +136,10 @@ in {
     # Enable the OpenSSH daemon.
     services.openssh = {
       enable = true;
-      passwordAuthentication = false;
-      permitRootLogin = "no";
+      settings = {
+        PasswordAuthentication = false;
+        PermitRootLogin = "no";
+      };
     };
 
     # We manage the firewall with nix, too
-- 
2.44.1


From c36a22c55610c441ac57e5a4db90fcd1eef23bdd Mon Sep 17 00:00:00 2001
From: teutat3s <teutates@mailbox.org>
Date: Sun, 2 Jul 2023 17:56:17 +0200
Subject: [PATCH 3/3] flake: fix broken deploy-rs usage

Still doesn't use deploy-rs from nixpkgs because of usage in digga:
https://github.com/divnix/digga/blob/main/src/generators.nix#L77
---
 flake.nix | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/flake.nix b/flake.nix
index a5a890f6..8c6c8e12 100644
--- a/flake.nix
+++ b/flake.nix
@@ -73,11 +73,10 @@
         nixos = {
           imports = [(digga.lib.importOverlays ./overlays)];
           overlays = [
-            deploy.overlay
             (self: super: {
               deploy-rs = {
                 inherit (inputs.nixos.legacyPackages.x86_64-linux) deploy-rs;
-                lib = super.deploy-rs.lib;
+                lib = inputs.deploy.lib.x86_64-linux;
               };
             })
           ];
@@ -186,7 +185,7 @@
           profilesOrder = ["system" "direnv"];
           profiles.direnv = {
             user = "barkeeper";
-            path = self.channels.nixos.deploy-rs.lib.x86_64-linux.activate.home-manager self.homeConfigurationsPortable.x86_64-linux.barkeeper;
+            path = self.pkgs.x86_64-linux.nixos.deploy-rs.lib.activate.home-manager self.homeConfigurationsPortable.x86_64-linux.barkeeper;
           };
         };
         #example = {
-- 
2.44.1