mirror of
https://github.com/srid/nixos-config.git
synced 2026-05-11 00:55:58 +08:00
fix warnings
This commit is contained in:
parent
79b74a4943
commit
a2e146ac60
1 changed files with 27 additions and 23 deletions
|
|
@ -6,31 +6,23 @@
|
|||
|
||||
programs.git = {
|
||||
enable = true;
|
||||
delta = {
|
||||
enable = true;
|
||||
options = {
|
||||
navigate = true;
|
||||
light = false;
|
||||
side-by-side = true;
|
||||
line-numbers = true;
|
||||
pager = "${pkgs.less}/bin/less --mouse --wheel-lines=3";
|
||||
};
|
||||
};
|
||||
userName = flake.config.me.fullname;
|
||||
userEmail = flake.config.me.email;
|
||||
aliases = {
|
||||
co = "checkout";
|
||||
ci = "commit";
|
||||
cia = "commit --amend";
|
||||
s = "status";
|
||||
st = "status";
|
||||
b = "branch";
|
||||
# p = "pull --rebase";
|
||||
pu = "push";
|
||||
};
|
||||
ignores = [ "*~" "*.swp" ];
|
||||
lfs.enable = true;
|
||||
extraConfig = {
|
||||
settings = {
|
||||
user = {
|
||||
name = flake.config.me.fullname;
|
||||
email = flake.config.me.email;
|
||||
};
|
||||
alias = {
|
||||
co = "checkout";
|
||||
ci = "commit";
|
||||
cia = "commit --amend";
|
||||
s = "status";
|
||||
st = "status";
|
||||
b = "branch";
|
||||
# p = "pull --rebase";
|
||||
pu = "push";
|
||||
};
|
||||
init.defaultBranch = "master"; # Undo breakage due to https://srid.ca/luxury-belief
|
||||
#protocol.keybase.allow = "always";
|
||||
credential.helper = "store --file ~/.git-credentials";
|
||||
|
|
@ -44,6 +36,18 @@
|
|||
};
|
||||
};
|
||||
|
||||
programs.delta = {
|
||||
enable = true;
|
||||
enableGitIntegration = true;
|
||||
options = {
|
||||
navigate = true;
|
||||
light = false;
|
||||
side-by-side = true;
|
||||
line-numbers = true;
|
||||
pager = "${pkgs.less}/bin/less --mouse --wheel-lines=3";
|
||||
};
|
||||
};
|
||||
|
||||
programs.lazygit = {
|
||||
enable = true;
|
||||
settings = {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue