2
0
mirror of https://github.com/webgefrickel/dotfiles synced 2024-11-15 12:12:58 +00:00

Fixes and diffview

This commit is contained in:
Steffen Rademacker 2021-12-23 13:42:10 +01:00
parent 16b90b9f4e
commit 9b1953e4ab
3 changed files with 34 additions and 27 deletions

View File

@ -10,11 +10,6 @@ brew install nss
brew install php@7.4 brew install php@7.4
brew install php brew install php
# phpactor etc.
take ~/phpactor
git clone git@github.com:phpactor/phpactor .
composer install
# link etc-configs # link etc-configs
sudo rm -rf /opt/homebrew/etc/php sudo rm -rf /opt/homebrew/etc/php
sudo rm -rf /opt/homebrew/etc/httpd sudo rm -rf /opt/homebrew/etc/httpd

View File

@ -44,8 +44,7 @@ brew install --cask ubiquiti-unifi-controller
# Tell unifi-controller to use brew-installed java # 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 ln -s /Library/Java/JavaVirtualMachines/temurin-8.jdk /Applications/UniFi.app/Contents/PlugIns/temurin-8.jdk
sudo v /Applications/UniFi.app/Contents/Info.plist sudo v /Applications/UniFi.app/Contents/Info.plist
# THEN add this: <key>JVMRuntime</key> <string>temurin-8.jdk</string>
# THEN add this: <key>JVMRuntime</key> <string>temurin8-8.jdk</string>
# firefox-extensions: # firefox-extensions:
# surfingkeys, dark reader, privacy badger, ublock origin, wikiwand, # surfingkeys, dark reader, privacy badger, ublock origin, wikiwand,

View File

@ -19,23 +19,30 @@ return require('packer').startup(function(use)
use 'wbthomason/packer.nvim' use 'wbthomason/packer.nvim'
-- general plugins (without any config or dependencies) -- 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 'christoomey/vim-tmux-navigator'
use 'editorconfig/editorconfig-vim' use 'editorconfig/editorconfig-vim'
use 'nvim-treesitter/nvim-treesitter-textobjects'
use 'tpope/vim-apathy' use 'tpope/vim-apathy'
use 'tpope/vim-fugitive' -- replace with? sindrets/diffview.nvim 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-repeat'
use 'tpope/vim-surround' use 'tpope/vim-surround'
use 'tpope/vim-unimpaired' use 'tpope/vim-unimpaired'
use 'wellle/targets.vim' use 'wellle/targets.vim'
use 'wincent/terminus' use 'wincent/terminus'
-- plugins without other dependencies -- floating-terminal integration for nnn, lazygit etc.
use { 'neovim/nvim-lspconfig', config = get_config('lspconfig') } use {
use { 'voldikss/vim-floaterm', config = get_config('floaterm') } 'voldikss/vim-floaterm',
use { 'windwp/nvim-autopairs', config = get_config('autopairs') } config = get_config('floaterm')
}
-- autopairs for sensible () "" ''
use {
'windwp/nvim-autopairs',
config = get_config('autopairs')
}
-- colorizer for nice css-colors -- colorizer for nice css-colors
use { use {
@ -44,12 +51,13 @@ return require('packer').startup(function(use)
config = get_config('colorizer'), config = get_config('colorizer'),
} }
-- Treesitter -- Treesitter for nicer syntax-highlighting
use { use {
'nvim-treesitter/nvim-treesitter', 'nvim-treesitter/nvim-treesitter',
config = get_config('treesitter'), config = get_config('treesitter'),
run = ":TSUpdate", run = ":TSUpdate",
} }
use 'nvim-treesitter/nvim-treesitter-textobjects'
-- fzf integration -- fzf integration
use { 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 { use {
'jose-elias-alvarez/null-ls.nvim', 'jose-elias-alvarez/null-ls.nvim',
config = get_config('null-ls'), config = get_config('null-ls'),
requires = { 'nvim-lua/plenary.nvim' }, requires = { 'nvim-lua/plenary.nvim' },
} }
-- hop for easy navigation -- commenting stuff out
use {
'phaazon/hop.nvim',
config = get_config('hop'),
event = "BufReadPre",
}
-- comment
use { use {
"numToStr/Comment.nvim", "numToStr/Comment.nvim",
config = get_config("comment") config = get_config("comment")
@ -90,7 +95,7 @@ return require('packer').startup(function(use)
}, },
} }
-- autocompletion -- autocompletion and snippets
use { use {
'hrsh7th/nvim-cmp', 'hrsh7th/nvim-cmp',
config = get_config('cmp'), config = get_config('cmp'),
@ -104,8 +109,6 @@ return require('packer').startup(function(use)
'hrsh7th/cmp-vsnip', 'hrsh7th/cmp-vsnip',
}, },
} }
-- snippets
use { use {
'hrsh7th/vim-vsnip', 'hrsh7th/vim-vsnip',
config = get_config('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 -- colorscheme
use { use {
'ellisonleao/gruvbox.nvim', '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 -- automatically set up configuration after cloning packer.nvim
if packer_bootstrap then if packer_bootstrap then
require('packer').sync() require('packer').sync()