mirror of
https://github.com/donovanglover/nix-config.git
synced 2025-06-20 17:57:47 +02:00
Merge tig with git module
This makes sense since I wouldn't use git without tig.
This commit is contained in:
parent
53d7a10509
commit
5a71c25c57
@ -11,7 +11,6 @@
|
|||||||
./neovim
|
./neovim
|
||||||
./ranger
|
./ranger
|
||||||
./starship
|
./starship
|
||||||
./tig
|
|
||||||
];
|
];
|
||||||
|
|
||||||
environment.systemPackages = with pkgs; [
|
environment.systemPackages = with pkgs; [
|
||||||
|
@ -1,37 +1,50 @@
|
|||||||
{ pkgs, ... }:
|
{ pkgs, ... }:
|
||||||
|
|
||||||
{
|
{
|
||||||
environment.systemPackages = [ pkgs.git ];
|
|
||||||
|
environment.systemPackages = with pkgs; [ tig git ];
|
||||||
|
|
||||||
home-manager.sharedModules = [{
|
home-manager.sharedModules = [{
|
||||||
|
xdg.configFile."tig/config".text = ''
|
||||||
|
color cursor black green bold
|
||||||
|
color title-focus black blue bold
|
||||||
|
color title-blur black blue bold
|
||||||
|
'';
|
||||||
|
|
||||||
programs.git = {
|
programs.git = {
|
||||||
enable = true;
|
enable = true;
|
||||||
|
|
||||||
extraConfig = {
|
extraConfig = {
|
||||||
include = { path = "~/.gituser"; };
|
include.path = "~/.gituser";
|
||||||
commit = { gpgsign = true; };
|
commit.gpgsign = true;
|
||||||
|
|
||||||
core = {
|
core = {
|
||||||
editor = "nvim";
|
editor = "nvim";
|
||||||
autocrlf = false;
|
autocrlf = false;
|
||||||
quotePath = false;
|
quotePath = false;
|
||||||
};
|
};
|
||||||
web = { browser = "librewolf"; };
|
|
||||||
push = { default = "simple"; };
|
web.browser = "librewolf";
|
||||||
branch = { autosetuprebase = "always"; };
|
push.default = "simple";
|
||||||
init = { defaultBranch = "master"; };
|
branch.autosetuprebase = "always";
|
||||||
rerere = { enabled = true; };
|
init.defaultBranch = "master";
|
||||||
color = { ui = true; };
|
rerere.enabled = true;
|
||||||
|
color.ui = true;
|
||||||
|
|
||||||
alias = {
|
alias = {
|
||||||
contrib = "shortlog -n -s";
|
contrib = "shortlog -n -s";
|
||||||
remotes = "remote -v";
|
remotes = "remote -v";
|
||||||
praise = "blame";
|
praise = "blame";
|
||||||
verify = "log --show-signature";
|
verify = "log --show-signature";
|
||||||
};
|
};
|
||||||
|
|
||||||
"color \"diff-highlight\"" = {
|
"color \"diff-highlight\"" = {
|
||||||
oldNormal = "red bold";
|
oldNormal = "red bold";
|
||||||
oldHighlight = "red bold";
|
oldHighlight = "red bold";
|
||||||
newNormal = "green bold";
|
newNormal = "green bold";
|
||||||
newHighlight = "green bold";
|
newHighlight = "green bold";
|
||||||
};
|
};
|
||||||
|
|
||||||
"color \"diff\"" = {
|
"color \"diff\"" = {
|
||||||
meta = "yellow";
|
meta = "yellow";
|
||||||
frag = "magenta bold";
|
frag = "magenta bold";
|
||||||
@ -41,7 +54,8 @@
|
|||||||
whitespace = "red reverse";
|
whitespace = "red reverse";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
diff-so-fancy = { enable = true; };
|
|
||||||
|
diff-so-fancy.enable = true;
|
||||||
};
|
};
|
||||||
}];
|
}];
|
||||||
}
|
}
|
||||||
|
@ -1,13 +0,0 @@
|
|||||||
{ pkgs, ... }:
|
|
||||||
|
|
||||||
{
|
|
||||||
environment.systemPackages = [ pkgs.tig ];
|
|
||||||
|
|
||||||
home-manager.sharedModules = [{
|
|
||||||
xdg.configFile."tig/config".text = ''
|
|
||||||
color cursor black green bold
|
|
||||||
color title-focus black blue bold
|
|
||||||
color title-blur black blue bold
|
|
||||||
'';
|
|
||||||
}];
|
|
||||||
}
|
|
Loading…
x
Reference in New Issue
Block a user