changes

src/user/modules/default.nix

@@ -2,7 +2,6 @@
   imports = [
     ./bash
     ./git
-    ./gpg
     ./gui
     ./security
     ./utils

src/user/modules/git/config/bashScripts/cdg.nix

@@ -5,7 +5,6 @@ function cdg() {
     return 0
   fi
 
-  # Check for invalid command
   if [[ -n "$1" ]]; then
     echo "Invalid command: $1. Try 'cdg --help'."
     return 1

src/user/modules/git/default.nix

@@ -10,6 +10,26 @@ in
     programs = {
       git = {
         enable = true;
+        extraConfig = {
+          init = { defaultBranch = "master"; };
+          mergetool = {
+            vimdiff = {
+              trustExitCode = true;
+            };
+          };
+          merge = { tool = "vimdiff"; };
+          safe = {
+            directory = "${config.user.nixosDir}";
+          };
+        };
+        ignores = [
+          "node_modules"
+          ".direnv"
+          "dist-newstyle"
+          ".nuxt/"
+          ".output/"
+          "dist"
+        ];
       } // config.user.gitConfig;
       gh = {
         enable = true;

src/user/modules/security/default.nix

@@ -6,6 +6,7 @@ let
 
 in
 { options.modules.user.security = { enable = mkEnableOption "user.security"; };
+  imports = [ ./modules ];
   config = mkIf cfg.enable {
     home.packages = with pkgs; [
       pass

src/user/modules/security/modules/default.nix

@@ -0,0 +1,5 @@
+{
+  imports = [
+    ./gpg
+  ];
+}

src/user/modules/security/modules/gpg/default.nix

@@ -2,10 +2,10 @@
 
 with lib;
 let
-  cfg = config.modules.user.gpg;
+  cfg = config.modules.user.security.gpg;
 
 in
-{ options.modules.user.gpg = { enable = mkEnableOption "user.gpg"; };
+{ options.modules.user.security.gpg = { enable = mkEnableOption "user.security.gpg"; };
   config = mkIf cfg.enable {
     programs.gpg = {
       enable = true;
@@ -16,6 +16,7 @@ in
       enable = true;
       enableSshSupport = true;
       enableBashIntegration = true;
+      enableScDaemon = true;
       pinentryFlavor = "tty";
     };
   };

src/user/modules/utils/modules/dev/default.nix

@@ -29,6 +29,10 @@ in
       };
     };
 
+    programs.git.ignores = [
+      ".direnv"
+    ];
+
     home.sessionVariables = {
       DIRENV_LOG_FORMAT = " ";
     };