Configs updates
This commit is contained in:
parent
4c05f3a362
commit
bc1f5c2ac5
4 changed files with 8 additions and 1 deletions
|
|
@ -96,12 +96,16 @@ in
|
||||||
# signByDefault = true;
|
# signByDefault = true;
|
||||||
# };
|
# };
|
||||||
extraConfig = {
|
extraConfig = {
|
||||||
|
"add.interactive".useBuiltin = false;
|
||||||
commit.gpgSign = true;
|
commit.gpgSign = true;
|
||||||
# core.editor = kak;
|
# core.editor = kak;
|
||||||
credential.helper = "cache --timeout=3600 ";
|
credential.helper = "cache --timeout=3600 ";
|
||||||
delta.navigate = true;
|
delta.navigate = true;
|
||||||
|
delta.side-by-side = true;
|
||||||
|
diff.colorMoved = "default";
|
||||||
diff.guitool = "meld";
|
diff.guitool = "meld";
|
||||||
init.defaultBranch = "main";
|
init.defaultBranch = "main";
|
||||||
|
merge.conflictstyle = "diff3";
|
||||||
merge.guitool = "meld";
|
merge.guitool = "meld";
|
||||||
merge.tool = "meld";
|
merge.tool = "meld";
|
||||||
pull.rebase = true;
|
pull.rebase = true;
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
{ pkgs, ... }:
|
{ pkgs, ... }:
|
||||||
let
|
let
|
||||||
onedriveCmd = "${pkgs.onedrive}/bin/onedrive --monitor";
|
onedriveCmd = "${pkgs.unstable.onedrive}/bin/onedrive --monitor";
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
systemd.user.services."onedrive" = {
|
systemd.user.services."onedrive" = {
|
||||||
|
|
|
||||||
|
|
@ -27,6 +27,7 @@
|
||||||
freecad
|
freecad
|
||||||
gallery-dl
|
gallery-dl
|
||||||
gnome.eog
|
gnome.eog
|
||||||
|
gnome.evince
|
||||||
gnome.file-roller
|
gnome.file-roller
|
||||||
gnome.geary
|
gnome.geary
|
||||||
gnome.gnome-calendar
|
gnome.gnome-calendar
|
||||||
|
|
|
||||||
|
|
@ -27,6 +27,8 @@
|
||||||
# firefox
|
# firefox
|
||||||
freecad
|
freecad
|
||||||
gallery-dl
|
gallery-dl
|
||||||
|
gnome.eog
|
||||||
|
gnome.evince
|
||||||
gnome.file-roller
|
gnome.file-roller
|
||||||
gnome.gnome-font-viewer
|
gnome.gnome-font-viewer
|
||||||
gnome.geary
|
gnome.geary
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue