Merge branch 'master' of https://git.freiewildbahn.de/oli/nvim

lua/plugins/dap.lua

@@ -131,7 +131,7 @@ return {
 
       local jsonVenv = getVenvFromJson(cwd .. '/pyrightconfig.json')
       if jsonVenv ~= nil then
-        return jsonVenv
+        return jsonVenv .. '/' .. getVenvSuffix()
       end
 
       if vim.fn.executable(cwd .. '/venv/' .. getVenvSuffix()) == 1 then

lua/plugins/lspconfig.lua

@@ -236,7 +236,7 @@ return {
     local lua_rtp = vim.split(package.path, ';')
     table.insert(lua_rtp, 'lua/?.lua')
     table.insert(lua_rtp, 'lua/?/init.lua')
-    lspconfig.sumneko_lua.setup {
+    lspconfig.lua_ls.setup {
       capabilities = capabilities,
       on_attach = on_attach,
       settings = {

lua/plugins/lualine.lua

@@ -1,29 +1,86 @@
 return {
-  'hoob3rt/lualine.nvim',
+  'nvim-lualine/lualine.nvim',
   dependencies = { 'kyazdani42/nvim-web-devicons' },
   config = {
     options = {
-      theme = 'gruvbox-material',
+      theme = 'material',
       disabled_filetypes = {
         statusline = {},
         winbar = { 'dap-repl', 'dapui_console' },
       },
     },
-    sections = { lualine_c = { 'getcwd', { 'filename', path = 1, file_status = true } } },
-    inactive_sections = { lualine_c = { 'getcwd', { 'filename', path = 1, file_status = true } } },
+    extensions = { 'aerial' },
+    sections = {
+      lualine_b = {
+        'branch',
+        'diff',
+        {
+          'diagnostics',
+          sources = { 'nvim_diagnostic', 'nvim_lsp' }
+        }
+      },
+      lualine_c = {
+        'hostname',
+        'getcwd',
+        { 'filename', path = 1, file_status = true }
+      },
+      lualine_y = {
+        'searchcount',
+        'progress'
+      },
+    },
+    inactive_sections = {
+      lualine_c = { 'getcwd', { 'filename', path = 1, file_status = true } }
+    },
     globalstatus = true,
     winbar = {
       lualine_a = {},
       lualine_b = {},
-      lualine_c = { { 'filename', path = 1, file_status = true } },
-      lualine_x = {},
+      lualine_c = {
+        {
+          'filename',
+          path = 0,
+          file_status = true,
+          separator = { left = '', right = '' },
+          -- color = { fg = '#ffaa88', bg = 'grey', gui = 'italic,bold' }
+          color = { bg = '#aa0000', gui = 'bold' }
+        }
+      },
+      lualine_x = { 'aerial' },
       lualine_y = {},
       lualine_z = {}
     },
     inactive_winbar = {
       lualine_a = {},
       lualine_b = {},
-      lualine_c = { { 'filename', path = 1, file_status = true } },
+      lualine_c = {
+        {
+          'filename',
+          path = 0,
+          file_status = true,
+          separator = { left = '', right = '' },
+          -- color = { fg = '#ffaa88', bg = 'grey', gui = 'italic,bold' }
+          -- color = { fg = '#ff1111'}
+        }
+      },
+      lualine_x = { 'aerial' },
+      lualine_y = {},
+      lualine_z = {}
+    },
+    tabline = {
+      lualine_a = {},
+      lualine_b = {},
+      lualine_c = {
+        {
+          'tabs',
+          mode = 2,
+          tabs_color = {
+            -- Same values as the general color option can be used here.
+            active = 'lualine_a_normal', -- Color for active tab.
+            inactive = 'lualine_a_inactive', -- Color for inactive tab.
+          },
+        }
+      },
       lualine_x = {},
       lualine_y = {},
       lualine_z = {}