From 0761a915fb6a4fc806e08c244d0c549a953a34d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcin=20Wo=C5=BAniak?= Date: Fri, 13 Aug 2021 16:54:13 +0200 Subject: [PATCH 01/13] Added ansible into nvim MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Marcin Woźniak --- .config/nvim/init.vim | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.config/nvim/init.vim b/.config/nvim/init.vim index b13a06b..82c644d 100644 --- a/.config/nvim/init.vim +++ b/.config/nvim/init.vim @@ -60,6 +60,7 @@ call plug#begin('~/.config/nvim/plugged') " coc for yaml Plug 'neoclide/coc-yaml', {'do': 'yarn install --frozen-lockfile'} + Plug 'pearofducks/ansible-vim', { 'do': './UltiSnips/generate.sh' } " coc for json Plug 'neoclide/coc-json', {'do': 'yarn install --frozen-lockfile'} @@ -105,6 +106,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(), 1, 0) From 2a279f878871c7ddc7878da7fed612c9b3ad4622 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcin=20Wo=C5=BAniak?= Date: Thu, 2 Sep 2021 17:01:20 +0200 Subject: [PATCH 02/13] Added new zshrc due to macos MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Marcin Woźniak --- .zshrc | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.zshrc b/.zshrc index 953945b..4fe5572 100644 --- a/.zshrc +++ b/.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 ' -s" -alias gcommitw="git commit --author='Marcin Woźniak '" +alias gcommitw="git commit --author='Marcin Wozniak '" alias gdel="git push origin --delete" alias gadd="git add" alias gpush="git push" From a5fa865798fc07ae6adcb637fcced473f376fd58 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcin=20Wo=C5=BAniak?= Date: Tue, 7 Sep 2021 10:58:06 +0200 Subject: [PATCH 03/13] Added new vimrc due to mac MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Marcin Woźniak --- .config/nvim/init.vim | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.config/nvim/init.vim b/.config/nvim/init.vim index 82c644d..221e17e 100644 --- a/.config/nvim/init.vim +++ b/.config/nvim/init.vim @@ -238,6 +238,11 @@ inoremap :m+ vnoremap :m '>+1gv=gv vnoremap :m '<-2gv=gv +nnoremap Ż :m-2 +nnoremap ∆ :m+ +vnoremap ∆ :m '>+1gv=gv +vnoremap Ż :m '<-2gv=gv + nnoremap :m-2 nnoremap :m+ inoremap :m-2 From 97796ba578d2907ce5508388416ec454f42cbe12 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcin=20Wo=C5=BAniak?= Date: Thu, 9 Sep 2021 19:06:50 +0200 Subject: [PATCH 04/13] Added update-brew MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Marcin Woźniak --- .zshrc | 1 + 1 file changed, 1 insertion(+) diff --git a/.zshrc b/.zshrc index 4fe5572..4b651e3 100644 --- a/.zshrc +++ b/.zshrc @@ -105,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 From f295c73db052fb7813ae338958193c83c81cd7ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcin=20Wo=C5=BAniak?= Date: Sun, 12 Sep 2021 19:41:57 +0200 Subject: [PATCH 05/13] Removed one by one installation and added one line with installation coc extentions --- .config/nvim/init.vim | 31 +++++-------------------------- 1 file changed, 5 insertions(+), 26 deletions(-) diff --git a/.config/nvim/init.vim b/.config/nvim/init.vim index 221e17e..23d48a7 100644 --- a/.config/nvim/init.vim +++ b/.config/nvim/init.vim @@ -51,39 +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'} + " Ansible yaml Plug 'pearofducks/ansible-vim', { 'do': './UltiSnips/generate.sh' } - " 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' - " 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' @@ -93,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# From 8aaa2713cf23901a3b2ce5938a1e778389d4a2ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcin=20Wo=C5=BAniak?= Date: Sun, 12 Sep 2021 19:43:53 +0200 Subject: [PATCH 06/13] Added into gitignore zsh stuff --- .gitignore | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.gitignore b/.gitignore index 738065e..f5ff81d 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,9 @@ .Xauthority +.oh-my-zsh/ +.shell.pre-oh-my-zsh +.zcompdum* +.zsh_history +.zsh_sessions/ .config/Element/ .config/TabNine/ .config/coc/ From 29123e7a4530f702a1526f7be05b6845a42f0c50 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcin=20Wo=C5=BAniak?= Date: Sun, 12 Sep 2021 19:44:22 +0200 Subject: [PATCH 07/13] Added into gitignore All MacOs stuff --- .gitignore | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.gitignore b/.gitignore index f5ff81d..f1c4a75 100644 --- a/.gitignore +++ b/.gitignore @@ -1,9 +1,16 @@ .Xauthority +.Trash .oh-my-zsh/ .shell.pre-oh-my-zsh .zcompdum* .zsh_history .zsh_sessions/ +Applications/ +Desktop/ +Library/ +Pictures/ +Public/ +VirtualBox* .config/Element/ .config/TabNine/ .config/coc/ From 94027229c61915d124af2818916cec17222cb854 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcin=20Wo=C5=BAniak?= Date: Sun, 12 Sep 2021 19:45:27 +0200 Subject: [PATCH 08/13] Added into gitignore ansible cups docker dot files --- .gitignore | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.gitignore b/.gitignore index f1c4a75..38e523e 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,9 @@ .Xauthority .Trash +.DS_Store +.ansible +.cups/ +.docker/ .oh-my-zsh/ .shell.pre-oh-my-zsh .zcompdum* From 8a87a8f0667c095200813c02b24da52039aea96f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcin=20Wo=C5=BAniak?= Date: Sun, 12 Sep 2021 19:45:52 +0200 Subject: [PATCH 09/13] Added into gitignore dot emacs stuff --- .gitignore | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitignore b/.gitignore index 38e523e..d62dd16 100644 --- a/.gitignore +++ b/.gitignore @@ -9,6 +9,8 @@ .zcompdum* .zsh_history .zsh_sessions/ +.emacs.d/emacs-custom.el +.emacs.d/smex-items Applications/ Desktop/ Library/ From 6149f5a8edd2da13ceaef8154267e3c06e38c25a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcin=20Wo=C5=BAniak?= Date: Sun, 12 Sep 2021 19:46:25 +0200 Subject: [PATCH 10/13] Added into gitignore Mac stuff --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index d62dd16..fa61a11 100644 --- a/.gitignore +++ b/.gitignore @@ -2,6 +2,7 @@ .Trash .DS_Store .ansible +.CFUserTextEncoding .cups/ .docker/ .oh-my-zsh/ From ccf148fd0d33e7c174df56ed0dfa15dc38839b29 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcin=20Wo=C5=BAniak?= Date: Sun, 12 Sep 2021 19:46:49 +0200 Subject: [PATCH 11/13] Added files from home --- .gitignore | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitignore b/.gitignore index fa61a11..286be50 100644 --- a/.gitignore +++ b/.gitignore @@ -12,12 +12,14 @@ .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/ From c9aeba9a7e6925782306df8c6e182709c8676877 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcin=20Wo=C5=BAniak?= Date: Sun, 12 Sep 2021 19:48:55 +0200 Subject: [PATCH 12/13] Renamed `chatty` -> `chatty-run` --- .local/bin/{chatty => chatty-run} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename .local/bin/{chatty => chatty-run} (100%) diff --git a/.local/bin/chatty b/.local/bin/chatty-run similarity index 100% rename from .local/bin/chatty rename to .local/bin/chatty-run From 5ea0f32b0e76f3f6202e9416ba37f0f8f70461a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcin=20Wo=C5=BAniak?= Date: Sun, 12 Sep 2021 19:51:55 +0200 Subject: [PATCH 13/13] Removed emacs dot stuff --- .emacs.d/emacs-custom.el | 14 -------- .emacs.d/smex-items | 70 ---------------------------------------- 2 files changed, 84 deletions(-) delete mode 100644 .emacs.d/emacs-custom.el delete mode 100644 .emacs.d/smex-items diff --git a/.emacs.d/emacs-custom.el b/.emacs.d/emacs-custom.el deleted file mode 100644 index a07e37d..0000000 --- a/.emacs.d/emacs-custom.el +++ /dev/null @@ -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. - ) diff --git a/.emacs.d/smex-items b/.emacs.d/smex-items deleted file mode 100644 index 6801c81..0000000 --- a/.emacs.d/smex-items +++ /dev/null @@ -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) -)