From 447503fadf1225b541966d56a5c09b63c47f6ff7 Mon Sep 17 00:00:00 2001
From: Jordan Holt <jordan@vimium.com>
Date: Mon, 2 Jan 2023 23:58:41 +0000
Subject: [PATCH] Migrate nvim config

---
 modules/default.nix                           |  2 +-
 modules/editors/neovim.nix                    | 18 -------------
 modules/editors/neovim/default.nix            | 26 +++++++++++++++++++
 .../nvim => modules/editors/neovim}/init.lua  |  0
 .../editors/neovim}/lua/config/core.lua       |  0
 .../editors/neovim}/lua/config/keymap.lua     |  0
 .../editors/neovim}/lua/config/lsp.lua        |  0
 .../editors/neovim}/lua/config/plugins.lua    |  0
 .../editors/neovim}/lua/config/telescope.lua  |  0
 .../editors/neovim}/lua/config/treesitter.lua |  0
 10 files changed, 27 insertions(+), 19 deletions(-)
 delete mode 100644 modules/editors/neovim.nix
 create mode 100644 modules/editors/neovim/default.nix
 rename {.config/nvim => modules/editors/neovim}/init.lua (100%)
 rename {.config/nvim => modules/editors/neovim}/lua/config/core.lua (100%)
 rename {.config/nvim => modules/editors/neovim}/lua/config/keymap.lua (100%)
 rename {.config/nvim => modules/editors/neovim}/lua/config/lsp.lua (100%)
 rename {.config/nvim => modules/editors/neovim}/lua/config/plugins.lua (100%)
 rename {.config/nvim => modules/editors/neovim}/lua/config/telescope.lua (100%)
 rename {.config/nvim => modules/editors/neovim}/lua/config/treesitter.lua (100%)

diff --git a/modules/default.nix b/modules/default.nix
index 416006e..9c1db55 100644
--- a/modules/default.nix
+++ b/modules/default.nix
@@ -3,7 +3,7 @@
     ./options.nix
     ./desktop/firefox.nix
     ./desktop/gnome.nix
-    ./editors/neovim.nix
+    ./editors/neovim
     ./editors/vscode.nix
     ./security/gpg.nix
     ./security/pass.nix
diff --git a/modules/editors/neovim.nix b/modules/editors/neovim.nix
deleted file mode 100644
index 15b761a..0000000
--- a/modules/editors/neovim.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-with lib.my;
-let cfg = config.modules.editors.neovim;
-in {
-  options.modules.editors.neovim = {
-    enable = mkBoolOpt false;
-  };
-
-  config = mkIf cfg.enable {
-    home.programs.neovim = {
-      enable = true;
-      vimAlias = true;
-      vimdiffAlias = true;
-    };
-  };
-}
\ No newline at end of file
diff --git a/modules/editors/neovim/default.nix b/modules/editors/neovim/default.nix
new file mode 100644
index 0000000..98f2a2f
--- /dev/null
+++ b/modules/editors/neovim/default.nix
@@ -0,0 +1,26 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+with lib.my;
+let cfg = config.modules.editors.neovim;
+in {
+  options.modules.editors.neovim = {
+    enable = mkBoolOpt false;
+  };
+
+  config = mkIf cfg.enable {
+    user.packages = with pkgs; [
+      neovim
+    ];
+
+    home.configFile = {
+      "nvim/init.lua" = { source = ./init.lua; };
+      "nvim/lua" = { source = ./lua; recursive = true; };
+    };
+
+    environment.shellAliases = {
+      vim = "nvim";
+      v   = "nvim";
+    };
+  };
+}
\ No newline at end of file
diff --git a/.config/nvim/init.lua b/modules/editors/neovim/init.lua
similarity index 100%
rename from .config/nvim/init.lua
rename to modules/editors/neovim/init.lua
diff --git a/.config/nvim/lua/config/core.lua b/modules/editors/neovim/lua/config/core.lua
similarity index 100%
rename from .config/nvim/lua/config/core.lua
rename to modules/editors/neovim/lua/config/core.lua
diff --git a/.config/nvim/lua/config/keymap.lua b/modules/editors/neovim/lua/config/keymap.lua
similarity index 100%
rename from .config/nvim/lua/config/keymap.lua
rename to modules/editors/neovim/lua/config/keymap.lua
diff --git a/.config/nvim/lua/config/lsp.lua b/modules/editors/neovim/lua/config/lsp.lua
similarity index 100%
rename from .config/nvim/lua/config/lsp.lua
rename to modules/editors/neovim/lua/config/lsp.lua
diff --git a/.config/nvim/lua/config/plugins.lua b/modules/editors/neovim/lua/config/plugins.lua
similarity index 100%
rename from .config/nvim/lua/config/plugins.lua
rename to modules/editors/neovim/lua/config/plugins.lua
diff --git a/.config/nvim/lua/config/telescope.lua b/modules/editors/neovim/lua/config/telescope.lua
similarity index 100%
rename from .config/nvim/lua/config/telescope.lua
rename to modules/editors/neovim/lua/config/telescope.lua
diff --git a/.config/nvim/lua/config/treesitter.lua b/modules/editors/neovim/lua/config/treesitter.lua
similarity index 100%
rename from .config/nvim/lua/config/treesitter.lua
rename to modules/editors/neovim/lua/config/treesitter.lua