From d67022f8bfe97f8c73b6dc0931667efc811a22a6 Mon Sep 17 00:00:00 2001
From: Don Harper <duck@duckland.org>
Date: Thu, 29 Dec 2022 11:53:41 -0600
Subject: [PATCH] neovim.nix | switch from third party to home-manager module

---
 user/don/neovim.nix | 61 +++++++++++++++++++++------------------------
 1 file changed, 28 insertions(+), 33 deletions(-)

diff --git a/user/don/neovim.nix b/user/don/neovim.nix
index c321531..7a14578 100644
--- a/user/don/neovim.nix
+++ b/user/don/neovim.nix
@@ -1,34 +1,29 @@
 { pkgs, lib, ... }:
-let
-    nixvim = import (builtins.fetchGit {
-          url = "https://github.com/pta2002/nixvim";
-            });
-in
 {
-  imports = [
-    nixvim.homeManagerModules.nixvim
-    ];
-
-    programs.nixvim = {
+    programs.neovim = {
       enable = true;
-      plugins.lightline.enable = true;
-      options = {
-        backspace = "indent,eol,start";
-        autoindent = true;
-        history = 50;
-        ruler = true;
-        showcmd = true;
-        incsearch = true;
-        hlsearch = true;
-        spell  = false;
-        modeline = true;
-        wildmode = longest:full;
-        wildmenu = true;
-        scrolloff = 2;
-        number = true;
-        list = true;
-        listchars = "eol:⏎,tab:␉·,trail:␠,nbsp:⎵";
-        background = "dark";
+      extraConfig = 
+      ''
+        colorscheme murphy
+        set backspace="indent,eol,start"
+        set autoindent
+        set history=50
+        set ruler
+        set showcmd
+        set incsearch
+        set hlsearch
+        set nospell
+        set modeline
+        set wildmode=longest:full
+        set wildmenu
+        set scrolloff=2
+        set number
+        set list
+        "set listchars="eol:⏎,tab:␉·,trail:␠,nbsp:⎵"
+        set background="dark"
+        set laststatus=2
+        set t_Co=256 
+       '';
         #filetype plugin on
         #let g:netrw_silent =  1
         #let g:spchkdialect  =  "usa"
@@ -36,8 +31,6 @@ in
         #let g:BASH_Email         =  'don@donharper.org'
         #let g:BASH_Company       =  'Don Harper'
         #filetype indent on
-        laststatus = 2;
-        t_Co = 256 ;
         #"filetype off                  " required
         #filetype plugin indent on    " required
         #let g:airline#extensions#tabline#enabled  =  1
@@ -55,9 +48,8 @@ in
             #gfn = Monospace\ Regular\ 10
         #endif
         #let g:vim_markdown_folding_level  =  6
-        };
 
-      extraPlugins = with pkgs.vimPlugins; [
+      plugins = with pkgs.vimPlugins; [
         CheckAttach
         ale
         ansible-vim
@@ -65,6 +57,7 @@ in
         #bash-support
         #git
         gitv
+        #lightline
         tabular
         #vc.vim
         vim-airline
@@ -81,6 +74,8 @@ in
         vim-tmux-navigator
         #winresizer
       ];
-      colorscheme = "aurora";
+      viAlias = true;
+      vimAlias = true;
+      vimdiffAlias = true;
     };
 }