alacritty/alacritty.yml

@@ -425,10 +425,10 @@ live_config_reload: true
 #   - (macOS) /bin/bash --login
 #   - (Linux/BSD) user login shell
 #   - (Windows) powershell
-#shell:
-#  program: /usr/bin/zsh
-#  args:
-#    - -l
+shell:
+  program: /usr/bin/zsh
+  args:
+    - -l
 
 # Startup directory
 #

nvim/plugins.vimrc

@@ -1,14 +1,16 @@
 " Assorted plugins
-Plug 'cespare/vim-toml', { 'for': 'toml' }
+Plug 'cespare/vim-toml'
+Plug 'ctrlpvim/ctrlp.vim'
 Plug 'honza/vim-snippets'
 Plug 'jiangmiao/auto-pairs'
-Plug 'leafgarland/typescript-vim', { 'for': 'typescript' }
-Plug 'posva/vim-vue', { 'for': 'vue' }
-Plug 'ron-rs/ron.vim', { 'for': 'ron' }
+Plug 'leafgarland/typescript-vim'
+Plug 'mileszs/ack.vim'
+Plug 'posva/vim-vue'
+Plug 'ron-rs/ron.vim'
 Plug 'tommcdo/vim-exchange'
 Plug 'tpope/vim-fugitive'
 Plug 'tpope/vim-projectionist'
-Plug 'tpope/vim-rails', { 'for': 'ruby' }
+Plug 'tpope/vim-rails'
 Plug 'tpope/vim-repeat'
 Plug 'tpope/vim-surround'
 Plug 'vim-test/vim-test'
@@ -27,19 +29,14 @@ Plug 'itchyny/lightline.vim' |
   " \ Plug 'edkolev/tmuxline.vim'
 
 " NerdTree
-Plug 'preservim/nerdtree', { 'on': 'NERDTreeToggle' } |
-  \ Plug 'Xuyuanp/nerdtree-git-plugin', { 'on': 'NERDTreeToggle' } |
+Plug 'preservim/nerdtree' |
+  \ Plug 'Xuyuanp/nerdtree-git-plugin' |
   \ Plug 'ryanoasis/vim-devicons' |
-  \ Plug 'tiagofumo/vim-nerdtree-syntax-highlight', { 'on': 'NERDTreeToggle' }
+  \ Plug 'tiagofumo/vim-nerdtree-syntax-highlight'
 
 " Vim-Markdown
 Plug 'godlygeek/tabular' |
-      \ Plug 'plasticboy/vim-markdown', { 'for': 'markdown' }
-
-" Telescope
-Plug 'nvim-lua/popup.nvim'
-Plug 'nvim-lua/plenary.nvim'
-Plug 'nvim-telescope/telescope.nvim'
+  \ Plug 'plasticboy/vim-markdown'
 
 " sonokai colorscheme + supporting plugins
 Plug 'sainnhe/sonokai' |

nvim/telescope.vimrc

@@ -1,53 +0,0 @@
-nnoremap <leader>ff <cmd>Telescope find_files<cr>
-nnoremap <leader>fg <cmd>Telescope live_grep<cr>
-nnoremap <leader>fG <cmd>Telescope git_files<cr>
-nnoremap <leader>fb <cmd>Telescope buffers<cr>
-nnoremap <leader>fh <cmd>Telescope help_tags<cr>
-nnoremap <leader>fw <cmd>Telescope grep_string<cr>
-
-lua << EOF
-require('telescope').setup{
-  defaults = {
-    vimgrep_arguments = {
-      'rg',
-      '--color=never',
-      '--no-heading',
-      '--with-filename',
-      '--line-number',
-      '--column',
-      '--smart-case'
-    },
-    prompt_prefix = " 🔍 ",
-    selection_caret = " ⯈ ",
-    entry_prefix = "   ",
-    initial_mode = "insert",
-    selection_strategy = "reset",
-    sorting_strategy = "descending",
-    layout_strategy = "horizontal",
-    layout_config = {
-      horizontal = {
-        mirror = false,
-      },
-      vertical = {
-        mirror = false,
-      },
-    },
-    file_sorter =  require'telescope.sorters'.get_fuzzy_file,
-    file_ignore_patterns = {},
-    generic_sorter =  require'telescope.sorters'.get_generic_fuzzy_sorter,
-    winblend = 0,
-    border = {},
-    borderchars = { '─', '│', '─', '│', '╭', '╮', '╯', '╰' },
-    color_devicons = true,
-    use_less = true,
-    path_display = {},
-    set_env = { ['COLORTERM'] = 'truecolor' }, -- default = nil,
-    file_previewer = require'telescope.previewers'.vim_buffer_cat.new,
-    grep_previewer = require'telescope.previewers'.vim_buffer_vimgrep.new,
-    qflist_previewer = require'telescope.previewers'.vim_buffer_qflist.new,
-
-    -- Developer configurations: Not meant for general override
-    buffer_previewer_maker = require'telescope.previewers'.buffer_previewer_maker
-  }
-}
-EOF

tmux.conf

@@ -16,15 +16,17 @@ bind-key -Tcopy-mode-vi Escape send -X cancel
 bind-key -Tcopy-mode-vi V send -X rectangle-toggle
 bind-key ] paste-buffer
 
+# Integrate with the system clipboard
+bind-key -n C-S-c run "tmux save-buffer - | xclip -i -sel clipboard"
+bind-key -n C-S-v run "xclip -o -sel clipboard | tmux load-buffer -; tmux paste-buffer"
+
 # Vi-mode pane switching
 bind-key h "select-pane -L"
 bind-key j "select-pane -D"
 bind-key k "select-pane -U"
 bind-key l "select-pane -R"
 
-# Integrate with the system clipboard
-bind-key -n C-S-c run "tmux save-buffer - | xclip -i -sel clipboard"
-bind-key -n C-S-v run "xclip -o -sel clipboard | tmux load-buffer -; tmux paste-buffer"
+# Integrate with the system selection clipboard
 unbind -n -Tcopy-mode-vi MouseDragEnd1Pane
 bind-key -Tcopy-mode-vi MouseDragEnd1Pane send -X copy-selection-and-cancel\; run "tmux save-buffer - | xclip -i > /dev/null"
 unbind-key MouseDown2Pane

vimrc

@@ -54,11 +54,6 @@ let &t_SI = "\<Esc>[6 q"
 let &t_SR = "\<Esc>[4 q"
 let &t_EI = "\<Esc>[0 q"
 
-if executable('rg')
-  " Use rg over grep
-  set grepprg=rg\ --color\ never
-endif
-
 " Plugins
 call plug#begin('~/.vim/plugged')
 if filereadable(expand("~/.config/nvim/plugins.vimrc"))
@@ -96,9 +91,9 @@ if filereadable(expand("~/.config/nvim/nerdtree.vimrc"))
   source ~/.config/nvim/nerdtree.vimrc
 endif
 
-" Telescope setup
-if filereadable(expand("~/.config/nvim/telescope.vimrc"))
-  source ~/.config/nvim/telescope.vimrc
+" Ack setup
+if filereadable(expand("~/.config/nvim/ack.vimrc"))
+  source ~/.config/nvim/ack.vimrc
 endif
 
 " Test setup
@@ -106,7 +101,7 @@ if filereadable(expand("~/.config/nvim/test.vimrc"))
   source ~/.config/nvim/test.vimrc
 endif
 
-" Markdown setup
+" Goyo setup
 if filereadable(expand("~/.config/nvim/markdown.vimrc"))
   source ~/.config/nvim/markdown.vimrc
 endif