diff --git a/.config/nvim/ftplugin/cpp.lua b/.config/nvim/ftplugin/cpp.lua new file mode 100644 index 0000000..21934e4 --- /dev/null +++ b/.config/nvim/ftplugin/cpp.lua @@ -0,0 +1 @@ +vim.bo.expandtab = true diff --git a/.config/nvim/ftplugin/cpp.vim b/.config/nvim/ftplugin/cpp.vim deleted file mode 100644 index 0714c3e..0000000 --- a/.config/nvim/ftplugin/cpp.vim +++ /dev/null @@ -1 +0,0 @@ -setlocal et diff --git a/.config/nvim/ftplugin/css.lua b/.config/nvim/ftplugin/css.lua new file mode 100644 index 0000000..3b57b0b --- /dev/null +++ b/.config/nvim/ftplugin/css.lua @@ -0,0 +1,3 @@ +vim.bo.expandtab = true +vim.bo.tabstop = 2 +vim.bo.shiftwidth = 2 diff --git a/.config/nvim/ftplugin/css.vim b/.config/nvim/ftplugin/css.vim deleted file mode 100644 index 7df8467..0000000 --- a/.config/nvim/ftplugin/css.vim +++ /dev/null @@ -1,4 +0,0 @@ -setlocal et -setlocal ts=2 -setlocal sts=2 -setlocal sw=2 diff --git a/.config/nvim/ftplugin/javascript.lua b/.config/nvim/ftplugin/javascript.lua new file mode 100644 index 0000000..3b57b0b --- /dev/null +++ b/.config/nvim/ftplugin/javascript.lua @@ -0,0 +1,3 @@ +vim.bo.expandtab = true +vim.bo.tabstop = 2 +vim.bo.shiftwidth = 2 diff --git a/.config/nvim/ftplugin/javascript.vim b/.config/nvim/ftplugin/javascript.vim deleted file mode 100644 index 7df8467..0000000 --- a/.config/nvim/ftplugin/javascript.vim +++ /dev/null @@ -1,4 +0,0 @@ -setlocal et -setlocal ts=2 -setlocal sts=2 -setlocal sw=2 diff --git a/.config/nvim/ftplugin/less.lua b/.config/nvim/ftplugin/less.lua new file mode 100644 index 0000000..3b57b0b --- /dev/null +++ b/.config/nvim/ftplugin/less.lua @@ -0,0 +1,3 @@ +vim.bo.expandtab = true +vim.bo.tabstop = 2 +vim.bo.shiftwidth = 2 diff --git a/.config/nvim/ftplugin/less.vim b/.config/nvim/ftplugin/less.vim deleted file mode 100644 index 7df8467..0000000 --- a/.config/nvim/ftplugin/less.vim +++ /dev/null @@ -1,4 +0,0 @@ -setlocal et -setlocal ts=2 -setlocal sts=2 -setlocal sw=2 diff --git a/.config/nvim/ftplugin/ruby.lua b/.config/nvim/ftplugin/ruby.lua new file mode 100644 index 0000000..3b57b0b --- /dev/null +++ b/.config/nvim/ftplugin/ruby.lua @@ -0,0 +1,3 @@ +vim.bo.expandtab = true +vim.bo.tabstop = 2 +vim.bo.shiftwidth = 2 diff --git a/.config/nvim/ftplugin/ruby.vim b/.config/nvim/ftplugin/ruby.vim deleted file mode 100644 index c0899ea..0000000 --- a/.config/nvim/ftplugin/ruby.vim +++ /dev/null @@ -1,3 +0,0 @@ -setlocal expandtab -setlocal tabstop=2 -setlocal shiftwidth=2 diff --git a/.config/nvim/ftplugin/vue.lua b/.config/nvim/ftplugin/vue.lua new file mode 100644 index 0000000..3b57b0b --- /dev/null +++ b/.config/nvim/ftplugin/vue.lua @@ -0,0 +1,3 @@ +vim.bo.expandtab = true +vim.bo.tabstop = 2 +vim.bo.shiftwidth = 2 diff --git a/.config/nvim/ftplugin/vue.vim b/.config/nvim/ftplugin/vue.vim deleted file mode 100644 index 7df8467..0000000 --- a/.config/nvim/ftplugin/vue.vim +++ /dev/null @@ -1,4 +0,0 @@ -setlocal et -setlocal ts=2 -setlocal sts=2 -setlocal sw=2 diff --git a/.config/nvim/init.vim b/.config/nvim/init.vim index b22992c..1be0ef1 100644 --- a/.config/nvim/init.vim +++ b/.config/nvim/init.vim @@ -83,6 +83,7 @@ require('packer').startup(function() 'nvim-lua/plenary.nvim' } } + use 'vim-vdebug/vdebug' -- nvim-cmp use 'dcampos/nvim-snippy' @@ -93,8 +94,6 @@ require('packer').startup(function() use 'hrsh7th/cmp-buffer' end) -local configuration = read_configuration() - -- -- ALE -- @@ -195,11 +194,11 @@ nvim_lsp['hls'].setup { nvim_lsp['intelephense'].setup { on_attach = default_on_attach, flags = { - debounce_text_changes = 150, + debounce_text_changes = 150 }, init_options = { - licenceKey = configuration.intelephenseKey, - storagePath = '/tmp/intelephense', + licenceKey = os.getenv('HOME') .. '/Documents/Schluessel/intelephense.key', + storagePath = '/tmp/intelephense' }, capabilities = capabilities, settings = { @@ -368,4 +367,9 @@ dap.configurations.cpp = { }, } +-- +-- Vdebug +-- +vim.g.vdebug_options = { port = '9000' } + EOF diff --git a/.config/nvim/lua/lsphelp.lua b/.config/nvim/lua/lsphelp.lua index 77cd586..63db76b 100644 --- a/.config/nvim/lua/lsphelp.lua +++ b/.config/nvim/lua/lsphelp.lua @@ -29,12 +29,3 @@ function default_on_attach(client, bufnr) nnoremap('gr', vim.lsp.buf.references, "Find references") nnoremap('f', function() vim.lsp.buf.format { async = true } end, "Format file") end - -function read_configuration() - local configuration = {} - local chunk, err = loadfile(os.getenv('HOME') .. '/.config/nvim/config', 't', configuration) - if chunk then - chunk() - end - return configuration -end diff --git a/.profile b/.profile index 3f06335..c6bf6b1 100755 --- a/.profile +++ b/.profile @@ -4,7 +4,11 @@ if [ -x /opt/homebrew/bin/brew ] then eval "$(/opt/homebrew/bin/brew shellenv)" - PATH="$HOMEBREW_PREFIX/opt/bison/bin:/usr/local/bin:$PATH" + PATH="/usr/local/bin:$PATH" + for tool in flex bison + do + PATH="$HOMEBREW_PREFIX/opt/$tool/bin:$PATH" + done for tool in libtool coreutils grep gnu-sed findutils make do PATH="$HOMEBREW_PREFIX/opt/$tool/libexec/gnubin:$PATH" @@ -14,11 +18,6 @@ else export SSH_AUTH_SOCK=/run/user/1000/keyring/ssh fi -if [ -d /opt/homebrew/opt/php@8.3 ] -then - PATH="/opt/homebrew/opt/php@8.3/bin:/opt/homebrew/opt/php@8.3/sbin:$PATH" -fi - if [ -d "$HOME/Android/Sdk" ] then export ANDROID_HOME="$HOME/Android/Sdk"