fleaz/nixos-config
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

i can't git propperly

Browse source
This commit is contained in:
fleaz 2023-08-04 10:57:43 +02:00
parent d4389cfcdf
commit b7ba7391c1
1 changed files with 0 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
home-manager/modules/neovim.nix
View file

@ -138,15 +138,12 @@
" neoformat " neoformat
let g:neoformat_python_black = { 'args': ['-l 120'] } let g:neoformat_python_black = { 'args': ['-l 120'] }
<<<<<<< HEAD
=======
" Set name of tmux pane " Set name of tmux pane
autocmd BufReadPost,FileReadPost,BufNewFile,BufEnter * call system("tmux rename-window 'vim " . expand("%:t") . "'") autocmd BufReadPost,FileReadPost,BufNewFile,BufEnter * call system("tmux rename-window 'vim " . expand("%:t") . "'")
autocmd VimLeave * call system("tmux rename-window 'tmux'") autocmd VimLeave * call system("tmux rename-window 'tmux'")
" Enter goyo mode " Enter goyo mode
nmap <Leader>gy :Goyo 50%x100%<CR> nmap <Leader>gy :Goyo 50%x100%<CR>
>>>>>>> c3f5e69 (neovim: Added goyo and tmux pane renaming)
lua << EOF lua << EOF
require("bufferline").setup{} require("bufferline").setup{}