From 1168e46fb65db3a5f3075343c48809376c9ba8c6 Mon Sep 17 00:00:00 2001
From: Ivan Kirilov Dimitrov <ivan@idimitrov.dev>
Date: Wed, 10 Jul 2024 11:17:08 +0200
Subject: [PATCH] separate git into own mod

---
 home/configs/default.nix |  1 +
 home/modules/default.nix | 42 +++++++++++++++++++---------------------
 2 files changed, 21 insertions(+), 22 deletions(-)

diff --git a/home/configs/default.nix b/home/configs/default.nix
index 2fdff5f..9c58a4e 100644
--- a/home/configs/default.nix
+++ b/home/configs/default.nix
@@ -9,6 +9,7 @@ toplevel@{ inputs, withSystem, config, ... }:
         in
         with mods; [
           base
+          ivand
           shell
           util
           swayland
diff --git a/home/modules/default.nix b/home/modules/default.nix
index d4587b6..f8de403 100644
--- a/home/modules/default.nix
+++ b/home/modules/default.nix
@@ -3,28 +3,7 @@ toplevel@{ moduleWithSystem, ... }: {
     base = moduleWithSystem (
       top@{ ... }:
       perSystem@{ pkgs, config, ... }: {
-        programs = {
-          home-manager.enable = true;
-          password-store = {
-            enable = true;
-            package = pkgs.pass.withExtensions (e: with e; [ pass-otp pass-file ]);
-            settings = { PASSWORD_STORE_DIR = "${config.home.homeDirectory}/.password-store"; };
-          };
-          git = {
-            enable = true;
-            delta.enable = true;
-            userName = pkgs.lib.mkDefault "Ivan Kirilov Dimitrov";
-            userEmail = pkgs.lib.mkDefault "ivan@idimitrov.dev";
-            signing = { signByDefault = true; key = "ivan@idimitrov.dev"; };
-            extraConfig = { color.ui = "auto"; pull.rebase = true; push.autoSetupRemote = true; };
-            aliases = { a = "add ."; c = "commit"; d = "diff --cached"; p = "push"; };
-          };
-          gpg.enable = true;
-        };
-        services = {
-          pueue.enable = true;
-          gpg-agent = { enable = true; enableBashIntegration = true; enableZshIntegration = true; enableNushellIntegration = true; pinentryPackage = pkgs.pinentry-qt; };
-        };
+        programs.home-manager.enable = true;
         home = {
           stateVersion = toplevel.config.flake.stateVersion;
           username = "ivand";
@@ -65,6 +44,25 @@ toplevel@{ moduleWithSystem, ... }: {
         };
       }
     );
+    ivand = moduleWithSystem (
+      top@{ ... }:
+      perSystem@{ pkgs, config, ... }: {
+        programs = {
+          password-store = { enable = true; package = pkgs.pass.withExtensions (e: with e; [ pass-otp pass-file ]); settings = { PASSWORD_STORE_DIR = "${config.home.homeDirectory}/.password-store"; }; };
+          git = {
+            enable = true;
+            delta.enable = true;
+            userName = pkgs.lib.mkDefault "Ivan Kirilov Dimitrov";
+            userEmail = pkgs.lib.mkDefault "ivan@idimitrov.dev";
+            signing = { signByDefault = true; key = "ivan@idimitrov.dev"; };
+            extraConfig = { color.ui = "auto"; pull.rebase = true; push.autoSetupRemote = true; };
+            aliases = { a = "add ."; c = "commit"; d = "diff --cached"; p = "push"; };
+          };
+          gpg.enable = true;
+        };
+        services = { gpg-agent = { enable = true; enableBashIntegration = true; enableZshIntegration = true; enableNushellIntegration = true; pinentryPackage = pkgs.pinentry-qt; }; };
+      }
+    );
     shell = moduleWithSystem (
       top@{ ... }:
       perSystem@{ pkgs, ... }: {