vim config and gruvbox-baby

nvim/lua/config/flit.lua

@@ -0,0 +1,6 @@
+require('flit').setup({
+  keys = { f = 'f', F = 'F', t = 't', T = 'T' },
+  labeled_modes = "v",
+  multiline = true,
+  opts = {}
+})

nvim/lua/config/fzf.lua

@@ -1,19 +0,0 @@
-require('fzf-lua').setup({
-  files = {
-    multiprocess = true,
-  },
-  grep = {
-    multiprocess = true,
-  },
-  git = {
-    files = {
-      multiprocess = true,
-    },
-  },
-  winopts = {
-    width = 0.98,
-    height = 0.89,
-    row = 0.55,
-    col = 0.48,
-  },
-})

nvim/lua/config/leap.lua

@@ -0,0 +1 @@
+require('leap').set_default_keymaps()

nvim/lua/config/telescope.lua

@@ -7,6 +7,11 @@ require('telescope').setup({
       width = 0.9,
       height = 0.9,
     },
+    borderchars = {
+      prompt = { "─", " ", " ", " ", "─", "─", " ", " " },
+      results = { " " },
+      preview = { " " },
+    },
   },
   extensions = {
     fzf = {

nvim/lua/config/vsnip.lua

@@ -2,7 +2,7 @@ local g = vim.g
 
 -- vsnip config
 g.vsnip_snippet_dirs = {
-  os.getenv('HOME') .. '/Dotfiles/nvim/plugged/friendly-snippets/snippets',
+  os.getenv('HOME') .. '/.local/share/nvim/lazy/friendly-snippets/snippets/',
   os.getenv('HOME') .. '/Dotfiles/snippets/',
 }
 g.vsnip_filetypes = {

nvim/lua/options.lua

@@ -49,7 +49,8 @@ set.wildmode = { 'list:longest', 'list:full' }
 -- colorscheme and default language
 set.background = 'dark'
 set.termguicolors = true
-g.gruvbox_italic = 1
 
-cmd 'colorscheme gruvbox'
+-- g.gruvbox_baby_background_color = 'dark'
+g.gruvbox_baby_telescope_theme = 1
+cmd 'colorscheme gruvbox-baby'
 cmd 'language en_US.UTF-8'

nvim/lua/plugins.lua

@@ -24,14 +24,13 @@ vim.g.maplocalleader = ' '
 
 require('lazy').setup({
   -- The colorscheme of choice
-  { 'ellisonleao/gruvbox.nvim', priority = 1000 },
+  { 'luisiacc/gruvbox-baby', priority = 1000 },
 
-  -- modern neovim with treesitter, lsp, null-ls, cmp and vsnip
+  -- core pieces: telescope & fzf/terminal/tmux integration,
-  -- remember to install all those tools since we do not use mason
+  -- completion-engine + snippets
-  -- see ../../install/3_vimux.sh
+  { 'voldikss/vim-floaterm', init = get_config('floaterm') },
-  { 'hrsh7th/vim-vsnip', init = get_config('vsnip') },
+  { 'wincent/terminus' },
-  { 'jose-elias-alvarez/null-ls.nvim', init = get_config('null-ls'), dependencies = { 'nvim-lua/plenary.nvim' } },
+  { 'christoomey/vim-tmux-navigator'},
-  { 'neovim/nvim-lspconfig', init = get_config('lspconfig') },
   {
     'nvim-telescope/telescope.nvim',
     tag = '0.1.1',
@@ -39,8 +38,7 @@ require('lazy').setup({
     dependencies = { 'nvim-lua/plenary.nvim' }
   },
   { 'nvim-telescope/telescope-fzf-native.nvim', build = 'make' },
-  { 'nvim-treesitter/nvim-treesitter', init = get_config('treesitter'), build = ':TSUpdate' },
+  { 'hrsh7th/vim-vsnip', init = get_config('vsnip') },
-  { 'rafamadriz/friendly-snippets', dependencies = { 'hrsh7th/vim-vsnip' } },
   {
     'hrsh7th/nvim-cmp',
     init = get_config('cmp'),
@@ -54,53 +52,34 @@ require('lazy').setup({
       'hrsh7th/cmp-vsnip',
     },
   },
+  { 'rafamadriz/friendly-snippets', dependencies = { 'hrsh7th/vim-vsnip' } },
+
+  -- more modern neovim with treesitter, lsp, auto-setup and
+  -- null-ls integration; see ../../install/3_vimux.sh
+  -- and null-ls-config for installed and supported tools (Eslint, TSC etc.)
+  { 'nvim-treesitter/nvim-treesitter', init = get_config('treesitter'), build = ':TSUpdate' },
+  { 'neovim/nvim-lspconfig', init = get_config('lspconfig') },
+  { 'jose-elias-alvarez/null-ls.nvim', init = get_config('null-ls'), dependencies = { 'nvim-lua/plenary.nvim' } },
+  { 'editorconfig/editorconfig-vim' },
 
   -- editing enhancements
   { 'AndrewRadev/splitjoin.vim' },
-  { 'echasnovski/mini.ai', version = '*' },
   { 'numToStr/Comment.nvim', config = true },
   { 'tpope/vim-ragtag' },
   { 'tpope/vim-repeat' },
   { 'tpope/vim-surround' },
   { 'windwp/nvim-autopairs', config = true },
 
-  -- git and other external tools integration
+  -- interface/code-navigation enhancements, git and others
-  { 'christoomey/vim-tmux-navigator'},
+  { 'ggandor/leap.nvim', init = get_config('leap') },
-  { 'editorconfig/editorconfig-vim' },
+  { 'ggandor/flit.nvim', init = get_config('flit') },
   { 'lewis6991/gitsigns.nvim', config = true },
-  { 'voldikss/vim-floaterm', init = get_config('floaterm') },
+  { 'rcarriga/nvim-notify', init = function() vim.notify = require('notify') end },
-  { 'wincent/terminus' },
+  { 'nvim-lualine/lualine.nvim',
-
-  -- ui enhancements / navigation
-  {  -- nice popup messages
-    'rcarriga/nvim-notify',
-    init = function() vim.notify = require('notify') end
-  },
-  { -- a nice status line
-    'nvim-lualine/lualine.nvim',
     dependencies = { 'kyazdani42/nvim-web-devicons' },
-    event = 'VimEnter',
     opts = { options = { theme = 'gruvbox' } },
   },
-  { -- easy jump navigation
+  { 'norcalli/nvim-colorizer.lua',
-    'ggandor/leap.nvim',
-    event = 'BufReadPre',
-    init = function() require('leap').set_default_keymaps() end,
-  },
-  { -- better f t
-    'ggandor/flit.nvim',
-    event = 'BufReadPre',
-    init = function()
-      require('flit').setup {
-        keys = { f = 'f', F = 'F', t = 't', T = 'T' },
-        labeled_modes = "v",
-        multiline = true,
-        opts = {}
-      }
-    end,
-  },
-  { -- colorizer for nice css-colors
-    'norcalli/nvim-colorizer.lua',
     event = 'BufReadPre',
     opts = {
       css = { css = true },
@@ -110,7 +89,9 @@ require('lazy').setup({
       javascript = { css = true },
     },
   },
-  { -- and neorg for todo-lists etc.
+
+  -- and neorg for todo-lists etc.
+  {
     'nvim-neorg/neorg',
     build = ':Neorg sync-parsers',
     opts = {

tmux.conf

@@ -25,6 +25,8 @@ bind -n WheelUpPane if-shell -F -t = "#{mouse_any_flag}" "send-keys -M" "if -Ft=
 bind -n WheelDownPane select-pane -t= \; send-keys -M
 bind -n C-WheelUpPane select-pane -t= \; copy-mode -e \; send-keys -M
 
+source-file /Users/webgefrickel/.local/share/nvim/lazy/gruvbox-baby/extras/tmux/MEDIUM.tmux
+
 # Custom statusbar, gruvbox style
 set -g status-style bg=black,fg=yellow,default
 set -g pane-border-style 'fg=#504945'

zsh/zshrc

@@ -33,3 +33,7 @@ eval "$(starship init zsh)"
 eval "$(jump shell)"
 eval "$(rbenv init - --no-rehash)"
 eval "$(pyenv init --path --no-rehash)"
+
+# colors
+source ~/.local/share/nvim/lazy/gruvbox-baby/extras/bash/MEDIUM.bash
+source ~/.local/share/nvim/lazy/gruvbox-baby/extras/fzf/fzf.theme