diff --git a/hosts/gerg-desktop/services/forgejo.nix b/hosts/gerg-desktop/services/forgejo.nix
index cc39981..3c5fcff 100644
--- a/hosts/gerg-desktop/services/forgejo.nix
+++ b/hosts/gerg-desktop/services/forgejo.nix
@@ -1,11 +1,11 @@
-{ lib, config }:
+{ config }:
 {
   users = {
     groups.${config.services.forgejo.group} = { };
     users = {
       ${config.services.forgejo.user} = {
         isSystemUser = true;
-        group = config.services.forgejo.group;
+        inherit (config.services.forgejo) group;
         extraGroups = [ "postgres" ];
         openssh.authorizedKeys.keys = [ config.local.keys.gerg_gerg-desktop ];
       };
diff --git a/hosts/gerg-desktop/services/nix-serve.nix b/hosts/gerg-desktop/services/nix-serve.nix
index cd56f17..d9b840e 100644
--- a/hosts/gerg-desktop/services/nix-serve.nix
+++ b/hosts/gerg-desktop/services/nix-serve.nix
@@ -8,12 +8,12 @@
       nix-serve = { };
     };
     users = {
-
       ${config.services.nginx.user}.extraGroups = [ "nix-serve" ];
       builder = {
         isSystemUser = true;
         openssh.authorizedKeys.keys = [ config.local.keys.root_media-laptop ];
         group = "builder";
+        shell = pkgs.bashInteractive;
       };
       nix-serve = {
         isSystemUser = true;
@@ -33,10 +33,7 @@
   '';
 
   nix.settings = {
-    trusted-users = [
-      "builder"
-      "nix-ssh"
-    ];
+    trusted-users = [ "builder" ];
     allowed-users = [ "nix-serve" ];
     keep-outputs = true;
     keep-derivations = true;
diff --git a/hosts/gerg-desktop/services/postgresql.nix b/hosts/gerg-desktop/services/postgresql.nix
index eee3503..e0b8e91 100644
--- a/hosts/gerg-desktop/services/postgresql.nix
+++ b/hosts/gerg-desktop/services/postgresql.nix
@@ -1,13 +1,11 @@
-{ config, pkgs }:
+{ pkgs }:
 {
   services.postgresql = {
     enable = true;
     package = pkgs.postgresql_13;
     dataDir = "/persist/services/postgresql";
 
-    ensureDatabases = [
-      "miniflux"
-    ];
+    ensureDatabases = [ "miniflux" ];
     ensureUsers = [
       {
         name = "miniflux";