More ricing with telescope and warp.

2 files changed, 60 insertions, 18 deletions

diff --git a/colors/meltdown_ng.vim b/colors/meltdown_ng.vim
index 386a37c..ef6460e 100644
--- a/colors/meltdown_ng.vim
+++ b/colors/meltdown_ng.vim
@@ -12,7 +12,7 @@ hi DarkGrey guifg=#7b7b7b
 hi LighterGrey guifg=#9a9a9a
 hi Salmon guifg=#ff7779
 hi IncSearch guifg=#ff5d34 ctermfg=202 guibg=#000000 ctermbg=000 gui=reverse cterm=reverse
-hi TabLineSel guifg=#1f1d2a guibg=#ff5d34 ctermfg=202 ctermbg=233 gui=none
+hi TabLineSel guifg=#1f1d2a guibg=#ff7779 ctermfg=202 ctermbg=233 gui=none
 hi Green1 guifg=#26ff00 ctermfg=106
 hi Green3 guifg=#aba024 ctermfg=142
 hi Green2 guifg=#3dab24 ctermfg=034
@@ -25,6 +25,7 @@ hi Sage4 guifg=#8e9f84 ctermfg=108
 hi Sage5 guifg=#8e9f84 ctermfg=108
 hi MatchParen guibg=#346063 ctermbg=023 gui=bold cterm=bold
 hi VertSplit guifg=#0f0e0e ctermfg=233 guibg=#0f0e0e ctermbg=233
+hi WinSeparator guifg=#0f0e0e ctermfg=233 guibg=#0f0e0e ctermbg=233
 hi Red3 guifg=#ff3448 ctermfg=203
 hi Red2 guifg=#ff8f34 ctermfg=208
 hi Red1 guifg=#ff5d34 ctermfg=202
@@ -32,7 +33,6 @@ hi Normal guifg=#d8e5b8 ctermfg=187 guibg=#1f1d2a ctermbg=234
 hi Red6 guifg=#ff74f4 ctermfg=213
 hi Red5 guifg=#ff9074 ctermfg=209
 hi Red4 guifg=#ffa034 ctermfg=215
-hi LineNr guibg=#2b293b ctermfg=144 guifg=#b4b4b4 ctermbg=234
 hi DarkGray guifg=#404040 ctermfg=238
 hi StatusLine guifg=#ff5d34 ctermfg=202 guibg=#0f0e0e ctermbg=233 gui=bold cterm=bold
 hi Title guifg=#ff8f34 ctermfg=208 guibg=#444040 ctermbg=238 gui=bold cterm=bold
@@ -117,7 +117,11 @@ hi! link Special Orange2
 
 hi LineNrAbove guibg=#2b293b ctermfg=144 guifg=#80a0ff ctermbg=234
 hi! link LineNrBelow LineNrAbove
-hi LineNr guifg=#ff5d34 guibg=#2b293b
+if &relativenumber
+  hi LineNr guibg=#ff5d34 guifg=#2b293b gui=bold
+else
+  hi LineNr guifg=#ff5d34 guibg=#2b293b gui=bold
+endif
 hi DocComment guifg=#00d0ff gui=italic
 
 hi! link TabLineFill SignColumn
@@ -153,6 +157,7 @@ hi! link @module DarkGrey
 hi! link @lsp.type.enum Type
 hi! link @lsp.mod.readonly PreProc
 hi! link @lsp.type.struct Type
+hi! link @type.builtin.c Type
 
 hi CmpItemAbbrDeprecated gui=strikethrough guifg=#ff7779 ctermfg=241 guibg=#14151d ctermbg=238
 hi CmpItemAbbrMatch guifg=#1f1d2a guibg=#ff7779 gui=bold
@@ -223,6 +228,8 @@ hi! link CmpReady CmpDefault
 hi! link CmpStatus CmpDefault
 hi! link CmpZsh CmpDefault
 hi! link DiagnosticInfo Teal2
+hi DiagnosticError guifg=red
+hi ColorColumn guifg=#644141 guibg=none gui=None
 
 hi TabLineCloseSel guifg=#790000 guibg=#ff5d34
 hi TabLineClose guifg=#0f0e0e guibg=#2d2d2d
@@ -231,3 +238,13 @@ hi TabLineTail guifg=#ff8082 guibg=#0f0e0e
 hi DiagnosticUnderlineError gui=undercurl
 hi DiagnosticUnderlineWarn gui=undercurl
 hi DiagnosticUnderlineInfo gui=undercurl
+
+hi WarpNormal guibg=#ff7779 guifg=black gui=bold
+
+hi! link TelescopeBorder Normal
+hi TelescopeBorder blend=255
+hi TelescopeNormal guibg=#12131b guifg=#ff7779
+hi TelescopeSelection guibg=#ff7779 guifg=black
+hi TelescopeTitle guifg=#ff7779 gui=bold
+hi! link TelescopeMatching TelescopeNormal
+hi TelescopeMatching gui=bold gui=reverse
diff --git a/init.vim b/init.vim
index 807b166..c3e0190 100644
--- a/init.vim
+++ b/init.vim
@@ -16,9 +16,11 @@ if filereadable(printf('%s/.config/nvim/local-plug.vim', $HOME))
   exec "source " . printf('%s/.config/nvim/local-plug.vim', $HOME)
 endif
 
+Plug 'lukas-reineke/virt-column.nvim'
 Plug 'dylnmc/synstack.vim'
 Plug 'folke/trouble.nvim'
 Plug 'git@git.josher.dev:bulletjava.vim.git'
+Plug 'git@git.josher.dev:nvim-warp.git'
 Plug 'git@git.josher.dev:fieldmarshal.vim.git'
 Plug 'git@git.josher.dev:nvim-color-picker.git'
 Plug 'google/vim-codefmt'
@@ -45,7 +47,6 @@ Plug 'nvim-treesitter/nvim-treesitter-textobjects'
 Plug 'nvim-treesitter/playground'
 Plug 'onsails/lspkind.nvim'
 Plug 'tpope/vim-surround'
-Plug 'vim-airline/vim-airline'
 
 if has('rneovim')
   Plug 'git@git.josher.dev:rneovim-userregs.git'
@@ -93,6 +94,10 @@ noremap <leader>p <plug>(SynStack)
 " Way to find files.
 noremap <leader>ff <cmd>Telescope find_files<cr>
 noremap <M-f> <cmd>Telescope find_files<cr>
+function! s:find_in_dir()
+  exec "Telescope find_files search_dirs={\"" . escape(expand('%:h'), ' ') . "\"}"
+endfunction
+noremap <M-F> <cmd>call <sid>find_in_dir()<cr>
 
 inoremap <C-+> <Plug>(vsnip-expand)
 
@@ -103,8 +108,13 @@ noremap ^ ^zH
 noremap <leader>t <cmd>TroubleToggle<cr>
 
 
+function! HighlightColorColumns() abort
+  hi MyColorColumn guifg=#644141 guibg=none gui=None
+endfunction
+call HighlightColorColumns()
 augroup InitVim
   au!
+  au ColorScheme * call HighlightColorColumns()
   autocmd BufRead *.java,*.c,*.cpp,*.cxx,*.hs TSBufEnable highlight
 
   " Automatically stop highligting things when leaving insert mode. If I want
@@ -160,6 +170,15 @@ nnoremap <M-h> <cmd>bprev<cr>
 
 noremap <C-g> <cmd>lua vim.diagnostic.open_float()<cr>
 
+noremap <C-f> <cmd>WarpGrid<cr>
+onoremap <C-f> v<cmd>WarpGrid<cr>
+
+noremap <leader>w <cmd>WarpWords<cr>
+onoremap <leader>w v<cmd>WarpWords<cr>
+
+noremap <M-w> <cmd>lua require('warp').run(require('warp.strategy.words').words_strategy)<cr>
+onoremap <M-w> v<cmd>lua require('warp').run(require('warp.strategy.words').words_strategy)<cr>
+
 nmap œ <leader>k
 nmap ï <leader>j
 omap œ <leader>k
@@ -171,6 +190,8 @@ omap iï i<leader>j
 vmap œ <leader>k
 vmap ï <leader>j
 
+" test a thing here ααααααααααααααβααααααααααααααααααααααααααααααααααααααα
+
 noremap <M-ñ> <cmd>TSNodeUnderCursor<cr>
 noremap <M-©> <cmd>TSCaptureUnderCursor<cr>
 
@@ -190,18 +211,10 @@ cnoreabbrev <expr> _ escape(expand('%:h'), ' \')
 set textwidth=80
 set colorcolumn=+1
 if has('rneovim')
-  function! HighlightColorColumns() abort
-    hi MyColorColumn guifg=#3a3a3a guibg=none gui=None
-    hi MyRedColorColumn guifg=#5a1a1a guibg=none gui=None
-  endfunction
-  call HighlightColorColumns()
-  " Grey color column right after text width is grey and in the background and
-  " a red one after the text width which is red and in the foreground.
-  set colorcolumn=+1/│/MyColorColumn/b,+20/│/MyRedColorColumn/f
-
-  augroup InitVim
-    au ColorScheme * call HighlightColorColumns()
-  augroup END
+  " call HighlightColorColumns()
+  " " Grey color column right after text width is grey and in the background and
+  " " a red one after the text width which is red and in the foreground.
+  " set colorcolumn=+1/│/MyColorColumn/b,+20/│/MyRedColorColumn/f
 endif
 
 " Opens a terminal in the directory of the current file.
@@ -224,6 +237,11 @@ lua << EOF
     end
   end
 
+  function reload_package(str)
+    remove_package(str)
+    return require(str)
+  end
+
   -- CiderLSP
   vim.opt.completeopt = { "menu", "menuone", "noselect" }
   require("lualine").setup({
@@ -245,6 +263,10 @@ lua << EOF
 
   require('telescope').setup({
     defaults = {
+      title = "",
+      borderchars = { " ", " ", " ", " ", " ", " ", " ", " " },
+      prompt_prefix = '🞂 ',
+      selection_caret = '🞂 ',
       layout_strategy = "center",
       results_title = false,
       sorting_strategy = "ascending",
@@ -261,8 +283,11 @@ lua << EOF
     -- other configuration values here
     })
 
-  -- You probably also want to set a keymap to toggle aerial
-  vim.keymap.set('n', '<leader>a', '<cmd>AerialToggle!<CR>')
+  require("virt-column").setup({
+    char = '│',
+    highlight = "MyColorColumn"
+  })
+  vim.fn.HighlightColorColumns()
 
 EOF