lua/user/lsp/mason.lua

@@ -54,3 +54,38 @@ for _, server in pairs(servers) do
 
 	lspconfig[server].setup(opts)
 end
+
+local mason_nvim_dap_ok, mason_nvim_dap = pcall(require, "mason-nvim-dap")
+if mason_nvim_dap_ok then
+    local dap = require('dap')
+	mason_nvim_dap.setup({
+		automatic_setup = true,
+	})
+	mason_nvim_dap.setup_handlers({
+		function(source_name)
+			-- all sources with no handler get passed here
+
+			-- Keep original functionality of `automatic_setup = true`
+			require("mason-nvim-dap.automatic_setup")(source_name)
+		end,
+		python = function(source_name)
+			dap.adapters.python = {
+				type = "executable",
+				command = "/usr/bin/python3",
+				args = {
+					"-m",
+					"debugpy.adapter",
+				},
+			}
+
+			dap.configurations.python = {
+				{
+					type = "python",
+					request = "launch",
+					name = "Launch file",
+					program = "${file}", -- This configuration will launch the current file if used.
+				},
+			}
+		end,
+	})
+end

lua/user/lualine.lua

@@ -12,30 +12,30 @@ local diagnostics = {
   sources = { "nvim_diagnostic" },
   sections = { "error", "warn" },
   symbols = { error = " ", warn = " " },
-  colored = true,
+  colored = false,
   always_visible = true,
 }
 
 local diff = {
   "diff",
-  colored = true,
+  colored = false,
-  symbols = { added = " ", modified = " ", removed = " " }, -- changes diff symbols
+  symbols = { added = "", modified = "", removed = "" }, -- changes diff symbols
   cond = hide_in_width,
 }
 
 local filetype = {
   "filetype",
-  icons_enabled = true,
+  icons_enabled = false,
 }
 
 local location = {
   "location",
-  padding = { right = 1 },
+  padding = 0,
 }
 
--- local spaces = function()
+local spaces = function()
---   return "spaces: " .. vim.api.nvim_buf_get_option(0, "shiftwidth")
+  return "spaces: " .. vim.api.nvim_buf_get_option(0, "shiftwidth")
--- end
+end
 
 lualine.setup {
   options = {
@@ -51,7 +51,7 @@ lualine.setup {
     lualine_a = { "mode" },
     lualine_b = {"branch"},
     lualine_c = { diagnostics },
-    lualine_x = { diff, filetype },
+    lualine_x = { diff, spaces, "encoding", filetype },
     lualine_y = { location },
     lualine_z = { "progress" },
   },

lua/user/plugins.lua

@@ -53,7 +53,7 @@ return packer.startup(function(use)
 	use({ "kyazdani42/nvim-tree.lua", commit = "7282f7de8aedf861fe0162a559fc2b214383c51c" })
 	use({ "akinsho/bufferline.nvim", commit = "83bf4dc7bff642e145c8b4547aa596803a8b4dc4" })
 	use({ "moll/vim-bbye", commit = "25ef93ac5a87526111f43e5110675032dbcacf56" })
-	use({ "nvim-lualine/lualine.nvim" })
+	use({ "nvim-lualine/lualine.nvim", commit = "a52f078026b27694d2290e34efa61a6e4a690621" })
 	use({ "akinsho/toggleterm.nvim", commit = "2a787c426ef00cb3488c11b14f5dcf892bbd0bda" })
 	use({ "ahmedkhalf/project.nvim", commit = "628de7e433dd503e782831fe150bb750e56e55d6" })
 	use({ "lewis6991/impatient.nvim", commit = "b842e16ecc1a700f62adb9802f8355b99b52a5a6" })
@@ -91,9 +91,11 @@ return packer.startup(function(use)
 	-- Treesitter
 	use({
 		"nvim-treesitter/nvim-treesitter",
+		commit = "1942f3554184e9d9dfb90dcc6542047b8f6511f2",
 	})
 	use({
 		"nvim-treesitter/nvim-treesitter-context",
+		commit = "0dd5eae6dbf226107da2c2041ffbb695d9e267c1",
 	})
 
 	-- Git
@@ -120,8 +122,6 @@ return packer.startup(function(use)
 
 	use({ "mbbill/undotree" })
 
-    use({ "folke/trouble.nvim" })
-
 	-- Automatically set up your configuration after cloning packer.nvim
 	-- Put this at the end after all plugins
 	if PACKER_BOOTSTRAP then