leon/home-manager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

pager and git diff and merge setup

Browse Source
This commit is contained in:
Leon Wilzer 2024-11-29 00:39:33 +01:00
parent f6d588f4e0
commit d6589d437b
Signed by: leon
GPG Key ID: 645EFCD19E59ED05
2 changed files with 24 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
common.nix
View File

@ -339,9 +339,8 @@ in
config = { config = {
home.sessionVariables = { home.sessionVariables = {
EDITOR = "nvim"; PAGER = "less -RFX --tabs=4";
PAGER = "nvim -R"; MANPAGER = "nvim +'setl filetype=terminal' +'Man!'";
MANPAGER = "nvim -R +Man!";
}; };
xdg.mimeApps = { xdg.mimeApps = {
@ -517,13 +516,14 @@ in
p = "push"; p = "push";
cl = "clone"; cl = "clone";
}; };
delta = { diff-so-fancy = {
enable = true; enable = true;
}; };
extraConfig = { extraConfig = {
push = { push = {
autoSetupRemote = true; autoSetupRemote = true;
}; };
merge.tool = "nvimdiff2";
commit = { commit = {
gpgsign = true; gpgsign = true;
}; };
@ -566,28 +566,33 @@ in
defaultEditor = true; defaultEditor = true;
vimAlias = true; vimAlias = true;
viAlias = true; viAlias = true;
vimdiffAlias = true;
extraConfig = '' extraConfig = ''
" General " General
set number set number
set relativenumber set relativenumber
set cc=120 set cc=120
set tabstop=4 set tabstop=4
set softtabstop=0 noexpandtab set softtabstop=0 noexpandtab
set shiftwidth=4 set shiftwidth=4
colorscheme catppuccin-mocha colorscheme catppuccin-mocha
hi Normal guibg=NONE ctermbg=NONE
" VimTex " VimTex
filetype plugin indent on filetype plugin indent on
syntax enable syntax enable
let g:vimtex_view_method = 'zathura' let g:vimtex_view_method = 'zathura'
" Vim-LaTeX-live-preview " Vim-LaTeX-live-preview
let g:livepreview_previewer = 'zathura' let g:livepreview_previewer = 'zathura'
lua require'terminal'.setup()
''; '';
plugins = with pkgs.vimPlugins; [ plugins = with pkgs.vimPlugins; [
vimtex vimtex
vim-latex-live-preview vim-latex-live-preview
catppuccin-nvim catppuccin-nvim
nvim-terminal-lua
]; ];
}; };