From dfdd19fbce33abcfe7f636d201c69f5edde7f4c2 Mon Sep 17 00:00:00 2001
From: ElnuDev <elnu@elnu.com>
Date: Mon, 9 Jan 2023 19:47:37 -0800
Subject: [PATCH] Switch to neovim

---
 README.md      |  9 ---------
 TODO.md        |  4 ++++
 hosts/home.nix |  4 ++--
 neovim.nix     | 19 +++++++++++++++++++
 vim.nix        | 44 --------------------------------------------
 5 files changed, 25 insertions(+), 55 deletions(-)
 create mode 100644 TODO.md
 create mode 100644 neovim.nix
 delete mode 100644 vim.nix

diff --git a/README.md b/README.md
index 6430e39..6c16802 100644
--- a/README.md
+++ b/README.md
@@ -1,10 +1 @@
 # Elnu's NixOS configuration
-
-### TODO
-
-- Load in vim configuration
-
-### Needs checking
-
-- Fix issue where wireless connection dies after suspend, even after restarting NetworkManager: not an issue on T430, still problem on X220?
-- Fix/map media keys (already declared within [`i3.nix`](i3.nix) but are non-functional: not an issue on T430, still problem on X220?
diff --git a/TODO.md b/TODO.md
new file mode 100644
index 0000000..79ba836
--- /dev/null
+++ b/TODO.md
@@ -0,0 +1,4 @@
+### Needs checking
+
+- Fix issue where wireless connection dies after suspend, even after restarting NetworkManager: not an issue on T430, still problem on X220?
+- Fix/map media keys (already declared within [`i3.nix`](i3.nix) but are non-functional: not an issue on T430, still problem on X220?
diff --git a/hosts/home.nix b/hosts/home.nix
index 819f83c..8c75aee 100644
--- a/hosts/home.nix
+++ b/hosts/home.nix
@@ -5,7 +5,7 @@ let
 in
 {
   imports = [
-    ../vim.nix
+    ../neovim.nix
     ../ranger.nix
     ../fcitx5
     ../picom.nix
@@ -95,7 +95,7 @@ in
       gC = "g clone";
       goops = "g reset --soft HEAD^";
 
-      v = "vim";
+      v = "nvim";
       r = "ranger";
       rm = "trash-put";
     };
diff --git a/neovim.nix b/neovim.nix
new file mode 100644
index 0000000..c6c48e5
--- /dev/null
+++ b/neovim.nix
@@ -0,0 +1,19 @@
+{ pkgs, ... }:
+
+{
+  programs.neovim = { 
+    enable = true;
+    viAlias = true;
+    vimAlias = true;
+    defaultEditor = true;
+    plugins = with pkgs.vimPlugins; [ vim-nix ];
+    extraConfig = ''
+    " Temporary configuration for editing Nix files
+    syntax on
+    set autoindent
+    set expandtab
+    set tabstop=2
+    set shiftwidth=2
+    '';
+  };
+}
diff --git a/vim.nix b/vim.nix
deleted file mode 100644
index d5fa246..0000000
--- a/vim.nix
+++ /dev/null
@@ -1,44 +0,0 @@
-{ pkgs, ... }:
-
-{
-  programs.vim = { 
-    enable = true;
-    defaultEditor = true;
-    extraConfig = ''
-    " Temporary configuration for editing Nix files
-    syntax on
-    set autoindent
-    set expandtab
-    set tabstop=2
-    set shiftwidth=2
-
-    " Temporary configuration for editing markdown
-    " full configuration with plugins is described here
-    " https://blog.elnu.com/2022/06/how-to-configure-vim-for-writing
-
-    setlocal linebreak
-
-    set spell spelllang=en
-    set spelllang+=cjk " prevent CJK characters from being spellchecked
-
-    function! Characters()
-            return strchars(join(getline(1, '$'), "\n"))
-    endfunction
-function! Words()
-            return wordcount().words
-    endfunction
-
-    function! Minutes()
-            let wpm = 200
-            return (Words() + wpm / 2) / wpm
-    endfunction
-
-    set laststatus=2 " enable status line
-    set statusline+=%=%{Words()}\ words,
-    set statusline+=\ %{Characters()}\ characters,\ about
-    set statusline+=\ %{Minutes()}\ minutes
-    " remove ugly white background
-    hi StatusLine ctermfg=0 ctermbg=none cterm=bold " 0 for the terminal color 0
-    '';
-  };
-}