Fix Forgejo SSH user configuration

- Set explicit git user for Forgejo service
- Add SSH_USER configuration for proper SSH handling
- Ensure compatibility with system SSH server

machines/grey-area/services/forgejo.nix

@@ -2,7 +2,7 @@
 {
   services.forgejo = {
     enable = true;
-    # Use the default 'forgejo' user, not 'git'
+    user = "git";  # Explicitly set to 'git' user for SSH compatibility
   };
    
   services.forgejo.settings = {
@@ -16,9 +16,11 @@
       ROOT_URL = "https://git.geokkjer.eu";
       SSH_DOMAIN = "git.geokkjer.eu";
       SSH_PORT = 1337;
-      # Disable built-in SSH server, use system SSH instead
+      # Use system SSH server instead of built-in
       DISABLE_SSH = false;
       START_SSH_SERVER = false;
+      # Configure SSH user
+      SSH_USER = "git";
     };
     repository = {
       ENABLE_PUSH_CREATE_USER = true;

modules/common/base.nix

@@ -1,5 +1,8 @@
-{ config, pkgs, ... }:
 {
+  config,
+  pkgs,
+  ...
+}: {
   # Base system packages and aliases shared across all machines
   # This module consolidates common CLI tools to reduce duplication
   # across user configurations and machine-specific configs
@@ -34,6 +37,8 @@
     zellij
     glances
     systemctl-tui
+    starship # Shell prompt
+    btop # Resource monitor (better top)
 
     # Text processing and utilities
     jq # JSON processor

modules/users/common.nix

@@ -1,8 +1,10 @@
 # Common User Configuration
 # Shared settings for all users in the home lab
-{ config, pkgs, ... }:
-
 {
+  config,
+  pkgs,
+  ...
+}: {
   # Common user settings
   users = {
     # Use mutable users for flexibility
@@ -20,6 +22,7 @@
 
     # direnv integration
     interactiveShellInit = ''
+      eval "$(starship init zsh)"
       eval "$(direnv hook zsh)"
     '';
 
@@ -86,7 +89,6 @@
       };
     };
 
-    
     # Enable sound
     pipewire = {
       enable = true;