Moved to more Nix neovim config

2023-06-20 19:28:14 -05:00
parent c9ee6ab8b1
commit 99c3efc191
10 changed files with 494 additions and 284 deletions
@@ -27,39 +27,125 @@ in
 		pyright
 	];

-	programs.neovim = {
+	#programs.neovim = {
+	#	enable = true;
+	#	viAlias = true;
+	#	vimAlias = true;
+	#	vimdiffAlias = true;
+	#	plugins = with pkgs.vimPlugins; [
+	#		ansible-vim
+	#		bufexplorer
+#
+#			#cmp-nvim-lsp
+#			#cmp-vsnip
+#			#nvim-lspconfig
+#			nvim-cmp
+#
+#			jedi-vim
+#
+#			context-vim
+#			direnv-vim
+#			fzf-vim
+#			nerdtree
+#			nvim-notify
+#			vim-airline
+#			vim-gitgutter
+#			vim-flake8
+#			vim-fugitive
+#			vim-indent-guides
+#			vim-packer
+#			vim-rooter
+#			vim-xonsh
+#			gruvbox
+#		];
+#		extraLuaConfig = builtins.readFile ./init.lua;
+#		coc = {
+#			# Currently waiting on resolution of https://github.com/NixOS/nixpkgs/issues/236560
+#			enable = false;
+#		};
+#	};
+	programs.nixneovim = {
 		enable = true;
-		viAlias = true;
-		vimAlias = true;
-		vimdiffAlias = true;
-		plugins = with pkgs.vimPlugins; [
-			ansible-vim
+		colorscheme = "gruvbox";
+		globals = {
+			indent_guides_enable_on_vim_startup = 1;
+			nix_recommended_style = 0;
+			NERDTreeIgnore = [
+				"\\.pyc$"
+				"\\.pyo$"
+				"\\.o$"
+				"\\.class$"
+			];
+		};
+		options = {
+			background = "dark";
+			backup = false;
+			copyindent = true;
+			cursorline = true;
+			expandtab = false;
+			hidden = true;
+			hlsearch = true;
+			ignorecase = true;
+			lazyredraw = true;
+			list = true;
+			listchars = "tab:→ ,extends:→,precedes:←,trail:·,eol:¬";
+			mouse = "a";
+			number = true;
+			preserveindent = true;
+			relativenumber = true;
+			shiftwidth = 4;
+			showcmd = true;
+			showmatch = true;
+			signcolumn = "yes";
+			smartcase = true;
+			softtabstop = 4;
+			tabstop = 4;
+			# Setting for CtrlP
+			wildignore = "*.swp,*.pyc,*.class,.tox";
+			wrap = false;
+			writebackup = false;
+		};
+		mappings = {
+			normalVisualOp = {
+				"<F2>" = ''"<Esc>:BufExplorer<CR>"'';
+				"<F4>" = ''"<Esc>:NERDTreeToggle<CR>"'';
+				"<F6>" = ''"<Esc>:Files<CR>"'';
+				"<C-j>" = ''"<C-w>j<C-w><CR>"'';
+				"<C-k>" = ''"<C-w>k<C-w><CR>"'';
+				"<C-h>" = ''"<C-w>h<C-w><CR>"'';
+				"<C-l>" = ''"<C-w>l<C-w><CR>"'';
+			};
+		};
+		plugins = {
+			airline.enable = true;
+			gitgutter.enable = true;
+			gruvbox.enable = true;
+			fugitive.enable = true;
+			notify.enable = true;
+			packer = {
+				enable = true;
+				plugins = [
+				];
+			};
+		};
+		extraConfigLua = builtins.readFile ./vim/extra.lua;
+		extraConfigVim = builtins.readFile ./vim/extra.vimrc;
+		extraPlugins = with pkgs.vimPlugins; [
 			bufexplorer
+			nerdtree
+			nvim-cmp

-			#cmp-nvim-lsp
-			#cmp-vsnip
-			#nvim-lspconfig
-			#nvim-cmp
+			jedi-vim

 			context-vim
 			direnv-vim
 			fzf-vim
-			nerdtree
-			nvim-notify
-			vim-airline
-			vim-gitgutter
 			vim-flake8
-			vim-fugitive
 			vim-indent-guides
-			vim-packer
 			vim-rooter
 			vim-xonsh
-			gruvbox
 		];
-		#extraConfig = builtins.readFile ./vimrc;
-		extraLuaConfig = builtins.readFile ./init.lua;
-		coc = {
-			enable = true;
-		};
+		viAlias = true;
+		vimAlias = true;
 	};
 }