diff --git a/modules/development/home/git.nix b/modules/development/home/git.nix
index 4d24385..fb7a305 100644
--- a/modules/development/home/git.nix
+++ b/modules/development/home/git.nix
@@ -1,6 +1,9 @@
-{ pkgs, ... }:
+{ osConfig, lib, pkgs, ... }:
+let
+    hasGui = osConfig.services.dbus.implementation == "dbus";
+in
 {
-    home.packages = with pkgs; [
+    home.packages = with pkgs; lib.mkIf hasGui [
         git-credential-manager
     ];
 
@@ -15,8 +18,8 @@
             init.defaultBranch = "main";
             
             credential = {
-                helper = "manager";
-                credentialStore = "secretservice";
+                helper = if hasGui then "manager" else "store";
+                credentialStore = lib.mkIf hasGui "secretservice";
                 
                 "https://github.com" = {
                     username = "kpghostfox";
@@ -30,4 +33,4 @@
             };
         };
     };
-}
\ No newline at end of file
+}
diff --git a/modules/development/home/vscode.nix b/modules/development/home/vscode.nix
index 07c8e51..a11e32f 100644
--- a/modules/development/home/vscode.nix
+++ b/modules/development/home/vscode.nix
@@ -35,4 +35,4 @@ in
             };
         };
     };
-}
\ No newline at end of file
+}