From 3cd5ab2f656b71ab73fa9204ad87fd585b452c24 Mon Sep 17 00:00:00 2001
From: Ingolf Wagner <contact@ingolf-wagner.de>
Date: Sat, 1 Jul 2023 17:34:23 +0200
Subject: [PATCH] update robi machine

---
 flake.nix                                | 19 +++++++++++--------
 nixos/components/gui/home-manager/i3.nix |  2 +-
 nixos/machines/robi/configuration.nix    | 12 +++++++++---
 nixos/machines/robi/gitea.nix            |  4 ++--
 nixos/machines/robi/hetzner.nix          |  5 ++---
 nixos/machines/robi/nextcloud.nix        |  2 +-
 6 files changed, 26 insertions(+), 18 deletions(-)

diff --git a/flake.nix b/flake.nix
index 81b0ddb..9951b2d 100644
--- a/flake.nix
+++ b/flake.nix
@@ -114,7 +114,11 @@
         pkgs = import nixpkgs {
           inherit system;
           config.allowUnfree = true;
-          config.permittedInsecurePackages = [ "python-2.7.18.6" ];
+          config.permittedInsecurePackages = [
+            "python-2.7.18.6"
+            # "openssl-1.1.1u"
+          ];
+
           overlays = [
             (_self: _super: {
               unstable = import nixpkgs-unstable {
@@ -293,17 +297,16 @@
           chungus = nixosConfigurationSetup {
             name = "chungus";
             modules = [
-              #retiolum.nixosModules.retiolum
-              #private_assets.nixosModules.jobrad
               homeManagerModules
             ];
           };
-
-
+          robi = nixosConfigurationSetup {
+            name = "robi";
+            modules = [
+              homeManagerModules
+            ];
+          };
         };
-
-
-
     };
 }
 
diff --git a/nixos/components/gui/home-manager/i3.nix b/nixos/components/gui/home-manager/i3.nix
index ea9a478..d1f4782 100644
--- a/nixos/components/gui/home-manager/i3.nix
+++ b/nixos/components/gui/home-manager/i3.nix
@@ -87,7 +87,7 @@ in
       programs.alacritty = {
         enable = true;
         settings = {
-          font.size = lib.mkForce 7.0;
+          font.size = lib.mkForce 6.5;
         };
       };
 
diff --git a/nixos/machines/robi/configuration.nix b/nixos/machines/robi/configuration.nix
index fdbe99d..100b61e 100644
--- a/nixos/machines/robi/configuration.nix
+++ b/nixos/machines/robi/configuration.nix
@@ -17,7 +17,6 @@
     ./borg.nix
     ./codimd.nix
     ./gitea.nix
-    ./grocy.nix
     ./nextcloud.nix
     ./packages.nix
     ./syncthing.nix
@@ -59,6 +58,13 @@
     ./cache.nix
   ];
 
+
+
+
+  components.terminal.enable = true;
+  components.mainUser.enable = true;
+  components.gui.enable = false;
+
   components.network.enable = true;
   components.network.wifi.enable = false;
 
@@ -73,7 +79,7 @@
 
   # Shell configuration
   # -------------------
-  programs.custom. zsh.enable = true;
+  #programs.custom. zsh.enable = true;
   users.users.root.shell = pkgs.zsh;
 
   security.acme.acceptTerms = true;
@@ -106,7 +112,7 @@
 
   # usually part of the wifi.nix module
   # because Networkd-wait-online is just failing.
-  systemd.services.systemd-networkd-wait-online.enable = false;
+  #systemd.services.systemd-networkd-wait-online.enable = false;
   systemd.services.NetworkManager-wait-online.enable = false;
 
 }
diff --git a/nixos/machines/robi/gitea.nix b/nixos/machines/robi/gitea.nix
index 4cb6b03..fc45e44 100644
--- a/nixos/machines/robi/gitea.nix
+++ b/nixos/machines/robi/gitea.nix
@@ -20,9 +20,9 @@
     appName = "git.ingolf-wagner.de";
     #cookieSecure = true;
     #disableRegistration = true;
-    domain = "git.ingolf-wagner.de";
-    rootUrl = "https://git.ingolf-wagner.de/";
     settings = {
+      server.ROOT_URL = "https://git.ingolf-wagner.de/";
+      server.DOMAIN = "git.ingolf-wagner.de";
       service.DISABLE_REGISTRATION = true;
       session.COOKIE_SECURE = true;
       log.LEVEL = "Warn";
diff --git a/nixos/machines/robi/hetzner.nix b/nixos/machines/robi/hetzner.nix
index 72a45c0..0adbb30 100644
--- a/nixos/machines/robi/hetzner.nix
+++ b/nixos/machines/robi/hetzner.nix
@@ -47,7 +47,6 @@ in
   boot.loader.grub = {
     enable = true;
     efiSupport = false;
-    version = 2;
   };
 
   # This will mirror all UEFI files, kernels, grub menus and
@@ -87,8 +86,8 @@ in
 
   # Initial empty root password for easy login:
   users.users.root.initialHashedPassword = "";
-  services.openssh.permitRootLogin = "prohibit-password";
-  services.openssh.passwordAuthentication = false;
+  services.openssh.settings.PermitRootLogin = "prohibit-password";
+  services.openssh.settings.PasswordAuthentication = false;
 
   environment.systemPackages = [ pkgs.mosh ];
 
diff --git a/nixos/machines/robi/nextcloud.nix b/nixos/machines/robi/nextcloud.nix
index 64666c8..ba9180b 100644
--- a/nixos/machines/robi/nextcloud.nix
+++ b/nixos/machines/robi/nextcloud.nix
@@ -234,7 +234,7 @@ in
       # nextcloud setup
       services.nextcloud = {
         enable = true;
-        package = pkgs.nextcloud25;
+        package = pkgs.nextcloud26;
         autoUpdateApps.enable = true;
         #nginx.enable = true;
         enableBrokenCiphersForSSE = false; # see https://github.com/NixOS/nixpkgs/pull/198470