From fe091504d08430563e0e6c42678ea991df2e3656 Mon Sep 17 00:00:00 2001
From: William <baduhai@proton.me>
Date: Mon, 3 Nov 2025 12:34:40 -0300
Subject: [PATCH] openssh greeting fixes

---
 hosts/alexandria/nextcloud.nix    |  7 ++++++-
 hosts/modules/common/openssh.nix  |  8 +++-----
 hosts/modules/common/programs.nix | 12 +++++++++++-
 users/modules/common/fish.nix     |  5 ++++-
 4 files changed, 24 insertions(+), 8 deletions(-)

diff --git a/hosts/alexandria/nextcloud.nix b/hosts/alexandria/nextcloud.nix
index 68d4875..9e606d9 100644
--- a/hosts/alexandria/nextcloud.nix
+++ b/hosts/alexandria/nextcloud.nix
@@ -24,7 +24,12 @@ in
       database.createLocally = true;
       maxUploadSize = "16G";
       extraApps = {
-        inherit (config.services.nextcloud.package.packages.apps) calendar contacts notes;
+        inherit (config.services.nextcloud.package.packages.apps)
+          calendar
+          contacts
+          notes
+          tasks
+          ;
       };
       extraAppsEnable = true;
       caching = {
diff --git a/hosts/modules/common/openssh.nix b/hosts/modules/common/openssh.nix
index 63422b3..df70bdd 100644
--- a/hosts/modules/common/openssh.nix
+++ b/hosts/modules/common/openssh.nix
@@ -4,10 +4,8 @@
   services.openssh = {
     enable = true;
     settings.PermitRootLogin = "no";
+    extraConfig = ''
+      PrintLastLog no
+    '';
   };
-  programs.fish.interactiveShellInit = ''
-    if set -q SSH_CONNECTION
-      neofetch
-    end
-  '';
 }
diff --git a/hosts/modules/common/programs.nix b/hosts/modules/common/programs.nix
index be57b69..fd10953 100644
--- a/hosts/modules/common/programs.nix
+++ b/hosts/modules/common/programs.nix
@@ -25,6 +25,16 @@
 
   programs = {
     command-not-found.enable = false;
-    fish.enable = true;
+    fish = {
+      enable = true;
+      interactiveShellInit = ''
+        set fish_greeting
+        if set -q SSH_CONNECTION
+          export TERM=xterm-256color
+          clear
+          fastfetch
+        end
+      '';
+    };
   };
 }
diff --git a/users/modules/common/fish.nix b/users/modules/common/fish.nix
index d95db24..c753297 100644
--- a/users/modules/common/fish.nix
+++ b/users/modules/common/fish.nix
@@ -3,7 +3,10 @@
 {
   programs.fish = {
     enable = true;
-    interactiveShellInit = "${lib.getExe pkgs.nix-your-shell} fish | source";
+    interactiveShellInit = ''
+      set fish_greeting
+      ${lib.getExe pkgs.nix-your-shell} fish | source
+    '';
     loginShellInit = "${lib.getExe pkgs.nix-your-shell} fish | source";
     plugins = [
       {