From cf63e4141cf072b7b942bff23e023890e767a3b1 Mon Sep 17 00:00:00 2001
From: ene <ene@sils.li>
Date: Sat, 21 Jan 2023 07:41:32 +0100
Subject: Fix: Resolve merge conflicts

---
 services/opensshd.nix | 27 +++++++++++++--------------
 1 file changed, 13 insertions(+), 14 deletions(-)

(limited to 'services')

diff --git a/services/opensshd.nix b/services/opensshd.nix
index 4bd38fd..cb9f2ba 100644
--- a/services/opensshd.nix
+++ b/services/opensshd.nix
@@ -1,19 +1,18 @@
-{ config, pkg, ... }: {
+{
+  config,
+  pkg,
+  ...
+}: {
   services.openssh = {
     enable = true;
     passwordAuthentication = false;
-    extraConfig = ''
-      PrintMotd yes
-    ''; # this could be done with pam
-    hostKeys = [{
-      comment = "key comment";
-      path = "/srv/sshd/ssh_host_ed25519_key";
-      rounds = 1000;
-      type = "ed25519";
-    }];
+    hostKeys = [
+      {
+        comment = "key comment";
+        path = "/srv/sshd/ssh_host_ed25519_key";
+        rounds = 1000;
+        type = "ed25519";
+      }
+    ];
   };
-  users.users.root.openssh.authorizedKeys.keys = [
-    "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGBFuTNNn71Rhfnop2cdz3r/RhWWlCePnSBOhTBbu2ME soispha"
-    "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIG63gxw8JePmrC8Fni0pLV4TnPBhCPmSV9FYEdva+6s7 sils"
-  ];
 }
-- 
cgit 1.4.1


From 6e0f58c5118f4fc0896eb46faaad94f563c876a9 Mon Sep 17 00:00:00 2001
From: ene <ene@sils.li>
Date: Sat, 21 Jan 2023 08:23:36 +0100
Subject: Feat: Track last login in motd

---
 services/rust-motd.nix | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'services')

diff --git a/services/rust-motd.nix b/services/rust-motd.nix
index 6ff9367..21bc1cd 100644
--- a/services/rust-motd.nix
+++ b/services/rust-motd.nix
@@ -67,6 +67,9 @@
       };
 
       last_login = {
+        sils = 2;
+        soispha = 2;
+        nightingale = 2;
       };
 
       last_run = {
-- 
cgit 1.4.1