From 6446ab7ce4fbec5b252c476845cb31d2bddc705a Mon Sep 17 00:00:00 2001
From: Anish Lakhwara <anish@lakhwara.com>
Date: Sun, 18 Oct 2020 22:49:07 +1000
Subject: [PATCH] updated

---
 common.nix |  7 +++++--
 nvim.nix   | 17 ++++++++++++++++-
 2 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/common.nix b/common.nix
index 53b28157..0079ccc2 100644
--- a/common.nix
+++ b/common.nix
@@ -12,6 +12,10 @@
 		iftop
 		wget
 		curl
+    exa
+    bat
+    fd
+    ag
 		tcpdump
 		whois
 		mtr
@@ -58,6 +62,7 @@
 	  wire-desktop
 		tdesktop
 		feedreader
+    newsflash
 		syncthing
 	  dijo
 	  #kdeconnect
@@ -73,7 +78,6 @@
 		libreoffice
 		fontconfig
 		hugo
-	  nodejs
 	  #processing
 	  #nextcloud-client
 	  zsh-powerlevel10k
@@ -82,7 +86,6 @@
 	  haskellPackages.tidal
 	  # vim-zettel
 	  pandoc
-	  ag
 	];
 
 	programs.bash.enableCompletion = true;
diff --git a/nvim.nix b/nvim.nix
index 34aa7666..8471653f 100644
--- a/nvim.nix
+++ b/nvim.nix
@@ -9,6 +9,7 @@
       kz = "vim -c :VimwikiIndex -c :ZettelNew";
     };
     environment.systemPackages = with pkgs; [ 
+      nodejs
   ( neovim.override {
   vimAlias = true;
   configure = {
@@ -24,7 +25,7 @@
 				lightline-vim
 				csv-vim
         vimwiki
-				coc-nvim
+        coc-nvim
 				coc-json
         coc-python
         coc-pairs
@@ -35,11 +36,15 @@
         rainbow_parentheses-vim
         vim-surround
         vim-fugitive
+        #iron-nvim
+        #nvim-colorizer
+        vim-devicons
         # testing
         #vim-processing
         #vim-tidal
         taskwiki
         vim-zettel
+        vimwiki-sync
 			];
 		};
     customRC = ''
@@ -49,6 +54,7 @@
       set noexpandtab
       set autoindent
 
+      set foldmethod=indent   " fold based on indent
 			set number
 			set nocompatible
 			set relativenumber
@@ -62,6 +68,12 @@
       let ayucolor="dark"
       colorscheme ayu
 
+      " window
+      nmap <leader>wh  :topleft  vnew<CR>
+      nmap <leader>wl :botright vnew<CR>
+      nmap <leader>wk    :topleft  new<CR>
+      nmap <leader>wj  :botright new<CR>
+
 			let mapleader = "\<Space>"
 
 			" lightline colorscheme
@@ -85,6 +97,9 @@
 			:nnoremap <F5> "=strftime("%Y-%m-%d %H:%M:")
 			:inoremap <F5> <C-R>=strftime("%Y-%m-%d %H:%M:")
 
+      " exit normal mode in terminal
+      :tnoremap <C-n> <C-\><C-n>
+
 			let g:syntastic_always_populate_loc_list = 1
 			let g:syntastic_auto_loc_list = 1
 			let g:syntastic_check_on_open = 1