Compare commits

...

8 Commits

3 changed files with 44 additions and 8 deletions

View File

@ -16,11 +16,10 @@ let g:python3_host_prog = expand('/usr/bin/python3')
let g:loaded_python_provider = 0 let g:loaded_python_provider = 0
let g:python_host_prog = '' let g:python_host_prog = ''
set autoindent set autoindent
set noexpandtab set expandtab
set softtabstop=4 set softtabstop=4
set shiftwidth=4 set shiftwidth=4
set tabstop=4 set tabstop=4
set expandtab
set nocompatible set nocompatible
set noshowmode set noshowmode
set noerrorbells set noerrorbells
@ -48,8 +47,9 @@ set title
" indent " indent
set backspace=indent,eol,start set backspace=indent,eol,start
set shiftwidth=4 "set list listchars=nbsp:¬,tab:»·,trail:·,extends:>
set list listchars=nbsp,tab:»·,trail,extends:> set list listchars=tab:\│\ ,trail
let g:indentLine_char_list = ['│', '│', '│', '│']
" editing " editing
runtime! macros/matchit.vim runtime! macros/matchit.vim
@ -106,6 +106,9 @@ call plug#begin('~/.config/nvim/plugged')
" coc " coc
Plug 'neoclide/coc.nvim', {'branch': 'release'} Plug 'neoclide/coc.nvim', {'branch': 'release'}
" Copilot
Plug 'github/copilot.vim'
" PyRight " PyRight
Plug 'sakhnik/nvim-gdb', { 'do': ':!./install.sh' } Plug 'sakhnik/nvim-gdb', { 'do': ':!./install.sh' }
@ -113,6 +116,9 @@ call plug#begin('~/.config/nvim/plugged')
Plug 'pearofducks/ansible-vim', { 'do': './UltiSnips/generate.sh' } Plug 'pearofducks/ansible-vim', { 'do': './UltiSnips/generate.sh' }
Plug 'Yggdroot/indentLine' Plug 'Yggdroot/indentLine'
" GoLang
Plug 'fatih/vim-go'
" Multiple cursors " Multiple cursors
Plug 'terryma/vim-multiple-cursors' Plug 'terryma/vim-multiple-cursors'
@ -127,6 +133,10 @@ call plug#begin('~/.config/nvim/plugged')
" Preetier " Preetier
Plug 'prettier/vim-prettier' Plug 'prettier/vim-prettier'
" Debug
Plug 'puremourning/vimspector'
Plug 'mfussenegger/nvim-dap'
call plug#end() call plug#end()
" Coc " Coc
@ -145,6 +155,9 @@ let NERDTreeShowHidden=1
" latex " latex
let g:tex_flavor = "latex" let g:tex_flavor = "latex"
" Debug
let g:vimspector_enable_mappings = 'VISUAL_STUDIO'
let g:vimspector_install_gadgets = [ 'debugpy', 'vscode-go', 'CodeLLDB', 'vscode-node-debug2' ]
"""""""""""""""""""""""""""""""" """"""""""""""""""""""""""""""""
" Theme " Theme
@ -196,6 +209,10 @@ set statusline+=%#Search#
set statusline+=\ %l/%L set statusline+=\ %l/%L
set statusline+=\ [%c] set statusline+=\ [%c]
" Disable godoc keys
let g:go_doc_keywordprg_enabled = 0
set completeopt-=preview
"""""""""""""""""""""""""""""""" """"""""""""""""""""""""""""""""
" Keyboard shortcuts " Keyboard shortcuts
"""""""""""""""""""""""""""""""" """"""""""""""""""""""""""""""""
@ -285,8 +302,8 @@ vnoremap F <C-v>$A
vnoremap f <C-v>0I vnoremap f <C-v>0I
" Better management of tabs " Better management of tabs
nnoremap <Leader>7 :tabprevious<CR> nnoremap <Leader>9 :tabprevious<CR>
nnoremap <Leader>8 :tabnext<CR> nnoremap <Leader>0 :tabnext<CR>
" Better moving " Better moving
nnoremap J } nnoremap J }

5
.gitignore vendored
View File

@ -271,3 +271,8 @@ golang
.local/state/mume .local/state/mume
.putty .putty
.redhat .redhat
.cpanm
.node-gyp/14.16.0
.packettracer
.dlv
Cisco Packet Tracer 8.0.0

16
.zshrc
View File

@ -103,7 +103,6 @@ alias dplen="trans pl:en"
alias notes="nvim $HOME/git/notes/index.md" alias notes="nvim $HOME/git/notes/index.md"
alias mgr="cd $HOME/Documents/Mega-Documents/Magisterka-Marcin/Semestr1/" alias mgr="cd $HOME/Documents/Mega-Documents/Magisterka-Marcin/Semestr1/"
[[ "$(uname)" == "Darwin" ]] && alias mpv="mpv --no-resume-playback" || alias mpv="__NV_PRIME_RENDER_OFFLOAD_PROVIDER=NVIDIA-G0 __GLX_VENDOR_LIBRARY_NAME=nvidia __GL_SYNC_TO_VBLANK=0 mpv --vo=x11 --hwdec=no --ytdl-raw-options="yes-playlist=" --no-resume-playback --ytdl-format='bestvideo[height<=?1080]+bestaudio/best'" [[ "$(uname)" == "Darwin" ]] && alias mpv="mpv --no-resume-playback" || alias mpv="__NV_PRIME_RENDER_OFFLOAD_PROVIDER=NVIDIA-G0 __GLX_VENDOR_LIBRARY_NAME=nvidia __GL_SYNC_TO_VBLANK=0 mpv --vo=x11 --hwdec=no --ytdl-raw-options="yes-playlist=" --no-resume-playback --ytdl-format='bestvideo[height<=?1080]+bestaudio/best'"
[[ "$(uname)" == "Darwin" ]] && alias lsblk="diskutil list"
alias aria2c="aria2c --seed-time=0 --disable-ipv6 --max-upload-limit=1k" alias aria2c="aria2c --seed-time=0 --disable-ipv6 --max-upload-limit=1k"
alias lg="lazygit" alias lg="lazygit"
alias update-brew="brew upgrade --cask" alias update-brew="brew upgrade --cask"
@ -119,3 +118,18 @@ export PATH=$PATH:$GOPATH/bin
export PATH=$PATH:$GOROOT/bin export PATH=$PATH:$GOROOT/bin
[ -d $HOME/repo/fortigate/bin ] && export PATH=$HOME/repo/fortigate/bin:$PATH [ -d $HOME/repo/fortigate/bin ] && export PATH=$HOME/repo/fortigate/bin:$PATH
export HISTTIMEFORMAT="%F %T " export HISTTIMEFORMAT="%F %T "
# Export for Mac
if [[ "$(uname)" == "Darwin" ]]; then
export PATH="/usr/local/opt/openssl@3/bin:$PATH"
export LDFLAGS="-L/usr/local/opt/openssl@3/lib"
export CPPFLAGS="-I/usr/local/opt/openssl@3/include"
export PKG_CONFIG_PATH="/usr/local/opt/openssl@3/lib/pkgconfig"
alias lsblk="diskutil list"
alias Update="brew update; brew upgrade"
# Resolve problem with GOPATH
# https://stackoverflow.com/questions/66284870/go-get-not-downloading-to-src-folder
export GO111MODULE=off
fi