perso/huhuhu_config
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merge conflict

Browse Source
This commit is contained in:
hugogogo
2022-12-20 10:47:41 +01:00
parent 8971e3954a b3b81cf199
commit f9be2b028e
5 changed files with 156 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
config_files/.screenrc
View File

@@ -40,17 +40,14 @@ bind F eval "hardstatus alwayslastline"
# stuff "vim file.txt^M"
chdir $HOME/huhuhu_config
screen
chdir $HOME/huhuhu_config/tutos
screen -t tutos_shell vim -n shell.txt
screen -t tutos_git vim -n git.txt
screen -t tutos_screen vim -n screen.txt
#screen -t tutos_node vim -n node.txt
#screen -t tutos_react vim -n react.txt
#screen -t tutos_php vim -n php.txt
screen -t tutos_sites vim -n sites.txt
screen -t tutos_vim vim -n vim.txt
screen -t tutos_computer vim -n computer.txt
screen -t .vimrc vim -n ./config_files/.vimrc
screen -t .screenrc vim -n ./config_files/.screenrc
screen -t tutos_vim vim -n ./tutos/vim.txt
screen -t tutos_screen vim -n ./tutos/screen.txt
screen -t tutos_git vim -n ./tutos/git.txt
screen -t tutos_sites vim -n ./tutos/sites.txt
screen -t tutos_computer vim -n ./tutos/computer.txt
chdir $HOME
screen

38
config_files/.vimrc
View File

@@ -38,10 +38,10 @@ highlight Normal ctermbg=NONE
highlight nonText ctermbg=NONE
" show existing tab with 4 spaces width
set tabstop=4
set tabstop=2
" when indenting with '>', use 4 spaces width
set shiftwidth=4
set shiftwidth=2
" indent new line like the previous one
set autoindent
@@ -55,6 +55,12 @@ set number
" don't allow wrap
set nowrap
" in wrap mode,
" show next lines instead of '@'
" break on words
set display=lastline
set lbr
" using alternate buffer with Explore, ':b#'
" =0 ot go back to explore buffer
" =1 ot go back to last edited file
@@ -66,6 +72,7 @@ set nowrap
"let g:netrw_altfile = 0
" choose how to print list in :Explore window
" alternatively you can hit 'i' inside Explore window to switch between styles
" =0 is default
" =3 is tree style
let g:netrw_liststyle = 3
@@ -97,16 +104,28 @@ nnoremap <C-Down> :m+<CR>
nnoremap <C-Up> :m-2<CR>
nnoremap <C-Right> >><CR>k
nnoremap <C-Left> <<<CR>k
nnoremap <C-j> :m+<CR>
nnoremap <C-k> :m-2<CR>
nnoremap <C-l> >><CR>k
nnoremap <C-h> <<<CR>k
inoremap <C-Down> <Esc>:m+<CR>gi
inoremap <C-Up> <Esc>:m-2<CR>gi
inoremap <C-Right> <Esc>>><CR>gi
inoremap <C-Left> <Esc><<<CR>gi
inoremap <C-j> <Esc>:m+<CR>gi
inoremap <C-k> <Esc>:m-2<CR>gi
inoremap <C-l> <Esc>>><CR>gi
inoremap <C-h> <Esc><<<CR>gi
vnoremap <C-Down> :m'>+<CR>gv
vnoremap <C-Up> :m-2<CR>gv
vnoremap <C-Right> ><CR>gv
vnoremap <C-Left> <<CR>gv
vnoremap <C-j> :m'>+<CR>gv
vnoremap <C-k> :m-2<CR>gv
vnoremap <C-l> ><CR>gv
vnoremap <C-h> <<CR>gv
" move selection inside lines with Ctrl-Shift + left/right
vnoremap <C-S-Left> <Esc>`<<Left>i_<Esc>mz"_xgvx`zPgv<Left>o<Left>o
@@ -114,6 +133,19 @@ vnoremap <C-S-Right> <Esc>`><Right>gvxpgv<Right>o<Right>o
"---------------------------------------------------------------
" to move cursor inside wrapping
"---------------------------------------------------------------
" https://vim.fandom.com/wiki/Move_cursor_by_display_lines_when_wrapping
nnoremap <Down> gj
nnoremap <Up> gk
vnoremap <Down> gj
vnoremap <Up> gk
inoremap <Down> <C-o>gj
inoremap <Up> <C-o>gk
"---------------------------------------------------------------
" put swap files in a special directory
"---------------------------------------------------------------
@@ -164,7 +196,7 @@ autocmd BufNewFile *.hpp call HPPFile()
autocmd BufNewFile *.cpp if @% == 'main.cpp' | call MAINCPPFile() | else | call CPPFile()
autocmd BufNewFile Makefile call MAKEFile()
autocmd BufNewFile colors.h call COLORFile()
autocmd BufNewFile testss.hpp call TESTSFile()
autocmd BufNewFile tests.hpp call TESTSFile()