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

2
flake.nix
View File

@ -62,7 +62,7 @@
homeConfigurations."leon" = home-manager.lib.homeManagerConfiguration {
inherit pkgs;
modules = [
./home.nix
];