Update

- Add php lang
- Add lazygit conf
- Reconf icons
- Try fix

configs/lazygit/config.yml

@@ -0,0 +1,3 @@
+git:
+  pull:
+    mode: 'rebase' # one of 'auto' | 'merge' | 'rebase' | 'ff-only', auto reads from git configuration

configs/nvim/lua/helpers.lua

@@ -2,6 +2,7 @@ local cmd = vim.cmd                     -- to execute Vim commands e.g. cmd('pwd
 local fn = vim.fn                       -- to call Vim functions e.g. fn.bufnr()
 local g = vim.g                         -- a table to access global variables
 local opt = vim.opt                     -- to set options
+local o = vim.o                         -- to set options
 
 local function map(mode, lhs, rhs, opts)
   local options = {noremap = true}
@@ -32,6 +33,7 @@ function get_helpers()
         fn = fn,
         g = g,
         opt = opt,
+        o = o,
         dump = dump,
         call_with_helpers = call_with_helpers,
     }

configs/nvim/lua/options.lua

@@ -14,7 +14,7 @@ local function init()
     opt.shiftwidth = 2                  -- Size of an indent
     opt.sidescrolloff = 8               -- Columns of context
     opt.smartcase = true                -- Do not ignore case with capitals
-    opt.smartindent = true              -- Insert indents automatically
+    opt.autoindent = true               -- Insert indents automatically
     opt.splitbelow = true               -- Put new windows below current
     opt.splitright = true               -- Put new windows right of current
     opt.tabstop = 2                     -- Number of spaces tabs count for

configs/nvim/lua/plugins/init.lua

@@ -2,6 +2,7 @@ function configure_packages()
     call_with_helpers(require('plugins.lspconfig').init)
     call_with_helpers(require('plugins.compe').init)
     call_with_helpers(require('plugins.nvim-treesitter').init)
+    call_with_helpers(require('plugins.web-devicons').init)
 end
 
 function install_packages()

configs/nvim/lua/plugins/lspconfig/init.lua

@@ -3,6 +3,7 @@ local function init()
     call_with_helpers(require('plugins.lspconfig.rust').init)
     call_with_helpers(require('plugins.lspconfig.typescript').init)
     call_with_helpers(require('plugins.lspconfig.ruby').init)
+    call_with_helpers(require('plugins.lspconfig.php').init)
 end
 
 return {

configs/nvim/lua/plugins/lspconfig/php.lua

@@ -0,0 +1,7 @@
+local function init()
+    require'lspconfig'.phpactor.setup{}
+end
+
+return {
+    init = init
+}

configs/nvim/lua/plugins/web-devicons.lua

@@ -0,0 +1,12 @@
+local function init()
+    require'nvim-web-devicons'.setup {
+        -- globally enable default icons (default to false)
+        -- will get overriden by `get_icons` option
+        default = true;
+    }
+    require'nvim-web-devicons'.get_icons()
+end
+
+return {
+    init = init
+}