From d52b6b5b6fdb75f714bd7e6524ff497456cd0570 Mon Sep 17 00:00:00 2001 From: Fabian Ising Date: Mon, 23 Dec 2019 21:38:30 +0100 Subject: [PATCH 1/3] Add vundle vim submodule for neovim --- .gitmodules | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.gitmodules b/.gitmodules index 03a3ba0..70255ad 100644 --- a/.gitmodules +++ b/.gitmodules @@ -9,3 +9,7 @@ [submodule "bundle/Vundle.vim"] path = vim/bundle/Vundle.vim url = https://github.com/VundleVim/Vundle.vim.git + +[submodule "Vundle.vim"] + path = nvim/bundle/Vundle.vim + url = https://github.com/VundleVim/Vundle.vim.git From 175acc2bdcef1cec6be665145da626e34b01a649 Mon Sep 17 00:00:00 2001 From: Fabian Ising Date: Mon, 23 Dec 2019 22:53:38 +0100 Subject: [PATCH 2/3] Add neovim link --- link_config.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/link_config.sh b/link_config.sh index 0cdaa76..8334c3b 100755 --- a/link_config.sh +++ b/link_config.sh @@ -9,3 +9,5 @@ for filename in .config/*; do ln -Ts $PWD/$filename $HOME/$filename done + +ln -Ts $PWD/nvim $HOME/.config/nvim From 95356e8469cee457d2fee5b4116f3b12f95a60ff Mon Sep 17 00:00:00 2001 From: Fabian Ising Date: Mon, 23 Mar 2020 15:08:52 +0100 Subject: [PATCH 3/3] Stale update --- .config/termite/config | 2 +- .gitignore | 1 + .gitmodules | 4 ++++ clone_and_link.sh | 2 +- nvim/init.vim | 13 ++++--------- setup_arch.sh | 2 +- tmux/.tmux_config_powerline_arch.example | 2 +- zsh/.powerline_config_arch.example | 2 +- zsh/.zshrc | 6 ++++++ 9 files changed, 20 insertions(+), 14 deletions(-) diff --git a/.config/termite/config b/.config/termite/config index 628a69f..9aff2cd 100644 --- a/.config/termite/config +++ b/.config/termite/config @@ -1,5 +1,5 @@ [options] -font = Monospace 9 +font = DejaVu Sans Mono For Powerline [colors] diff --git a/.gitignore b/.gitignore index 1377554..6eb37c0 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ *.swp +tags diff --git a/.gitmodules b/.gitmodules index 03a3ba0..d7ba4ad 100644 --- a/.gitmodules +++ b/.gitmodules @@ -9,3 +9,7 @@ [submodule "bundle/Vundle.vim"] path = vim/bundle/Vundle.vim url = https://github.com/VundleVim/Vundle.vim.git + +[submodule "nvim/bundle/Vundle.vim"] + path = nvim/bundle/Vundle.vim + url = https://github.com/VundleVim/Vundle.vim.git diff --git a/clone_and_link.sh b/clone_and_link.sh index 12b0563..faf4ad0 100755 --- a/clone_and_link.sh +++ b/clone_and_link.sh @@ -15,4 +15,4 @@ ln -Tsv $PWD/zsh $HOME/.zsh ln -Tsv ~/.zsh/.zshrc $HOME/.zshrc ln -Tsv $PWD/tmux $HOME/.tmux ln -Tsv ~/.tmux/.tmux.conf $HOME/.tmux.conf - +ln -Tsv $PWD/nvim $HOME/.config/nvim diff --git a/nvim/init.vim b/nvim/init.vim index 2ea54c4..5ca889a 100644 --- a/nvim/init.vim +++ b/nvim/init.vim @@ -13,7 +13,7 @@ Plugin 'vim-airline/vim-airline-themes' " Tags Plugin 'xolox/vim-misc' -Plugin 'xolox/vim-easytags' +Plugin 'ludovicchabant/vim-gutentags' Plugin 'majutsushi/tagbar' " Templates @@ -179,6 +179,8 @@ nmap t :call TextWrapToggle() "Copying set clipboard=unnamedplus,unnamed " Copy/Paste +" Airline +let g:airline_powerline_fonts = 1 " TagBar nmap :TagbarToggle @@ -189,7 +191,7 @@ nmap T let g:ycm_collect_identifiers_from_tags_files = 1 " Read from tag files let g:ycm_global_ycm_extra_conf = '~/.config/nvim/.ycm_extra_conf.py' " Standard conf let g:ycm_enable_diagnostic_signs = 0 " Do not show semantic error bar -let g:ycm_server_python_interpreter = '/usr/local/bin/python' +let g:ycm_server_python_interpreter = '/usr/bin/python3' let g:ycm_key_list_select_completion = ['', '', ''] let g:ycm_key_list_previous_completion = ['', '', ''] @@ -233,13 +235,6 @@ catch " Ignore non existing file endtry -" Powerline -try - source ~/.config/nvim/.vimrc_config_powerline -catch - " Ignore non existing file -endtry - " Extra stuff try source ~/.config/nvim/.vimrc_config_extra_stuff diff --git a/setup_arch.sh b/setup_arch.sh index 32794e6..b9eed51 100755 --- a/setup_arch.sh +++ b/setup_arch.sh @@ -9,7 +9,7 @@ sudo pacman --needed -Sy archlinux-keyring --noconfirm sudo pacman --needed -Syu --noconfirm yes | sudo pacman --needed -Sy vte3-ng -sudo pacman --needed -Sy base-devel xorg xorg-xinit gnome gnome-extra gvim zsh tmux openssh termite powerline powerline-fonts i3 rofi nitrogen --noconfirm +sudo pacman --needed -Sy base-devel xorg xorg-xinit gnome gnome-extra neovim zsh tmux openssh termite powerline powerline-fonts i3 rofi nitrogen python-pip --noconfirm ./clone_and_link.sh cp zsh/.powerline_config_arch.example zsh/.powerline_config cp vim/.vimrc_config_powerline_arch.example vim/.vimrc_config_powerline diff --git a/tmux/.tmux_config_powerline_arch.example b/tmux/.tmux_config_powerline_arch.example index 121cb1a..5d56ece 100644 --- a/tmux/.tmux_config_powerline_arch.example +++ b/tmux/.tmux_config_powerline_arch.example @@ -1 +1 @@ -source /usr/lib/python3.6/site-packages/powerline/bindings/tmux/powerline.conf +source /usr/lib/python3.7/site-packages/powerline/bindings/tmux/powerline.conf diff --git a/zsh/.powerline_config_arch.example b/zsh/.powerline_config_arch.example index def1b4b..44911e3 100644 --- a/zsh/.powerline_config_arch.example +++ b/zsh/.powerline_config_arch.example @@ -1 +1 @@ -source /usr/lib/python3.6/site-packages/powerline/bindings/zsh/powerline.zsh +source /usr/lib/python3.8/site-packages/powerline/bindings/zsh/powerline.zsh diff --git a/zsh/.zshrc b/zsh/.zshrc index b9eded7..64f07e6 100644 --- a/zsh/.zshrc +++ b/zsh/.zshrc @@ -50,3 +50,9 @@ export PATH="/usr/local/opt/gnu-getopt/bin:$PATH" test -e "${HOME}/.iterm2_shell_integration.zsh" && source "${HOME}/.iterm2_shell_integration.zsh" + +PATH="/home/fabian/perl5/bin${PATH:+:${PATH}}"; export PATH; +PERL5LIB="/home/fabian/perl5/lib/perl5${PERL5LIB:+:${PERL5LIB}}"; export PERL5LIB; +PERL_LOCAL_LIB_ROOT="/home/fabian/perl5${PERL_LOCAL_LIB_ROOT:+:${PERL_LOCAL_LIB_ROOT}}"; export PERL_LOCAL_LIB_ROOT; +PERL_MB_OPT="--install_base \"/home/fabian/perl5\""; export PERL_MB_OPT; +PERL_MM_OPT="INSTALL_BASE=/home/fabian/perl5"; export PERL_MM_OPT;