separate git into own mod

This commit is contained in:
Ivan Kirilov Dimitrov 2024-07-10 11:17:08 +02:00
parent 50d8c40057
commit 1168e46fb6
No known key found for this signature in database
GPG Key ID: 0BDAD4B211C49294
2 changed files with 21 additions and 22 deletions

View File

@ -9,6 +9,7 @@ toplevel@{ inputs, withSystem, config, ... }:
in
with mods; [
base
ivand
shell
util
swayland

View File

@ -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, ... }: {