jana/dotfiles
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

update before update

Browse source
This commit is contained in:
Jonathan Dönszelmann 2024-11-02 12:22:32 +01:00
parent ebac260b64
commit dee2a92cf1
No known key found for this signature in database
3 changed files with 12 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

8
programs/git/default.nix
View file

@ -10,6 +10,11 @@ _: {
delta.options = { delta.options = {
navigate = true; navigate = true;
light = false; light = false;
side-by-side = true;
features = "decorations interactive";
interactive = {
keep-plus-minus-markers = false;
};
}; };
extraConfig = { extraConfig = {
@ -17,9 +22,10 @@ _: {
pull.rebase = true; pull.rebase = true;
init.defaultBranch = "main"; init.defaultBranch = "main";
gpg.format = "ssh"; gpg.format = "ssh";
diff.colorMoved = true; diff.colorMoved = "default";
rerere.enabled = true; rerere.enabled = true;
alias.conflicts = "diff --check";
}; };
}; };
} }

1
programs/nvim/config.lua
View file

@ -96,7 +96,6 @@ vim.keymap.set("v", "<S-Tab>", "<gv")
vim.keymap.set('n', 'gr', builtin.lsp_references, {}) vim.keymap.set('n', 'gr', builtin.lsp_references, {})
vim.keymap.set('n', 'gd', builtin.lsp_definitions, {}) vim.keymap.set('n', 'gd', builtin.lsp_definitions, {})
vim.keymap.set('n', 'gi', builtin.lsp_implementations, {})
vim.keymap.set('n', 'gt', builtin.lsp_type_definitions, {}) vim.keymap.set('n', 'gt', builtin.lsp_type_definitions, {})
-- format on wq and x and replace X, W and Q with x, w and q -- format on wq and x and replace X, W and Q with x, w and q

6
programs/zsh/default.nix
View file

@ -12,7 +12,7 @@ let
"ll" = "${pkgs.eza}/bin/eza --git"; "ll" = "${pkgs.eza}/bin/eza --git";
"lt" = "${pkgs.eza}/bin/eza --long --tree -L 3"; "lt" = "${pkgs.eza}/bin/eza --long --tree -L 3";
"open" = "${pkgs.xdg-utils}/bin/xdg-open"; "open" = "${pkgs.xdg-utils}/bin/xdg-open";
"clip" = "${pkgs.wl-clipboard-rs}/wl-copy"; "cb" = "${pkgs.wl-clipboard-rs}/wl-copy";
"pull" = "${pkgs.git}/bin/git pull"; "pull" = "${pkgs.git}/bin/git pull";
"push" = "${pkgs.git}/bin/git push"; "push" = "${pkgs.git}/bin/git push";
@ -21,6 +21,10 @@ let
"patch" = "${pkgs.git}/bin/git add -p"; "patch" = "${pkgs.git}/bin/git add -p";
"amend" = "${pkgs.git}/bin/git commit --amend"; "amend" = "${pkgs.git}/bin/git commit --amend";
"log" = "${pkgs.git}/bin/git log --all --graph --decorate"; "log" = "${pkgs.git}/bin/git log --all --graph --decorate";
"status" = "${pkgs.git}/bin/git status";
"checkout" = "${pkgs.git}/bin/git checkout";
"rebase" = "${pkgs.git}/bin/git rebase";
"stash" = "${pkgs.git}/bin/git stash";
}; };
# extracting any compressed format # extracting any compressed format
extract = '' extract = ''