diff --git a/config/git.nix b/config/git.nix
index 5f85b9f..8ae71d3 100644
--- a/config/git.nix
+++ b/config/git.nix
@@ -12,7 +12,7 @@
     # Basic configuration
     userName = "Menno van Leeuwen";
     userEmail = "menno@vleeuwen.me";
-    signing = {
+    signing = lib.mkIf (!config.isServer) {
       key = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIM+sKpcREOUjwMMSzEWAso6830wbOi8kUxqpuXWw5gHr";
     };
 
@@ -86,14 +86,14 @@
       };
 
       # Security
-      gpg = {
+      gpg = lib.mkIf (!config.isServer) {
         format = "ssh";
         ssh = {
           program = "/opt/1Password/op-ssh-sign";
         };
       };
 
-      commit = {
+      commit = lib.mkIf (!config.isServer) {
         gpgsign = true;
       };
 
diff --git a/home.nix b/home.nix
index aa5836c..f06f3e9 100644
--- a/home.nix
+++ b/home.nix
@@ -1,16 +1,17 @@
 {
   config,
+  lib,
   isServer ? false,
   opnix,
   ...
 }:
 
 {
-  programs.home-manager.enable = true;
-
-  nixpkgs.config = {
-    allowUnfree = true;
-    allowUnfreePredicate = pkg: true;
+  options = {
+    isServer = lib.mkOption {
+      type = lib.types.bool;
+      default = false;
+    };
   };
 
   imports = [
@@ -31,12 +32,23 @@
       ]
   );
 
-  home = {
-    username = "menno";
-    homeDirectory = "/home/menno";
-    stateVersion = "25.05";
-    sessionVariables = {
-      PATH = "${config.home.homeDirectory}/go/bin:$PATH";
+  config = {
+    isServer = isServer;
+
+    programs.home-manager.enable = true;
+
+    nixpkgs.config = {
+      allowUnfree = true;
+      allowUnfreePredicate = pkg: true;
+    };
+
+    home = {
+      username = "menno";
+      homeDirectory = "/home/menno";
+      stateVersion = "25.05";
+      sessionVariables = {
+        PATH = "${config.home.homeDirectory}/go/bin:$PATH";
+      };
     };
   };
 }