From 9b1953e4ab1590ae44c128b02e36a60eae56e630 Mon Sep 17 00:00:00 2001
From: Steffen Rademacker <kontakt@webgefrickel.de>
Date: Thu, 23 Dec 2021 13:42:10 +0100
Subject: [PATCH] Fixes and diffview

---
 install/5_webdev.sh   |  5 ----
 install/6_software.sh |  3 +--
 nvim/lua/plugins.lua  | 53 +++++++++++++++++++++++++++----------------
 3 files changed, 34 insertions(+), 27 deletions(-)

diff --git a/install/5_webdev.sh b/install/5_webdev.sh
index 6276a71..03adcd0 100755
--- a/install/5_webdev.sh
+++ b/install/5_webdev.sh
@@ -10,11 +10,6 @@ brew install nss
 brew install php@7.4
 brew install php
 
-# phpactor etc.
-take ~/phpactor
-git clone git@github.com:phpactor/phpactor .
-composer install
-
 # link etc-configs
 sudo rm -rf /opt/homebrew/etc/php
 sudo rm -rf /opt/homebrew/etc/httpd
diff --git a/install/6_software.sh b/install/6_software.sh
index 7057872..ddfee15 100755
--- a/install/6_software.sh
+++ b/install/6_software.sh
@@ -44,8 +44,7 @@ brew install --cask ubiquiti-unifi-controller
 # Tell unifi-controller to use brew-installed java
 sudo ln -s /Library/Java/JavaVirtualMachines/temurin-8.jdk /Applications/UniFi.app/Contents/PlugIns/temurin-8.jdk
 sudo v /Applications/UniFi.app/Contents/Info.plist
-
-# THEN add this: <key>JVMRuntime</key> <string>temurin8-8.jdk</string>
+# THEN add this: <key>JVMRuntime</key> <string>temurin-8.jdk</string>
 
 # firefox-extensions: 
 # surfingkeys, dark reader, privacy badger, ublock origin, wikiwand,
diff --git a/nvim/lua/plugins.lua b/nvim/lua/plugins.lua
index c059edd..ef013f3 100644
--- a/nvim/lua/plugins.lua
+++ b/nvim/lua/plugins.lua
@@ -19,23 +19,30 @@ return require('packer').startup(function(use)
   use 'wbthomason/packer.nvim'
 
   -- general plugins (without any config or dependencies)
-  -- some will be used by via custom mappings
+  -- some will be used by via custom mappings, most of those are non-lua
+  -- oldschool vimscript plugins, that still provide a lot of value
   use 'christoomey/vim-tmux-navigator'
   use 'editorconfig/editorconfig-vim'
-  use 'nvim-treesitter/nvim-treesitter-textobjects'
   use 'tpope/vim-apathy'
   use 'tpope/vim-fugitive' -- replace with? sindrets/diffview.nvim
-  use 'tpope/vim-ragtag'
+  use 'tpope/vim-ragtag' -- debate if we still need the next tpope-plugins
   use 'tpope/vim-repeat'
   use 'tpope/vim-surround'
   use 'tpope/vim-unimpaired'
   use 'wellle/targets.vim'
   use 'wincent/terminus'
 
-  -- plugins without other dependencies
-  use { 'neovim/nvim-lspconfig', config = get_config('lspconfig') }
-  use { 'voldikss/vim-floaterm', config = get_config('floaterm') }
-  use { 'windwp/nvim-autopairs', config = get_config('autopairs') }
+  -- floating-terminal integration for nnn, lazygit etc.
+  use {
+    'voldikss/vim-floaterm',
+    config = get_config('floaterm')
+  }
+
+  -- autopairs for sensible () "" ''
+  use {
+    'windwp/nvim-autopairs',
+    config = get_config('autopairs')
+  }
 
   -- colorizer for nice css-colors
   use {
@@ -44,12 +51,13 @@ return require('packer').startup(function(use)
     config = get_config('colorizer'),
   }
 
-  -- Treesitter
+  -- Treesitter for nicer syntax-highlighting
   use {
     'nvim-treesitter/nvim-treesitter',
     config = get_config('treesitter'),
     run = ":TSUpdate",
   }
+  use 'nvim-treesitter/nvim-treesitter-textobjects'
 
   -- fzf integration
   use {
@@ -60,21 +68,18 @@ return require('packer').startup(function(use)
     },
   }
 
-  -- null-ls for diagnostics and formatting
+  -- lsp and null-ls for diagnostics and formatting (eslint_d, stylelint etc.)
+  use {
+    'neovim/nvim-lspconfig',
+    config = get_config('lspconfig')
+  }
   use {
     'jose-elias-alvarez/null-ls.nvim',
     config = get_config('null-ls'),
     requires = { 'nvim-lua/plenary.nvim' },
   }
 
-  -- hop for easy navigation
-  use {
-    'phaazon/hop.nvim',
-    config = get_config('hop'),
-    event = "BufReadPre",
-  }
-
-  -- comment
+  -- commenting stuff out
   use {
     "numToStr/Comment.nvim",
     config = get_config("comment")
@@ -90,7 +95,7 @@ return require('packer').startup(function(use)
     },
   }
 
-  -- autocompletion
+  -- autocompletion and snippets
   use {
     'hrsh7th/nvim-cmp',
     config = get_config('cmp'),
@@ -104,8 +109,6 @@ return require('packer').startup(function(use)
       'hrsh7th/cmp-vsnip',
     },
   }
-
-  -- snippets
   use {
     'hrsh7th/vim-vsnip',
     config = get_config('vsnip')
@@ -117,6 +120,13 @@ return require('packer').startup(function(use)
     },
   }
 
+  -- hop for easy navigation
+  use {
+    'phaazon/hop.nvim',
+    config = get_config('hop'),
+    event = "BufReadPre",
+  }
+
   -- colorscheme
   use {
     'ellisonleao/gruvbox.nvim',
@@ -125,6 +135,9 @@ return require('packer').startup(function(use)
     },
   }
 
+  -- giving those a try—lets see how often i will really use them
+  use { 'sindrets/diffview.nvim', requires = 'nvim-lua/plenary.nvim' }
+
   -- automatically set up configuration after cloning packer.nvim
   if packer_bootstrap then
     require('packer').sync()