git and colorscheme

lua/user/colorscheme.lua

@@ -1,6 +1,6 @@
 vim.cmd [[
 try
-  colorscheme gruvbox-material 
+  colorscheme oxocarbon
 catch /^Vim\%((\a\+)\)\=:E185/
   colorscheme default
   set background=dark

lua/user/lsp/configs.lua

@@ -5,7 +5,7 @@ end
 
 local lspconfig = require("lspconfig")
 
-local servers = { "jsonls", "sumneko_lua" }
+local servers = { "jsonls", "sumneko_lua" , "pyright"}
 
 lsp_installer.setup({
 	ensure_installed = servers,

lua/user/lsp/null-ls.lua

@@ -16,7 +16,7 @@ null_ls.setup({
 		formatting.prettier.with({ extra_args = { "--no-semi", "--single-quote", "--jsx-single-quote" } }),
 		formatting.black.with({ extra_args = { "--fast" } }),
 		formatting.stylua,
-        diagnostics.flake8,
+        --diagnostics.flake8,
         diagnostics.cppcheck,
         code_actions.refactoring
 	},

lua/user/options.lua

@@ -19,12 +19,12 @@ local options = {
   updatetime = 300,                        -- faster completion (4000ms default)
   writebackup = false,                     -- if a file is being edited by another program (or was written to file while editing with another program), it is not allowed to be edited
   expandtab = true,                        -- convert tabs to spaces
-  shiftwidth = 2,                          -- the number of spaces inserted for each indentation
+  shiftwidth = 4,                          -- the number of spaces inserted for each indentation
   tabstop = 4,                             -- insert 2 spaces for a tab
   number = true,                           -- set numbered lines
   relativenumber = true,                  -- set relative numbered lines
   numberwidth = 4,                         -- set number column width to 2 {default 4}
-  wrap = false,                            -- display lines as one long line
+  wrap = true,                            -- display lines as one long line
   scrolloff = 12,                           -- is one of my fav
   sidescrolloff = 8,
 }

lua/user/plugins.lua

@@ -33,49 +33,49 @@ end
 
 return packer.startup(function(use)
  
-  -- General Libs
-  use "wbthomason/packer.nvim" -- Have packer manage itself
-  use "nvim-lua/popup.nvim" -- Popup API of vim in Neovim
-  use "nvim-lua/plenary.nvim" -- Lua lib required by other plugins
+    -- General Libs
+    use "wbthomason/packer.nvim" -- Have packer manage itself
+    use "nvim-lua/popup.nvim" -- Popup API of vim in Neovim
+    use "nvim-lua/plenary.nvim" -- Lua lib required by other plugins
+    -- Colorschemes
+    use "sainnhe/gruvbox-material"
+    use {'shaunsingh/oxocarbon.nvim', run = './install.sh'}
     
-  -- Colorschemes
-  use "sainnhe/gruvbox-material"
+    --cmp plugins
+    use "hrsh7th/nvim-cmp" -- The completion plugin
+    use "hrsh7th/cmp-buffer" -- buffer completions
+    use "hrsh7th/cmp-path" -- path completions
+    use "saadparwaiz1/cmp_luasnip" -- snippet completions
+    use "hrsh7th/cmp-nvim-lsp"
+    use "hrsh7th/cmp-nvim-lua"
     
-  --cmp plugins
-  use "hrsh7th/nvim-cmp" -- The completion plugin
-  use "hrsh7th/cmp-buffer" -- buffer completions
-  use "hrsh7th/cmp-path" -- path completions
-  use "saadparwaiz1/cmp_luasnip" -- snippet completions
-  use "hrsh7th/cmp-nvim-lsp"
-  use "hrsh7th/cmp-nvim-lua"
+    -- snippets
+    use "L3MON4D3/LuaSnip" --snippet engine
+    use "rafamadriz/friendly-snippets" -- a bunch of snippets to use
     
-  -- snippets
-  use "L3MON4D3/LuaSnip" --snippet engine
-  use "rafamadriz/friendly-snippets" -- a bunch of snippets to use
+    -- LSP 
+    use "neovim/nvim-lspconfig" -- enable LSP
+    use "williamboman/nvim-lsp-installer" -- simple to use language server installer
+    use "jose-elias-alvarez/null-ls.nvim" -- for formatters and linters
     
-  -- LSP 
-  use "neovim/nvim-lspconfig" -- enable LSP
-  use "williamboman/nvim-lsp-installer" -- simple to use language server installer
-  use "jose-elias-alvarez/null-ls.nvim" -- for formatters and linters
+    -- Telescope
+    use "nvim-telescope/telescope.nvim"
     
-  -- Telescope
-  use "nvim-telescope/telescope.nvim"
+    -- TreeSitter
+    use { "nvim-treesitter/nvim-treesitter" , run = "TSUpdate",}
     
-  -- TreeSitter
-  use { "nvim-treesitter/nvim-treesitter" , run = "TSUpdate",}
+    -- Git Stuff
+    use "lewis6991/gitsigns.nvim"
+    use "f-person/git-blame.nvim"
+    use "tpope/vim-fugitive"
+    -- nvim-tree 
+    use "kyazdani42/nvim-tree.lua"
     
-  -- Git Stuff
-  use "lewis6991/gitsigns.nvim"
+    -- toggleterm
+    use "akinsho/toggleterm.nvim"
     
-
-  -- nvim-tree 
-  use "kyazdani42/nvim-tree.lua"
-
-  -- toggleterm
-  use "akinsho/toggleterm.nvim"
-
-  -- lualine
-  use "nvim-lualine/lualine.nvim"
+    -- lualine
+    use "nvim-lualine/lualine.nvim"
 
   if PACKER_BOOTSTRAP then
 		require("packer").sync()