From a7e509e6aa9f22ff4c34dcbbee412df5e72398b1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cyryl=20P=C5=82otnicki?= <cyplo@cyplo.net>
Date: Tue, 8 Mar 2022 11:53:17 +0000
Subject: [PATCH] Refresh vim settings

---
 .vimrc.keymap                       |  2 +-
 .vimrc.plugins-settings             | 18 ++++++--
 nixos/home-manager/programs/vim.nix | 71 +++++++++++++++++------------
 3 files changed, 57 insertions(+), 34 deletions(-)

diff --git a/.vimrc.keymap b/.vimrc.keymap
index 86965e70..6bcb5d78 100755
--- a/.vimrc.keymap
+++ b/.vimrc.keymap
@@ -3,7 +3,7 @@ let mapleader = ","
 nmap <Leader>s :update<CR>
 nmap <leader>p :set paste!<CR>
 nmap <leader>h :set hlsearch!<CR>
-nmap <leader>t :wa <bar> :Make test<CR>
+nmap <leader>t :NvimTreeOpen<CR>
 
 " navigate buffers by ctrl-b
 nmap <C-b> :bprevious<CR>
diff --git a/.vimrc.plugins-settings b/.vimrc.plugins-settings
index 6d316dbf..174f07fd 100644
--- a/.vimrc.plugins-settings
+++ b/.vimrc.plugins-settings
@@ -14,10 +14,6 @@ command! -bang -nargs=* Find call fzf#vim#grep('rga --column --line-number --no-
 let g:ctrlp_show_hidden = 1
 let g:ctrlp_user_command = 'rga %s --files --hidden --color=never --glob ""'
 
-" nerdtree startup
-autocmd StdinReadPre * let s:std_in=1
-autocmd VimEnter * if argc() == 1 && isdirectory(argv()[0]) && !exists("s:std_in") | exe 'NERDTree' argv()[0] | wincmd p | ene | endif
-
 " rainbow
 let g:rainbow_active = 1
 
@@ -45,3 +41,17 @@ set statusline^=%{coc#status()}%{get(b:,'coc_current_function','')}
 let g:ackprg = 'rg --vimgrep --smart-case'
 let g:ack_autoclose = 1
 let g:ack_use_cword_for_empty_search = 1
+
+
+lua << EOF
+require'nvim-tree'.setup{
+disable_netrw = false,
+hijack_cursor=true,
+ignore_buffer_on_setup=true,
+open_on_setup=true,
+open_on_tab=true,
+update_focused_file = { enable = true },
+}
+EOF
+
+
diff --git a/nixos/home-manager/programs/vim.nix b/nixos/home-manager/programs/vim.nix
index a1199ffe..b05449bb 100644
--- a/nixos/home-manager/programs/vim.nix
+++ b/nixos/home-manager/programs/vim.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, inputs, ... }: {
+{ config, pkgs, lib, inputs, ... }: {
   home.file.".vimrc".source = ../../../.vimrc;
   home.packages = with pkgs; [ ripgrep ];
   programs.neovim = {
@@ -10,34 +10,47 @@
     withPython3 = true;
     withRuby = true;
 
-    plugins = with pkgs.vimPlugins; [
-      ack-vim
-      coc-highlight
-      coc-nvim
-      coc-rust-analyzer
-      coc-yaml
-      ctrlp-vim
-      editorconfig-vim
-      fzf-vim
-      quickfix-reflector-vim
-      rainbow
-      tabular
-      vim-airline
-      vim-airline-themes
-      vim-autoformat
-      vim-colors-solarized
-      vim-devicons
-      vim-dirdiff
-      vim-dispatch
-      vim-fugitive
-      vim-gitgutter
-      vim-markdown
-      vim-nix
-      vim-sensible
-      vim-startify
-      vim-surround
-      vim-toml
-    ];
+    plugins = with pkgs;
+      with pkgs.vimPlugins; [
+        (vimUtils.buildVimPluginFrom2Nix rec {
+          pname = "srht.vim";
+          version = "2022-01-04";
+          src = fetchFromSourcehut {
+            owner = "~willdurand";
+            repo = pname;
+            rev = "825e685f75464cbd41a5f8eded974e46f416355e";
+            sha256 = "sha256-9/Yeqmq/1ZIIsEgsrLLZ7o0cjOt/wlUgeLEzJoK7eco=";
+          };
+        })
+        ack-vim
+        coc-highlight
+        coc-nvim
+        coc-rust-analyzer
+        coc-yaml
+        ctrlp-vim
+        editorconfig-vim
+        fzf-vim
+        nvim-tree-lua
+        nvim-web-devicons
+        quickfix-reflector-vim
+        rainbow
+        tabular
+        vim-airline
+        vim-airline-themes
+        vim-autoformat
+        vim-colors-solarized
+        vim-devicons
+        vim-dirdiff
+        vim-dispatch
+        vim-fugitive
+        vim-gitgutter
+        vim-markdown
+        vim-nix
+        vim-sensible
+        vim-startify
+        vim-surround
+        vim-toml
+      ];
     extraConfig = ''
       if filereadable($HOME . "/.vimrc")
         source $HOME/.vimrc