diff --git a/.vimrc b/.vimrc index 17bbd1b..6b8389e 100644 --- a/.vimrc +++ b/.vimrc @@ -237,6 +237,9 @@ fu DetectIndent() return endif + if filereadable(".clang-format") + return + endif execute system ('python3 ~/.vim/indent_finder/indent_finder.py --vim-output --default space --default-size ' . &tabstop .' "' . expand('%') . '"' ) if &expandtab let b:clang_style="{BasedOnStyle: LLVM, AlignConsecutiveAssignments: true, AllowShortFunctionsOnASingleLine: Empty, BreakBeforeBraces: Linux, BreakStringLiterals: false, ColumnLimit: 120, IndentCaseLabels: true, IndentWidth: " .&shiftwidth .", TabWidth: " .&tabstop .", UseTab: Never}" @@ -873,4 +876,6 @@ let g:termdebug_wide=1 " Boormark // visual mark Plugin 'MattesGroeger/vim-bookmarks' +" open file like filename.ext:NUMBER +Plugin 'bogado/file-line' call vundle#end() diff --git a/Makefile b/Makefile index 045bf88..bb21b0e 100644 --- a/Makefile +++ b/Makefile @@ -4,10 +4,10 @@ DOT_FILES=$(filter-out $(IGNORE_DOT_FILES), $(wildcard .*) .ssh/config $(wildcar DOT_INSTALLED=$(foreach dot, $(DOT_FILES), $(HOME)/$(dot)) ROOT_DIR:=$(shell dirname $(realpath $(lastword $(MAKEFILE_LIST)))) -PKG_ARCH_BASE=aspell-en aspell-fr conky cmake cscope ctags dunst eog firefox noto-fonts-emoji fzf git gmrun gnome-terminal genius gvim hunspell-fr hyphen-en hyphen-fr lightdm numlockx openssh polkit-gnome python-language-server python3 python-pynvim sudo tint2 tmux unrar unzip udevil zsh xclip openbox obconf +PKG_ARCH_BASE=aspell-en aspell-fr conky cmake cscope ctags dunst eog firefox flameshot noto-fonts-emoji fzf git gmrun gnome-terminal genius gvim hunspell-fr hyphen-en hyphen-fr lightdm numlockx openssh polkit-gnome python-language-server python3 python-pynvim sudo tint2 tmux unrar unzip udevil zsh xclip openbox obconf PKG_ARCH_DEV=autopep8 bear cppcheck clang flake8 gcc hstr shellcheck strace gitk tig -PKG_UBUNTU_BASE=aspell-en aspell-fr cmake conky cscope exuberant-ctags dunst eog firefox git gmrun gnome-terminal genius vim-gtk3 hunspell-fr hyphen-fr lightdm numlockx python3 sudo tint2 tmux unrar unzip udevil zsh openbox obconf +PKG_UBUNTU_BASE=aspell-en aspell-fr cmake conky cscope exuberant-ctags dunst eog firefox flameshot git gmrun gnome-terminal genius vim-gtk3 hunspell-fr hyphen-fr lightdm numlockx python3-pynvim python3 sudo tint2 tmux unrar unzip udevil unifont zsh openbox obconf PKG_UBUNTU_DEV=bear cppcheck clang flake8 gcc shellcheck strace gnupg flex bison build-essential zip curl zlib1g-dev gcc-multilib g++-multilib libc6-dev-i386 libncurses5-dev lib32ncurses5-dev x11proto-core-dev libx11-dev lib32z1-dev libgl1-mesa-dev libxml2-utils xsltproc unzip fontconfig clangd-10 clang-tools gitk tig android-sdk-platform-tools-common cmake-curses-gui git-lfs