diff options
| -rw-r--r-- | ftplugin/markdown.vim | 1 | ||||
| -rw-r--r-- | general/settings.vim | 2 | ||||
| -rw-r--r-- | general/theme.vim (renamed from themes/nvcode.vim) | 6 | ||||
| -rw-r--r-- | init.vim | 5 | ||||
| -rw-r--r-- | syntax/java.vim | 180 | ||||
| -rw-r--r-- | themes/airline.vim | 53 | ||||
| -rw-r--r-- | themes/material.vim | 7 | ||||
| -rw-r--r-- | themes/nord.vim | 5 | ||||
| -rw-r--r-- | themes/spaceline.vim | 2 | ||||
| -rw-r--r-- | themes/syntax.vim | 8 | ||||
| -rwxr-xr-x | utils/bin/install-common-language-servers (renamed from utils/easy-install-language-servers.sh) | 0 | ||||
| -rwxr-xr-x | utils/bin/install-latest-neovim (renamed from utils/install_latest_neovim.sh) | 0 | ||||
| -rw-r--r-- | utils/snips/markdown.snippets (renamed from snips/markdown.snippets) | 0 | ||||
| -rw-r--r-- | vimspector-config/configurations/linux/_all/java/vimspector.json | 25 |
14 files changed, 9 insertions, 285 deletions
diff --git a/ftplugin/markdown.vim b/ftplugin/markdown.vim deleted file mode 100644 index 291b8115..00000000 --- a/ftplugin/markdown.vim +++ /dev/null @@ -1 +0,0 @@ -set wrap diff --git a/general/settings.vim b/general/settings.vim index 7f0a0b5b..022e9ec8 100644 --- a/general/settings.vim +++ b/general/settings.vim @@ -53,6 +53,8 @@ set guifont=JetBrainsMono\ Nerd\ Font\ Mono:h18 " au! BufWritePost $MYVIMRC source % " auto source when writing to init.vm alternatively you can run :source $MYVIMRC autocmd FileType * setlocal formatoptions-=c formatoptions-=r formatoptions-=o +autocmd FileType markdown set wrap + " You can't stop me cmap w!! w !sudo tee % diff --git a/themes/nvcode.vim b/general/theme.vim index da35fb75..5a738f8a 100644 --- a/themes/nvcode.vim +++ b/general/theme.vim @@ -14,3 +14,9 @@ if (has("termguicolors")) set termguicolors hi LineNr ctermbg=NONE guibg=NONE endif + +" Change this when you know where i3 will be +aug i3config_ft_detection + au! + au BufNewFile,BufRead ~/.config/i3/config set filetype=i3config +aug end @@ -11,6 +11,7 @@ endif source ~/.config/nvim/vim-plug/plugins.vim source ~/.config/nvim/general/settings.vim source ~/.config/nvim/general/functions.vim +source ~/.config/nvim/general/theme.vim source ~/.config/nvim/keys/mappings.vim if exists('g:vscode') @@ -20,10 +21,6 @@ if exists('g:vscode') source ~/.config/nvim/plug-config/highlightyank.vim else - " Themes - source ~/.config/nvim/themes/syntax.vim - source ~/.config/nvim/themes/nvcode.vim - " Plugin Configuration source ~/.config/nvim/keys/which-key.vim source ~/.config/nvim/plug-config/vim-commentary.vim diff --git a/syntax/java.vim b/syntax/java.vim deleted file mode 100644 index 1c50746b..00000000 --- a/syntax/java.vim +++ /dev/null @@ -1,180 +0,0 @@ - -" note do not change the order... -" some of them are overridding privous regrex - -"this code made with build-in syntax regrex(and key words), and with some custome regrex(and -"key words) - -"""""""""""""""""""""""""""""""""""""""""""""""""""""""" - - -" gruvbox (dark) -"let orange = "#d65d0e" "special color for numbers -"let black = "#282828" -"let red = "#cc241d" -"let green = "#98971a" -"let yellow = "#d79921" -"let blue = "#458588" -"let purple = "#b16286" -"let cyan = "#689d6a" -"let white = "#a89984" - - -" one dark -let orange = "#d19a66" "special color for numbers -let black = "#282c34" -let red = "#E06C75" -let green = "#98c379" -let yellow = "#E5C07B" -let blue = "#61AFEF" -let purple = "#C678DD" -let cyan = "#56B6C2" -let white = "#ABB2BF" - - -" you may chage the color according to your will :) - - -" main color (for left over words) -syn match main "\w" -execute "highlight main ctermfg=4 guifg=".red - -" numbers -syn match posNum "\d" -execute "highlight posNum ctermfg=4 guifg=".orange - -" method names() -syn match class ".\w*\((\)\@=" -execute "highlight class ctermfg=4 guifg=".blue - -"execute "highlight names which contains numbers -syn match main "\v(\a)\w*\d" -execute "highlight main ctermfg=4 guifg=".red - -"all regrex works -" /^import (+);$/mg -" import \zs.*\ze -" \v(^import\s+)@<=.*; - -" imported packages -syn match importName "\v(^import\s+)@<=.*;" -execute "highlight importName ctermfg=4 guifg=".yellow - -" import -syn match importWord "import " -execute "highlight importWord ctermfg=4 guifg=".purple - -" package name -syn match packageName "\v(^package\s+)@<=.*;" -execute "highlight packageName ctermfg=4 guifg=".yellow - -" package -syn match packageWord "package " -execute "highlight packageWord ctermfg=4 guifg=".purple - -"ex: int, double, char -execute "highlight javaType ctermfg=4 guifg=".purple - -"ex: static, throws -execute "highlight javaStorageClass ctermfg=4 guifg=".purple - - -"class name... basically starts with caps letter -syntax match ClassName display '\<\([A-Z][a-z0-9]*\)\+\>' -syntax match ClassName display '\.\@<=\*' -highlight link ClassName Identifier -execute "highlight ClassName ctermfg=4 guifg=".yellow - -" Just some special color, why not? -" syn match print " System.out." -" execute "highlight print ctermfg=4 guifg=".yellow - -"objects (ex: String) -execute "highlight Constant ctermfg=4 guifg=".yellow - -" class -syn match javaClassDecl2 " class\> " -execute "highlight javaClassDecl2 ctermfg=4 guifg=".purple - -" package -execute "highlight javaExternal ctermfg=4 guifg=".purple - -"if else switch -execute "highlight javaConditional ctermfg=4 guifg=".purple - -"while for do -execute "highlight javaRepeat ctermfg=4 guifg=".purple - -"true flase -execute "highlight javaBoolean ctermfg=4 guifg=".orange - - -" null -syn match null "\v[ =]null[; ]" -execute "highlight null ctermfg=4 guifg=".orange - - -" this super -execute "highlight javaTypedef ctermfg=4 guifg=".purple - -" var new instanceof -execute "highlight javaOperator ctermfg=4 guifg=".purple - -" return -execute "highlight javaStatement ctermfg=4 guifg=".purple - -" static synchronized transient volatile final strictfp serializable -execute "highlight javaStorageClass ctermfg=4 guifg=".purple - -"throw try catch finally -execute "highlight javaExceptions ctermfg=4 guifg=".purple - -" assert -execute "highlight javaAssert ctermfg=4 guifg=".purple - -" synchronized throws -execute "highlight javaMethodDecl ctermfg=4 guifg=".red - -" extends implements interface -execute "highlight javaClassDecl ctermfg=4 guifg=".red - -" interface -execute "highlight javaClassDecl ctermfg=4 guifg=".purple - -" break continue skipwhite -execute "highlight javaBranch ctermfg=4 guifg=".purple - -" public protected private abstract -execute "highlight javaScopeDecl ctermfg=4 guifg=".purple - - -""""""""""""""""""""""""""""""""""""""' -" java 9... -" module transitive -execute "highlight javaModuleStorageClass ctermfg=4 guifg=".purple - - -" open requires exports opens uses provides -execute "highlight javaModuleStmt ctermfg=4 guifg=".yellow - - -" to with -execute "highlight javaModuleExternal ctermfg=4 guifg=".red - - -""""""""""""""""""""""""""""""""""""""""" -" lambda -execute "highlight javaLambdaDef ctermfg=4 guifg=".cyan - - -"""""""""""""""""""""""""""""""""""""""""" -" clone equals finalize getClass hashCode -" notify notifyAll toString wait -execute "highlight javaLangObject ctermfg=4 guifg=".yellow - - - - - -"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" - diff --git a/themes/airline.vim b/themes/airline.vim deleted file mode 100644 index 07848515..00000000 --- a/themes/airline.vim +++ /dev/null @@ -1,53 +0,0 @@ -" enable tabline -" let g:airline#extensions#tabline#enabled = 1 -" let g:airline#extensions#tabline#left_sep = '' -" let g:airline#extensions#tabline#left_alt_sep = '' -" let g:airline#extensions#tabline#right_sep = '' -" let g:airline#extensions#tabline#right_alt_sep = '' -" let airline#extensions#tabline#show_splits = 0 -" let airline#extensions#tabline#tabs_label = '' - -" Disable tabline close button -let g:airline#extensions#tabline#show_close_button = 0 -let g:airline#extensions#tabline#show_tab_type = 0 -let g:airline#extensions#tabline#show_tab_nr = 0 -let g:airline#extensions#tabline#fnamecollapse = 1 - -let g:airline_extensions = ['branch', 'hunks', 'coc'] - -let g:airline#extensions#tabline#buffers_label = '' -let g:airline#extensions#tabline#tabs_label = '' -let g:airline#extensions#coc#enabled = 1 - -" Just show the file name -let g:airline#extensions#tabline#fnamemod = ':t' - -" enable powerline fonts -let g:airline_powerline_fonts = 1 -let g:airline_left_sep = '' -let g:airline_right_sep = '' -let g:airline_right_alt_sep = '' - -let g:airline#extensions#tabline#formatter = 'unique_tail' - -let g:airline#extensions#default#layout = [['a', 'b', 'c'], ['x', 'z', 'warning', 'error']] -" let g:airline_skip_empty_sections = 1 - -let g:airline_section_c = airline#section#create(['']) -" let g:airline_section_z = airline#section#create(['linenr']) - -" Switch to your current theme -let g:airline_theme = 'one' - -" Always show tabs -set showtabline=2 - -" We don't need to see things like -- INSERT -- anymore -set noshowmode - -" Sections -" let g:airline_section_c = '' -let g:airline_section_a = "ï„¡ NVCode" -" let g:airline_section_a = "" -let g:airline_section_y = '' -let g:webdevicons_enable_airline_tabline = 1 diff --git a/themes/material.vim b/themes/material.vim deleted file mode 100644 index 1f039487..00000000 --- a/themes/material.vim +++ /dev/null @@ -1,7 +0,0 @@ -if (has('termguicolors')) - set termguicolors -endif - -let g:material_terminal_italics = 1 -let g:material_theme_style = 'darker' -colorscheme material diff --git a/themes/nord.vim b/themes/nord.vim deleted file mode 100644 index 7419e462..00000000 --- a/themes/nord.vim +++ /dev/null @@ -1,5 +0,0 @@ -if (has('termguicolors')) - set termguicolors -endif - -colorscheme nord diff --git a/themes/spaceline.vim b/themes/spaceline.vim deleted file mode 100644 index 584ca36e..00000000 --- a/themes/spaceline.vim +++ /dev/null @@ -1,2 +0,0 @@ -let g:spaceline_seperate_style= 'none' -let g:spaceline_colorscheme = 'mach2' diff --git a/themes/syntax.vim b/themes/syntax.vim deleted file mode 100644 index 131266c6..00000000 --- a/themes/syntax.vim +++ /dev/null @@ -1,8 +0,0 @@ -" Syntax highlighting -let g:python_highlight_all=1 - -" Change this when you know where i3 will be -aug i3config_ft_detection - au! - au BufNewFile,BufRead ~/.config/i3/config set filetype=i3config -aug end diff --git a/utils/easy-install-language-servers.sh b/utils/bin/install-common-language-servers index da54c11a..da54c11a 100755 --- a/utils/easy-install-language-servers.sh +++ b/utils/bin/install-common-language-servers diff --git a/utils/install_latest_neovim.sh b/utils/bin/install-latest-neovim index bdd9441d..bdd9441d 100755 --- a/utils/install_latest_neovim.sh +++ b/utils/bin/install-latest-neovim diff --git a/snips/markdown.snippets b/utils/snips/markdown.snippets index 7e77ffb3..7e77ffb3 100644 --- a/snips/markdown.snippets +++ b/utils/snips/markdown.snippets diff --git a/vimspector-config/configurations/linux/_all/java/vimspector.json b/vimspector-config/configurations/linux/_all/java/vimspector.json deleted file mode 100644 index 608ec1b7..00000000 --- a/vimspector-config/configurations/linux/_all/java/vimspector.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "adapters": { - "java-debug-server": { - "name": "vscode-java", - "port": "${AdapterPort}" - } - }, - "configurations": { - "Java Attach": { - "default": true, - "adapter": "java-debug-server", - "configuration": { - "request": "attach", - "host": "127.0.0.1", - "port": "5005" - }, - "breakpoints": { - "exception": { - "caught": "N", - "uncaught": "N" - } - } - } - } -} |