nvim, php

dot_config/nvim/init.lua

@@ -17,6 +17,7 @@ require('packer').startup(function(use)
   use {'hrsh7th/cmp-nvim-lua', requires={'hrsh7th/nvim-cmp'}}
   use 'hrsh7th/vim-vsnip'
   use {'hrsh7th/cmp-vsnip', requires={'hrsh7th/nvim-cmp', 'hrsh7th/vim-vsnip'}}
+  use {'onsails/lspkind.nvim'}
   use 'simrat39/symbols-outline.nvim'
 
   use { 'jose-elias-alvarez/null-ls.nvim', requires = { "nvim-lua/plenary.nvim" }}
@@ -148,12 +149,11 @@ local on_attach = function(client, bufnr)
   buf_set_keymap('n', '<space>ca', '<cmd>lua vim.lsp.buf.code_action()<CR>', opts)
   buf_set_keymap('v', '<space>ca', '<cmd>lua vim.lsp.buf.range_code_action()<CR>', opts)
   buf_set_keymap('n', 'gr', '<cmd>lua vim.lsp.buf.references()<CR>', opts)
-  buf_set_keymap('n', '<space>e', '<cmd>lua vim.show_line_diagnostics()<CR>', opts)
   buf_set_keymap('n', '[d', '<cmd>lua vim.diagnostic.goto_prev()<CR>', opts)
   buf_set_keymap('n', ']d', '<cmd>lua vim.diagnostic.goto_next()<CR>', opts)
   buf_set_keymap('n', '<space>q', '<cmd>lua vim.diagnostic.setloclist()<CR>', opts)
-  buf_set_keymap("n", "<space>f", "<cmd>lua vim.lsp.buf.formatting()<CR>", opts)
+  buf_set_keymap("n", "<space>gf", "<cmd>lua vim.lsp.buf.formatting()<CR>", opts)
-  buf_set_keymap("v", "<space>f", "<cmd>lua vim.lsp.buf.range_formatting()<CR>", opts)
+  buf_set_keymap("v", "<space>gf", "<cmd>lua vim.lsp.buf.range_formatting()<CR>", opts)
 end
 
 -- Use a loop to conveniently both setup defined servers 
@@ -193,16 +193,9 @@ cmp.setup({
     { name = 'path' },
   },
   formatting = {
-    format = function(entry, vim_item)
+    format = require'lspkind'.cmp_format({
-      -- set a name for each source
+            -- mode = 'symbol',
-      vim_item.menu = ({
+        }),
-        buffer = "[Buffer]",
-        nvim_lsp = "[LSP]",
-        nvim_lua = "[Lua]",
-        path = "[Path]"
-      })[entry.source.name]
-      return vim_item
-    end,
   },
   window = {
     -- completion = cmp.config.window.bordered(),
@@ -288,7 +281,9 @@ vim.api.nvim_set_keymap('n', '<F4>',  [[<Cmd>NvimTreeFindFile<CR>]], { noremap =
 -- }}} NvimTree
 
 -- Telescope {{{
-vim.api.nvim_set_keymap('n', '<C-Space>',  [[<Cmd>Telescope buffers<CR>]], { noremap = true, silent = true })
+vim.api.nvim_set_keymap('n', '<Space>b',  [[<Cmd>Telescope buffers<CR>]], { noremap = true, silent = true })
+vim.api.nvim_set_keymap('n', '<Space>f',  [[<Cmd>Telescope fd<CR>]], { noremap = true, silent = true })
+vim.api.nvim_set_keymap('n', '<Space>T',  [[<Cmd>Telescope<CR>]], { noremap = true, silent = true })
 
 require("telescope").setup {
   defaults = {
@@ -322,6 +317,8 @@ n = {
   }
 }
 
+--[[ local telescope_ag = vim.api.nvim_create_augroup('Telescope')
+nvim.nvim_create_autocmd('FileType', { pattern='TelescopePrompt', command = nvim.nvim_buf_set_keymap('n', '' ]]
 vim.cmd 'augroup Telescope'
 vim.cmd 'autocmd FileType TelescopePrompt inoremap <buffer> <C-b> <cmd>Telescope buffers initial_mode=insert<cr>'
 vim.cmd 'autocmd FileType TelescopePrompt inoremap <buffer> <C-f> <cmd>Telescope fd initial_mode=insert<cr>'
@@ -343,9 +340,9 @@ require'nvim-treesitter.configs'.setup {
     enable = true,
     keymaps = {
       init_selection = "gnn",
-      node_incremental = "grn",
+      node_incremental = "+",
       scope_incremental = "grc",
-      node_decremental = "grm",
+      node_decremental = "-",
     },
   },
   indent = {

dot_config/php/74/fpm/php-fpm.conf.tmpl

@@ -1,5 +1,5 @@
 [global]
-error_log = /proc/self/fd/2
+error_log = /tmp/php74.log
 daemonize = no
 
 [www]
@@ -13,7 +13,7 @@ pm.max_spare_servers = 3
 
 pm.status_path = /fpm-status
 
-access.log = /proc/self/fd/2
+access.log = /tmp/php74.access.log
 access.format = "%R - %u %t \"%m %r\" %s %d"
 request_terminate_timeout = 0
 
@@ -22,5 +22,5 @@ catch_workers_output = yes
 php_admin_value[error_log] = /dev/stderr
 ;php_admin_flag[log_errors] = on
 ;php_admin_value[memory_limit] = 32M
-php_admin_value[sendmail_path] = {{.chezmoi.homeDir}}/bin/pipemail
+php_admin_value[sendmail_path] = {{ .chezmoi.homeDir }}/bin/pipemail
-php_admin_value[sys_temp_dir] = {{.chezmoi.homeDir}}/jopixel/webserver/temp
+php_admin_value[sys_temp_dir] = {{ .chezmoi.homeDir }}/jopixel/webserver/temp

dot_config/php/74/php.ini.tmpl

@@ -890,7 +890,7 @@ default_socket_timeout = 60
 
 extension=openssl.so
 extension=mysqlnd.so
-zend_extension=opcache.so
+#zend_extension=opcache.so
 extension=pdo.so
 extension=json.so
 extension=xml.so
@@ -925,7 +925,7 @@ extension=zip.so
 extension=imagick.so
 zend_extension=xdebug.so
 
-extension=mailparse.so
+#extension=mailparse.so
 
 ;;;;;;;;;;;;;;;;;;;
 ; Module Settings ;
@@ -1065,7 +1065,7 @@ smtp_port = 25
 
 ; For Unix only.  You may supply arguments as well (default: "sendmail -t -i").
 ; http://php.net/sendmail-path
-sendmail_path = {{.chezmoi.homeDir}}/bin/pipemail
+sendmail_path = {{ .chezmoi.homeDir }}/bin/pipemail
 
 ; Force the addition of the specified parameters to be passed as extra parameters
 ; to the sendmail binary. These parameters will always replace the value of
@@ -1327,7 +1327,7 @@ session.save_handler = files
 ; where MODE is the octal representation of the mode. Note that this
 ; does not overwrite the process's umask.
 ; http://php.net/session.save-path
-session.save_path = "{{.chezmoi.homeDir}}/jopixel/webserver/sessions"
+session.save_path = "{{ .chezmoi.homeDir }}/jopixel/webserver/sessions"
 
 ; Whether to use strict session mode.
 ; Strict session mode does not accept an uninitialized session ID, and