Merge branch 'master' of https://git.yorune.pl/y0rune/myhome
Signed-off-by: Marcin Woźniak <marcin.wozniak@wundermanthompson.com>
This commit is contained in:
Marcin Woźniak
commit
a1a0f4bfd3
@ -51,38 +51,15 @@ call plug#begin('~/.config/nvim/plugged')
|
||||
" coc
|
||||
Plug 'neoclide/coc.nvim', {'branch': 'release'}
|
||||
|
||||
" coc for ruby
|
||||
Plug 'neoclide/coc-solargraph', {'do': 'gem install solargraph'}
|
||||
|
||||
" coc for python
|
||||
Plug 'fannheyward/coc-pyright', {'do': 'yarn install --frozen-lockfile; npm i -D npx-run; pip install --user jedi; pip install --user black'}
|
||||
" PyRight
|
||||
Plug 'sakhnik/nvim-gdb', { 'do': ':!./install.sh' }
|
||||
|
||||
" coc for yaml
|
||||
Plug 'neoclide/coc-yaml', {'do': 'yarn install --frozen-lockfile'}
|
||||
|
||||
" coc for json
|
||||
Plug 'neoclide/coc-json', {'do': 'yarn install --frozen-lockfile'}
|
||||
|
||||
" coc for markdownlint
|
||||
Plug 'fannheyward/coc-markdownlint', {'do': 'yarn install --frozen-lockfile; npm i -D markdownlint --save-dev'}
|
||||
|
||||
" coc for bash
|
||||
Plug 'josa42/coc-sh', {'do': 'yarn install --frozen-lockfile; npm i -D coc-sh; npm i -D bash-language-server'}
|
||||
|
||||
" coc for prettier
|
||||
Plug 'neoclide/coc-prettier', {'do': 'yarn install --frozen-lockfile'}
|
||||
|
||||
" coc-diagnostic
|
||||
" CocInstall coc-diagnostic
|
||||
Plug 'iamcco/coc-diagnostic'
|
||||
" Ansible yaml
|
||||
Plug 'pearofducks/ansible-vim', { 'do': './UltiSnips/generate.sh' }
|
||||
|
||||
" coc-cpp coc-c
|
||||
" emerge dev-util/ccls
|
||||
|
||||
" coc-perl
|
||||
Plug 'ulwlu/coc-perl', {'do': 'yarn install && yarn build'}
|
||||
|
||||
" Multiple cursors
|
||||
Plug 'terryma/vim-multiple-cursors'
|
||||
|
||||
@ -92,6 +69,9 @@ call plug#begin('~/.config/nvim/plugged')
|
||||
Plug 'tpope/vim-surround'
|
||||
call plug#end()
|
||||
|
||||
" Instalation coc extentions
|
||||
let g:coc_global_extensions = ['coc-solargraph', 'coc-go', 'coc-yaml', 'coc-pyright', 'coc-json' , 'coc-markdownlint' , 'coc-sh', 'coc-prettier', 'coc-diagnostic', 'coc-perl']
|
||||
|
||||
" Status-line
|
||||
set statusline=
|
||||
set statusline+=%#IncSearch#
|
||||
@ -105,6 +85,10 @@ set statusline+=%#Search#
|
||||
set statusline+=\ %l/%L
|
||||
set statusline+=\ [%c]
|
||||
|
||||
" ansible
|
||||
let g:ansible_extra_keywords_highlight = 1
|
||||
au BufRead,BufNewFile *.yml set filetype=yaml.ansible
|
||||
|
||||
" fzf
|
||||
let $FZF_DEFAULT_COMMAND = 'find . -type f -not -path "*/\.git/*"'
|
||||
command! -bang -nargs=* Find call fzf#vim#grep('rg --column --line-number --no-heading --fixed-strings --ignore-case --hidden --follow --color "always" '.shellescape(<q-args>), 1, <bang>0)
|
||||
@ -233,6 +217,11 @@ inoremap <A-Down> <Esc>:m+<CR>
|
||||
vnoremap <A-Down> :m '>+1<CR>gv=gv
|
||||
vnoremap <A-Up> :m '<-2<CR>gv=gv
|
||||
|
||||
nnoremap Ż :m-2<CR>
|
||||
nnoremap ∆ :m+<CR>
|
||||
vnoremap ∆ :m '>+1<CR>gv=gv
|
||||
vnoremap Ż :m '<-2<CR>gv=gv
|
||||
|
||||
nnoremap <A-k> :m-2<CR>
|
||||
nnoremap <A-j> :m+<CR>
|
||||
inoremap <A-k> <Esc>:m-2<CR>
|
||||
|
||||
@ -1,14 +0,0 @@
|
||||
(custom-set-variables
|
||||
;; custom-set-variables was added by Custom.
|
||||
;; If you edit it by hand, you could mess it up, so be careful.
|
||||
;; Your init file should contain only one such instance.
|
||||
;; If there is more than one, they won't work right.
|
||||
'(markdown-command "/usr/bin/pandoc")
|
||||
'(package-selected-packages
|
||||
'(org-bullets zenburn-theme yaml-mode use-package treemacs-projectile treemacs-persp treemacs-magit treemacs-icons-dired treemacs-evil switch-window smex robe python-black ox-reveal multiple-cursors move-text lsp-java htmlize helm flymake-shellcheck flymake-shell flymake-ruby flycheck-haskell flycheck-bashate dockerfile-mode dired-sidebar company-jedi company-ansible auto-complete-clang apache-mode ansible-doc ansible)))
|
||||
(custom-set-faces
|
||||
;; custom-set-faces was added by Custom.
|
||||
;; If you edit it by hand, you could mess it up, so be careful.
|
||||
;; Your init file should contain only one such instance.
|
||||
;; If there is more than one, they won't work right.
|
||||
)
|
||||
@ -1,70 +0,0 @@
|
||||
|
||||
;; ----- smex-history -----
|
||||
(
|
||||
find-file
|
||||
replace-string
|
||||
whitespace-mode
|
||||
package-refresh-contents
|
||||
read-only-mode
|
||||
overwrite-mode
|
||||
write-file
|
||||
)
|
||||
|
||||
;; ----- smex-data -----
|
||||
(
|
||||
(lsp-install-server . 6)
|
||||
(treemacs . 17)
|
||||
(lsp-java-update-server . 1)
|
||||
(set-frame-font . 1)
|
||||
(lsp-jt-browser . 6)
|
||||
(sort-lines . 5)
|
||||
(lsp-jt-report-open . 17)
|
||||
(treemacs-edit-workspaces . 2)
|
||||
(treemacs-refresh . 1)
|
||||
(treemacs-mode . 3)
|
||||
(menu-set-font . 2)
|
||||
(magit-commit . 1)
|
||||
(column-number-mode . 1)
|
||||
(set-fill-column . 3)
|
||||
(dap-java-debug . 7)
|
||||
(ruby-indent-exp . 1)
|
||||
(ruby-indent-line . 1)
|
||||
(ruby-mode-menu . 1)
|
||||
(inf-ruby-console-auto . 8)
|
||||
(shell . 8)
|
||||
(package-install-selected-packages . 1)
|
||||
(package-install . 3)
|
||||
(compile . 2)
|
||||
(lsp-mode . 2)
|
||||
(load-theme . 18)
|
||||
(overwrite-mode . 2)
|
||||
(goto-line . 2)
|
||||
(package-refresh-contents . 2)
|
||||
(epc:pop-to-last-server-process-buffer . 3)
|
||||
(disable-theme . 1)
|
||||
(table-insert . 3)
|
||||
(table-insert-row . 1)
|
||||
(kill-rectangle . 1)
|
||||
(delete-rectangle . 1)
|
||||
(avy-isearch . 1)
|
||||
(customize-themes . 1)
|
||||
(ido-mode . 1)
|
||||
(lsp-describe-session . 1)
|
||||
(whitespace-mode . 10)
|
||||
(python-shell-switch-to-shell . 1)
|
||||
(run-python . 2)
|
||||
(display-fill-column-indicator-mode . 3)
|
||||
(prettier-restart . 1)
|
||||
(prettier-prettify . 8)
|
||||
(prettier-mode . 2)
|
||||
(prettier-prettify-region . 2)
|
||||
(python-black . 9)
|
||||
(python-black-on-save-mode . 2)
|
||||
(message-tab . 1)
|
||||
(find-file . 2)
|
||||
(replace-string . 6)
|
||||
(ispell . 2)
|
||||
(python-black-buffer . 1)
|
||||
(write-file . 1)
|
||||
(read-only-mode . 2)
|
||||
)
|
||||
21
.gitignore
vendored
21
.gitignore
vendored
@ -1,4 +1,25 @@
|
||||
.Xauthority
|
||||
.Trash
|
||||
.DS_Store
|
||||
.ansible
|
||||
.CFUserTextEncoding
|
||||
.cups/
|
||||
.docker/
|
||||
.oh-my-zsh/
|
||||
.shell.pre-oh-my-zsh
|
||||
.zcompdum*
|
||||
.zsh_history
|
||||
.zsh_sessions/
|
||||
.emacs.d/emacs-custom.el
|
||||
.emacs.d/smex-items
|
||||
notes
|
||||
Applications/
|
||||
Desktop/
|
||||
Library/
|
||||
Pictures/
|
||||
Public/
|
||||
VirtualBox*
|
||||
synergy.log
|
||||
.config/Element/
|
||||
.config/TabNine/
|
||||
.config/coc/
|
||||
|
||||
6
.zshrc
6
.zshrc
@ -14,6 +14,7 @@ gbranch() {
|
||||
[ -f /etc/gentoo-release ] && export ZSH="/usr/share/zsh/site-contrib/oh-my-zsh"
|
||||
[ -f /etc/centos-release ] && export ZSH="$HOME/.oh-my-zsh"
|
||||
[ -f /etc/debian_version ] && export ZSH="$HOME/.oh-my-zsh"
|
||||
[[ "$(uname)" == "Darwin" ]] && export ZSH="$HOME/.oh-my-zsh"
|
||||
|
||||
HISTFILE=$HOME/.history_zsh
|
||||
HISTSIZE=10000
|
||||
@ -63,7 +64,7 @@ alias emerge="sudo emerge"
|
||||
alias channel-check='sudo iwlist wlan0 scan | egrep -i "essid|frequency"'
|
||||
alias grep="grep --color=always"
|
||||
alias egrep="egrep --color=always"
|
||||
alias ls='ls -h --color=auto'
|
||||
[[ "$(uname)" == "Darwin" ]] && alias ls="ls -h" || alias ls="ls -h --color=auto"
|
||||
alias ll='ls -lha'
|
||||
alias cp='cp -v'
|
||||
alias mv='mv -v'
|
||||
@ -78,7 +79,7 @@ alias feh="feh --edit --scale-down"
|
||||
alias changefont="figlet"
|
||||
alias gmaster="git checkout master"
|
||||
alias gcommit="git commit --author='Marcin Woźniak <y0rune@aol.com>' -s"
|
||||
alias gcommitw="git commit --author='Marcin Woźniak <marcin.wozniak@wundermanthompson.com>'"
|
||||
alias gcommitw="git commit --author='Marcin Wozniak <marcin.wozniak@wundermanthompson.com>'"
|
||||
alias gdel="git push origin --delete"
|
||||
alias gadd="git add"
|
||||
alias gpush="git push"
|
||||
@ -104,6 +105,7 @@ alias mgr="cd $HOME/Documents/Mega-Documents/Magisterka-Marcin/Semestr1/"
|
||||
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'"
|
||||
alias aria2c="aria2c --seed-time=0 --disable-ipv6 --max-upload-limit=1k"
|
||||
alias lg="lazygit"
|
||||
alias update-brew="brew upgrade --cask"
|
||||
|
||||
# Cleaning-up
|
||||
export PATH=$HOME/.local/bin:$PATH
|
||||
|
||||
Loading…
Reference in New Issue
Block a user