diff --git a/.config/neomutt/settings b/.config/neomutt/settings index 2a19155..12b060d 100644 --- a/.config/neomutt/settings +++ b/.config/neomutt/settings @@ -65,17 +65,4 @@ set mailcap_path = ~/.config/neomutt/mailcap set header_cache = "~/.cache/mutt" set message_cachedir = "~/.cache/mutt" -# Sidebar - -set sidebar_visible -set sidebar_format = "%B%%* %%S" -set mail_check_stats - -# Ctrl-P – Previous Mailbox -bind index,pager \Cp sidebar-prev -# Ctrl-N – Next Mailbox -bind index,pager \Cn sidebar-next -# Ctrl-O – Open Highlighted Mailbox -bind index,pager \Co sidebar-open -# #set query_command = "khard email --parsable --search-in-source-files '%s'" diff --git a/.config/nvim/.luarc.json b/.config/nvim/.luarc.json deleted file mode 100644 index f4df01b..0000000 --- a/.config/nvim/.luarc.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "$schema": "https://raw.githubusercontent.com/LuaLS/vscode-lua/master/setting/schema.json", - "runtime.version": "LuaJIT", - "Lua.format.defaultConfig": { - "indent_style": "space", - "indent_size": "2" - }, - "Lua.diagnostics.globals": ["vim" ] -} - diff --git a/.config/nvim/init.lua b/.config/nvim/init.lua deleted file mode 100644 index 546ff24..0000000 --- a/.config/nvim/init.lua +++ /dev/null @@ -1,17 +0,0 @@ -vim.o.termguicolors = true -vim.opt.runtimepath:append("~/.vim") -vim.opt.runtimepath:append("~/.vim/after") -vim.opt.packpath:append(vim.opt.runtimepath) -vim.cmd('source ~/.vimrc') -require("formatter").setup() -require("mason").setup() -require("mason-lspconfig").setup() -require("mason-lspconfig").setup_handlers { - function (server_name) - require("lspconfig")[server_name].setup{} - end -} -local ok, _ = pcall(require, 'schtobia') -if not ok then - print("No custom.lua found") -end diff --git a/.config/nvim/init.vim b/.config/nvim/init.vim new file mode 100644 index 0000000..10c921f --- /dev/null +++ b/.config/nvim/init.vim @@ -0,0 +1,4 @@ +set termguicolors +set runtimepath^=~/.vim runtimepath+=~/.vim/after +let &packpath = &runtimepath +source ~/.vimrc diff --git a/.config/sysctl.conf b/.config/sysctl.conf index 96e2c2a..a84b8bb 100644 --- a/.config/sysctl.conf +++ b/.config/sysctl.conf @@ -13,7 +13,4 @@ net.ipv4.tcp_keepalive_probes = 3 net.ipv4.tcp_syncookies = 1 net.ipv4.tcp_tw_reuse = 1 -vm.dirty_expire_centisecs = 3000 -vm.dirty_writeback_centisecs = 3000 - # vim: set ft=cfg: diff --git a/.vim/bundle/Vundle.vim b/.vim/bundle/Vundle.vim index 5548a1a..0765c5c 160000 --- a/.vim/bundle/Vundle.vim +++ b/.vim/bundle/Vundle.vim @@ -1 +1 @@ -Subproject commit 5548a1a937d4e72606520c7484cd384e6c76b565 +Subproject commit 0765c5c4f485fa111f190e2d7dd89ec9f5b3f554 diff --git a/.vimrc b/.vimrc index 53a9fe6..9662eb3 100644 --- a/.vimrc +++ b/.vimrc @@ -13,34 +13,33 @@ call vundle#begin() Plugin 'APZelos/blamer.nvim' Plugin 'airblade/vim-gitgutter' Plugin 'Chiel92/vim-autoformat' + Plugin 'deoplete-plugins/deoplete-docker' + Plugin 'deoplete-plugins/deoplete-jedi' Plugin 'editorconfig/editorconfig-vim' Plugin 'junegunn/fzf' Plugin 'junegunn/fzf.vim' Plugin 'junegunn/goyo.vim' Plugin 'junegunn/limelight.vim' Plugin 'frankier/neovim-colors-solarized-truecolor-only' + Plugin 'freitass/todo.txt-vim' + Plugin 'itspriddle/vim-shellcheck' + Plugin 'majutsushi/tagbar' Plugin 'mhinz/vim-startify' Plugin 'preservim/nerdtree' Plugin 'sheerun/vim-polyglot' + Plugin 'Shougo/deoplete-clangx' + Plugin 'Shougo/deoplete.nvim' + Plugin 'Shougo/neoinclude.vim' Plugin 'tpope/vim-fugitive' Plugin 'tpope/vim-sleuth' Plugin 'vim-airline/vim-airline' Plugin 'vim-airline/vim-airline-themes' Plugin 'wincent/terminus' + Plugin 'wokalski/autocomplete-flow' Plugin 'Xuyuanp/nerdtree-git-plugin' if !has('nvim') Plugin 'roxma/nvim-yarp' Plugin 'roxma/vim-hug-neovim-rpc' - else - Plugin 'mfussenegger/nvim-dap' - Plugin 'mfussenegger/nvim-lint' - Plugin 'mhartington/formatter.nvim' - Plugin 'nvim-neotest/nvim-nio' - Plugin 'rcarriga/nvim-dap-ui' - " the following order is important - Plugin 'williamboman/mason.nvim' - Plugin 'williamboman/mason-lspconfig.nvim' - Plugin 'neovim/nvim-lspconfig' endif call vundle#end() @@ -66,25 +65,26 @@ let g:airline_powerline_fonts = 1 let g:airline_symbols.colnr = ' C' let g:airline_theme='solarized' let g:airline#extensions#tabline#enabled = 1 -let g:blamer_enabled = 1 let g:blamer_date_format = '%c' let g:blamer_delay = 500 let g:blamer_prefix = ' > ' +let g:deoplete#enable_at_startup = 1 +let g:deoplete#sources#clang#libclang_path = '/usr/lib/llvm-default/lib/libclang.so.1' +let g:deoplete#sources#clang#clang_header = '/usr/lib/llvm-default/lib/clang/default/include' let g:gitgutter_highlight_lines = 1 let g:gitgutter_highlight_linenrs = 1 let g:goyo_width = 120 let g:startify_fortune_use_unicode = 1 let g:startify_session_autoload = 1 let g:startify_session_persistence = 1 +call deoplete#custom#var('omni', 'functions', {'lua': 'xolox#lua#omnifunc',}) set encoding=utf-8 set icon set smartcase set spelllang=de,en set shiftwidth=4 set tabstop=4 -set linebreak -set breakindent -" set colorcolumn=75 +set colorcolumn=75 highlight ColorColumn guibg=Black ctermbg=0 set wrap set number @@ -94,6 +94,7 @@ set foldlevelstart=1 set listchars=eol:¶,tab:\»\ ,trail:~,extends:>,precedes:<,nbsp:+ set list set updatetime=750 +set tags+=$HOME/.cache/cpp_tags " Fast split/window navigation with noremap @@ -117,6 +118,7 @@ nnoremap za onoremap za vnoremap zf map :NERDTreeToggle +map :TagbarToggle nnoremap b :BlamerToggle nnoremap g :Goyo nnoremap l :Limelight!!