refactor: 'native' -> 'nvim'

konradmalik · Dec 24, 2024 · 21753b0 · 21753b0
1 parent 81875f0
commit 21753b0
Show file tree

Hide file tree

Showing 113 changed files with 18 additions and 19 deletions.
diff --git a/Makefile b/Makefile
@@ -1,10 +1,10 @@
 .PHONY: luacheck
 luacheck:
-	@luacheck --codes --no-cache ./config/native
+	@luacheck --codes --no-cache ./config/nvim
 
 .PHONY: typecheck
 typecheck:
-	@nvim-typecheck ./config/native
+	@nvim-typecheck ./config/nvim
 
 .PHONY: fmt
 fmt:

diff --git a/config/default.nix b/config/default.nix
@@ -6,9 +6,9 @@
   onlyNix ? false,
 }:
 let
-  native = stdenvNoCC.mkDerivation {
-    name = "neovim-pde-native-config";
-    src = ./native;
+  nvim = stdenvNoCC.mkDerivation {
+    name = "neovim-pde-nvim-config";
+    src = ./nvim;
     dontBuild = true;
     installPhase = ''
       cp -r $src $out
@@ -23,5 +23,5 @@ let
 in
 symlinkJoin {
   name = "neovim-pde-config";
-  paths = nix ++ lib.optionals (!onlyNix) [ native ];
+  paths = nix ++ lib.optionals (!onlyNix) [ nvim ];
 }
diff --git a/config/native/after/ftplugin/cs.lua → config/nvim/after/ftplugin/cs.lua b/config/native/after/ftplugin/cs.lua → config/nvim/after/ftplugin/cs.lua
diff --git a/config/native/after/ftplugin/go.lua → config/nvim/after/ftplugin/go.lua b/config/native/after/ftplugin/go.lua → config/nvim/after/ftplugin/go.lua
diff --git a/config/native/after/ftplugin/gomod.lua → config/nvim/after/ftplugin/gomod.lua b/config/native/after/ftplugin/gomod.lua → config/nvim/after/ftplugin/gomod.lua
diff --git a/config/native/after/ftplugin/gotmpl.lua → config/nvim/after/ftplugin/gotmpl.lua b/config/native/after/ftplugin/gotmpl.lua → config/nvim/after/ftplugin/gotmpl.lua
diff --git a/config/native/after/ftplugin/gowork.lua → config/nvim/after/ftplugin/gowork.lua b/config/native/after/ftplugin/gowork.lua → config/nvim/after/ftplugin/gowork.lua
diff --git a/config/native/after/ftplugin/make.lua → config/nvim/after/ftplugin/make.lua b/config/native/after/ftplugin/make.lua → config/nvim/after/ftplugin/make.lua
diff --git a/config/native/after/ftplugin/nix.lua → config/nvim/after/ftplugin/nix.lua b/config/native/after/ftplugin/nix.lua → config/nvim/after/ftplugin/nix.lua
diff --git a/config/native/after/ftplugin/qf.lua → config/nvim/after/ftplugin/qf.lua b/config/native/after/ftplugin/qf.lua → config/nvim/after/ftplugin/qf.lua
diff --git a/config/native/after/ftplugin/terraform.lua → config/nvim/after/ftplugin/terraform.lua b/config/native/after/ftplugin/terraform.lua → config/nvim/after/ftplugin/terraform.lua
diff --git a/config/native/after/ftplugin/yaml.lua → config/nvim/after/ftplugin/yaml.lua b/config/native/after/ftplugin/yaml.lua → config/nvim/after/ftplugin/yaml.lua
diff --git a/config/native/after/lsp/clangd.lua → config/nvim/after/lsp/clangd.lua b/config/native/after/lsp/clangd.lua → config/nvim/after/lsp/clangd.lua
diff --git a/config/native/after/lsp/efmson.lua → config/nvim/after/lsp/efmson.lua b/config/native/after/lsp/efmson.lua → config/nvim/after/lsp/efmson.lua
diff --git a/config/native/after/lsp/golangci_lint.lua → config/nvim/after/lsp/golangci_lint.lua b/config/native/after/lsp/golangci_lint.lua → config/nvim/after/lsp/golangci_lint.lua
diff --git a/config/native/after/lsp/gopls.lua → config/nvim/after/lsp/gopls.lua b/config/native/after/lsp/gopls.lua → config/nvim/after/lsp/gopls.lua
diff --git a/config/native/after/lsp/jsonls.lua → config/nvim/after/lsp/jsonls.lua b/config/native/after/lsp/jsonls.lua → config/nvim/after/lsp/jsonls.lua
diff --git a/config/native/after/lsp/ltex.lua → config/nvim/after/lsp/ltex.lua b/config/native/after/lsp/ltex.lua → config/nvim/after/lsp/ltex.lua
diff --git a/config/native/after/lsp/lua_ls.lua → config/nvim/after/lsp/lua_ls.lua b/config/native/after/lsp/lua_ls.lua → config/nvim/after/lsp/lua_ls.lua
diff --git a/config/native/after/lsp/nixd.lua → config/nvim/after/lsp/nixd.lua b/config/native/after/lsp/nixd.lua → config/nvim/after/lsp/nixd.lua
diff --git a/config/native/after/lsp/prettier.lua → config/nvim/after/lsp/prettier.lua b/config/native/after/lsp/prettier.lua → config/nvim/after/lsp/prettier.lua
diff --git a/config/native/after/lsp/pyefm.lua → config/nvim/after/lsp/pyefm.lua b/config/native/after/lsp/pyefm.lua → config/nvim/after/lsp/pyefm.lua
diff --git a/config/native/after/lsp/pyright.lua → config/nvim/after/lsp/pyright.lua b/config/native/after/lsp/pyright.lua → config/nvim/after/lsp/pyright.lua
diff --git a/config/native/after/lsp/rust_analyzer.lua → config/nvim/after/lsp/rust_analyzer.lua b/config/native/after/lsp/rust_analyzer.lua → config/nvim/after/lsp/rust_analyzer.lua
diff --git a/config/native/after/lsp/sh.lua → config/nvim/after/lsp/sh.lua b/config/native/after/lsp/sh.lua → config/nvim/after/lsp/sh.lua
diff --git a/config/native/after/lsp/stylua.lua → config/nvim/after/lsp/stylua.lua b/config/native/after/lsp/stylua.lua → config/nvim/after/lsp/stylua.lua
diff --git a/config/native/after/lsp/taplo.lua → config/nvim/after/lsp/taplo.lua b/config/native/after/lsp/taplo.lua → config/nvim/after/lsp/taplo.lua
diff --git a/config/native/after/lsp/terraform-ls.lua → config/nvim/after/lsp/terraform-ls.lua b/config/native/after/lsp/terraform-ls.lua → config/nvim/after/lsp/terraform-ls.lua
diff --git a/config/native/after/lsp/yamlls.lua → config/nvim/after/lsp/yamlls.lua b/config/native/after/lsp/yamlls.lua → config/nvim/after/lsp/yamlls.lua
diff --git a/config/native/after/lsp/zls.lua → config/nvim/after/lsp/zls.lua b/config/native/after/lsp/zls.lua → config/nvim/after/lsp/zls.lua
diff --git a/config/native/filetype.lua → config/nvim/filetype.lua b/config/native/filetype.lua → config/nvim/filetype.lua
diff --git a/config/native/init.lua → config/nvim/init.lua b/config/native/init.lua → config/nvim/init.lua
diff --git a/config/native/lua/pde/colorscheme.lua → config/nvim/lua/pde/colorscheme.lua b/config/native/lua/pde/colorscheme.lua → config/nvim/lua/pde/colorscheme.lua
diff --git a/config/native/lua/pde/dap/configs/cs.lua → config/nvim/lua/pde/dap/configs/cs.lua b/config/native/lua/pde/dap/configs/cs.lua → config/nvim/lua/pde/dap/configs/cs.lua
diff --git a/config/native/lua/pde/dap/configs/go.lua → config/nvim/lua/pde/dap/configs/go.lua b/config/native/lua/pde/dap/configs/go.lua → config/nvim/lua/pde/dap/configs/go.lua
diff --git a/config/native/lua/pde/dap/configs/python.lua → config/nvim/lua/pde/dap/configs/python.lua b/config/native/lua/pde/dap/configs/python.lua → config/nvim/lua/pde/dap/configs/python.lua
diff --git a/config/native/lua/pde/dap/init.lua → config/nvim/lua/pde/dap/init.lua b/config/native/lua/pde/dap/init.lua → config/nvim/lua/pde/dap/init.lua
diff --git a/config/native/lua/pde/dap/pickers.lua → config/nvim/lua/pde/dap/pickers.lua b/config/native/lua/pde/dap/pickers.lua → config/nvim/lua/pde/dap/pickers.lua
diff --git a/config/native/lua/pde/floating-input.lua → config/nvim/lua/pde/floating-input.lua b/config/native/lua/pde/floating-input.lua → config/nvim/lua/pde/floating-input.lua
diff --git a/config/native/lua/pde/fs.lua → config/nvim/lua/pde/fs.lua b/config/native/lua/pde/fs.lua → config/nvim/lua/pde/fs.lua
diff --git a/config/native/lua/pde/globals.lua → config/nvim/lua/pde/globals.lua b/config/native/lua/pde/globals.lua → config/nvim/lua/pde/globals.lua
diff --git a/config/native/lua/pde/loader.lua → config/nvim/lua/pde/loader.lua b/config/native/lua/pde/loader.lua → config/nvim/lua/pde/loader.lua
diff --git a/config/native/lua/pde/lsp/augroups.lua → config/nvim/lua/pde/lsp/augroups.lua b/config/native/lua/pde/lsp/augroups.lua → config/nvim/lua/pde/lsp/augroups.lua
diff --git a/...sp/capabilities/textDocument_codeLens.lua → ...sp/capabilities/textDocument_codeLens.lua b/...sp/capabilities/textDocument_codeLens.lua → ...sp/capabilities/textDocument_codeLens.lua
diff --git a/...lities/textDocument_documentHighlight.lua → ...lities/textDocument_documentHighlight.lua b/...lities/textDocument_documentHighlight.lua → ...lities/textDocument_documentHighlight.lua
diff --git a/...apabilities/textDocument_foldingRange.lua → ...apabilities/textDocument_foldingRange.lua b/...apabilities/textDocument_foldingRange.lua → ...apabilities/textDocument_foldingRange.lua
diff --git a/.../capabilities/textDocument_formatting.lua → .../capabilities/textDocument_formatting.lua b/.../capabilities/textDocument_formatting.lua → .../capabilities/textDocument_formatting.lua
diff --git a/...p/capabilities/textDocument_inlayHint.lua → ...p/capabilities/textDocument_inlayHint.lua b/...p/capabilities/textDocument_inlayHint.lua → ...p/capabilities/textDocument_inlayHint.lua
diff --git a/config/native/lua/pde/lsp/commands.lua → config/nvim/lua/pde/lsp/commands.lua b/config/native/lua/pde/lsp/commands.lua → config/nvim/lua/pde/lsp/commands.lua
diff --git a/config/native/lua/pde/lsp/completion.lua → config/nvim/lua/pde/lsp/completion.lua b/config/native/lua/pde/lsp/completion.lua → config/nvim/lua/pde/lsp/completion.lua
diff --git a/.../native/lua/pde/lsp/configs/efm/black.lua → ...ig/nvim/lua/pde/lsp/configs/efm/black.lua b/.../native/lua/pde/lsp/configs/efm/black.lua → ...ig/nvim/lua/pde/lsp/configs/efm/black.lua
diff --git a/...lua/pde/lsp/configs/efm/golangci_lint.lua → ...lua/pde/lsp/configs/efm/golangci_lint.lua b/...lua/pde/lsp/configs/efm/golangci_lint.lua → ...lua/pde/lsp/configs/efm/golangci_lint.lua
diff --git a/...g/native/lua/pde/lsp/configs/efm/init.lua → config/nvim/lua/pde/lsp/configs/efm/init.lua b/...g/native/lua/pde/lsp/configs/efm/init.lua → config/nvim/lua/pde/lsp/configs/efm/init.lua
diff --git a/.../native/lua/pde/lsp/configs/efm/isort.lua → ...ig/nvim/lua/pde/lsp/configs/efm/isort.lua b/.../native/lua/pde/lsp/configs/efm/isort.lua → ...ig/nvim/lua/pde/lsp/configs/efm/isort.lua
diff --git a/config/native/lua/pde/lsp/configs/efm/jq.lua → config/nvim/lua/pde/lsp/configs/efm/jq.lua b/config/native/lua/pde/lsp/configs/efm/jq.lua → config/nvim/lua/pde/lsp/configs/efm/jq.lua
diff --git a/...tive/lua/pde/lsp/configs/efm/prettier.lua → ...nvim/lua/pde/lsp/configs/efm/prettier.lua b/...tive/lua/pde/lsp/configs/efm/prettier.lua → ...nvim/lua/pde/lsp/configs/efm/prettier.lua
diff --git a/...ve/lua/pde/lsp/configs/efm/shellcheck.lua → ...im/lua/pde/lsp/configs/efm/shellcheck.lua b/...ve/lua/pde/lsp/configs/efm/shellcheck.lua → ...im/lua/pde/lsp/configs/efm/shellcheck.lua
diff --git a/.../native/lua/pde/lsp/configs/efm/shfmt.lua → ...ig/nvim/lua/pde/lsp/configs/efm/shfmt.lua b/.../native/lua/pde/lsp/configs/efm/shfmt.lua → ...ig/nvim/lua/pde/lsp/configs/efm/shfmt.lua
diff --git a/...native/lua/pde/lsp/configs/efm/stylua.lua → ...g/nvim/lua/pde/lsp/configs/efm/stylua.lua b/...native/lua/pde/lsp/configs/efm/stylua.lua → ...g/nvim/lua/pde/lsp/configs/efm/stylua.lua
diff --git a/.../native/lua/pde/lsp/configs/efm/taplo.lua → ...ig/nvim/lua/pde/lsp/configs/efm/taplo.lua b/.../native/lua/pde/lsp/configs/efm/taplo.lua → ...ig/nvim/lua/pde/lsp/configs/efm/taplo.lua
diff --git a/config/native/lua/pde/lsp/configs/roslyn.lua → config/nvim/lua/pde/lsp/configs/roslyn.lua b/config/native/lua/pde/lsp/configs/roslyn.lua → config/nvim/lua/pde/lsp/configs/roslyn.lua
diff --git a/config/native/lua/pde/lsp/event_handlers.lua → config/nvim/lua/pde/lsp/event_handlers.lua b/config/native/lua/pde/lsp/event_handlers.lua → config/nvim/lua/pde/lsp/event_handlers.lua
diff --git a/config/native/lua/pde/lsp/init.lua → config/nvim/lua/pde/lsp/init.lua b/config/native/lua/pde/lsp/init.lua → config/nvim/lua/pde/lsp/init.lua
diff --git a/config/native/lua/pde/lsp/keymapper.lua → config/nvim/lua/pde/lsp/keymapper.lua b/config/native/lua/pde/lsp/keymapper.lua → config/nvim/lua/pde/lsp/keymapper.lua
diff --git a/config/native/lua/pde/lsp/progress.lua → config/nvim/lua/pde/lsp/progress.lua b/config/native/lua/pde/lsp/progress.lua → config/nvim/lua/pde/lsp/progress.lua
diff --git a/config/native/lua/pde/notes/init.lua → config/nvim/lua/pde/notes/init.lua b/config/native/lua/pde/notes/init.lua → config/nvim/lua/pde/notes/init.lua
diff --git a/config/native/lua/pde/paths.lua → config/nvim/lua/pde/paths.lua b/config/native/lua/pde/paths.lua → config/nvim/lua/pde/paths.lua
diff --git a/config/native/lua/pde/persistence.lua → config/nvim/lua/pde/persistence.lua b/config/native/lua/pde/persistence.lua → config/nvim/lua/pde/persistence.lua
diff --git a/config/native/lua/pde/runner.lua → config/nvim/lua/pde/runner.lua b/config/native/lua/pde/runner.lua → config/nvim/lua/pde/runner.lua
diff --git a/.../native/lua/pde/statusline/components.lua → ...ig/nvim/lua/pde/statusline/components.lua b/.../native/lua/pde/statusline/components.lua → ...ig/nvim/lua/pde/statusline/components.lua
diff --git a/.../native/lua/pde/statusline/conditions.lua → ...ig/nvim/lua/pde/statusline/conditions.lua b/.../native/lua/pde/statusline/conditions.lua → ...ig/nvim/lua/pde/statusline/conditions.lua
diff --git a/config/native/lua/pde/statusline/icons.lua → config/nvim/lua/pde/statusline/icons.lua b/config/native/lua/pde/statusline/icons.lua → config/nvim/lua/pde/statusline/icons.lua
diff --git a/config/native/lua/pde/statusline/init.lua → config/nvim/lua/pde/statusline/init.lua b/config/native/lua/pde/statusline/init.lua → config/nvim/lua/pde/statusline/init.lua
diff --git a/config/native/lua/pde/statusline/updates.lua → config/nvim/lua/pde/statusline/updates.lua b/config/native/lua/pde/statusline/updates.lua → config/nvim/lua/pde/statusline/updates.lua
diff --git a/config/native/lua/pde/statusline/utils.lua → config/nvim/lua/pde/statusline/utils.lua b/config/native/lua/pde/statusline/utils.lua → config/nvim/lua/pde/statusline/utils.lua
diff --git a/...g/native/lua/pde/unimpaired/functions.lua → config/nvim/lua/pde/unimpaired/functions.lua b/...g/native/lua/pde/unimpaired/functions.lua → config/nvim/lua/pde/unimpaired/functions.lua
diff --git a/config/native/lua/pde/unimpaired/init.lua → config/nvim/lua/pde/unimpaired/init.lua b/config/native/lua/pde/unimpaired/init.lua → config/nvim/lua/pde/unimpaired/init.lua
diff --git a/config/native/lua/pde/unimpaired/keymaps.lua → config/nvim/lua/pde/unimpaired/keymaps.lua b/config/native/lua/pde/unimpaired/keymaps.lua → config/nvim/lua/pde/unimpaired/keymaps.lua
diff --git a/config/native/plugin/autotrim.lua → config/nvim/plugin/autotrim.lua b/config/native/plugin/autotrim.lua → config/nvim/plugin/autotrim.lua
diff --git a/config/native/plugin/blink.lua → config/nvim/plugin/blink.lua b/config/native/plugin/blink.lua → config/nvim/plugin/blink.lua
diff --git a/config/native/plugin/boole.lua → config/nvim/plugin/boole.lua b/config/native/plugin/boole.lua → config/nvim/plugin/boole.lua
diff --git a/config/native/plugin/colorcolumn.lua → config/nvim/plugin/colorcolumn.lua b/config/native/plugin/colorcolumn.lua → config/nvim/plugin/colorcolumn.lua
diff --git a/config/native/plugin/completion.lua → config/nvim/plugin/completion.lua b/config/native/plugin/completion.lua → config/nvim/plugin/completion.lua
diff --git a/config/native/plugin/dap.lua → config/nvim/plugin/dap.lua b/config/native/plugin/dap.lua → config/nvim/plugin/dap.lua
diff --git a/config/native/plugin/diagnostic.lua → config/nvim/plugin/diagnostic.lua b/config/native/plugin/diagnostic.lua → config/nvim/plugin/diagnostic.lua
diff --git a/config/native/plugin/floating-input.lua → config/nvim/plugin/floating-input.lua b/config/native/plugin/floating-input.lua → config/nvim/plugin/floating-input.lua
diff --git a/config/native/plugin/folds.lua → config/nvim/plugin/folds.lua b/config/native/plugin/folds.lua → config/nvim/plugin/folds.lua
diff --git a/config/native/plugin/git-conflict.lua → config/nvim/plugin/git-conflict.lua b/config/native/plugin/git-conflict.lua → config/nvim/plugin/git-conflict.lua
diff --git a/config/native/plugin/gitsigns.lua → config/nvim/plugin/gitsigns.lua b/config/native/plugin/gitsigns.lua → config/nvim/plugin/gitsigns.lua
diff --git a/config/native/plugin/highlightonyank.lua → config/nvim/plugin/highlightonyank.lua b/config/native/plugin/highlightonyank.lua → config/nvim/plugin/highlightonyank.lua
diff --git a/config/native/plugin/linenumbers.lua → config/nvim/plugin/linenumbers.lua b/config/native/plugin/linenumbers.lua → config/nvim/plugin/linenumbers.lua
diff --git a/config/native/plugin/lsp.lua → config/nvim/plugin/lsp.lua b/config/native/plugin/lsp.lua → config/nvim/plugin/lsp.lua
diff --git a/config/native/plugin/neo-tree.lua → config/nvim/plugin/neo-tree.lua b/config/native/plugin/neo-tree.lua → config/nvim/plugin/neo-tree.lua
diff --git a/config/native/plugin/notes.lua → config/nvim/plugin/notes.lua b/config/native/plugin/notes.lua → config/nvim/plugin/notes.lua
diff --git a/config/native/plugin/options.lua → config/nvim/plugin/options.lua b/config/native/plugin/options.lua → config/nvim/plugin/options.lua
diff --git a/config/native/plugin/roslyn_ls.lua → config/nvim/plugin/roslyn_ls.lua b/config/native/plugin/roslyn_ls.lua → config/nvim/plugin/roslyn_ls.lua
diff --git a/config/native/plugin/skeletons.lua → config/nvim/plugin/skeletons.lua b/config/native/plugin/skeletons.lua → config/nvim/plugin/skeletons.lua
diff --git a/config/native/plugin/snacks.lua → config/nvim/plugin/snacks.lua b/config/native/plugin/snacks.lua → config/nvim/plugin/snacks.lua
diff --git a/config/native/plugin/snippets.lua → config/nvim/plugin/snippets.lua b/config/native/plugin/snippets.lua → config/nvim/plugin/snippets.lua
diff --git a/config/native/plugin/spell.lua → config/nvim/plugin/spell.lua b/config/native/plugin/spell.lua → config/nvim/plugin/spell.lua
diff --git a/config/native/plugin/statusline.lua → config/nvim/plugin/statusline.lua b/config/native/plugin/statusline.lua → config/nvim/plugin/statusline.lua
diff --git a/config/native/plugin/telescope.lua → config/nvim/plugin/telescope.lua b/config/native/plugin/telescope.lua → config/nvim/plugin/telescope.lua
diff --git a/config/native/plugin/todo-comments.lua → config/nvim/plugin/todo-comments.lua b/config/native/plugin/todo-comments.lua → config/nvim/plugin/todo-comments.lua
diff --git a/config/native/plugin/treesitter-context.lua → config/nvim/plugin/treesitter-context.lua b/config/native/plugin/treesitter-context.lua → config/nvim/plugin/treesitter-context.lua
diff --git a/config/native/plugin/treesitter.lua → config/nvim/plugin/treesitter.lua b/config/native/plugin/treesitter.lua → config/nvim/plugin/treesitter.lua
diff --git a/config/native/plugin/undotree.lua → config/nvim/plugin/undotree.lua b/config/native/plugin/undotree.lua → config/nvim/plugin/undotree.lua
diff --git a/config/native/plugin/unimpaired.lua → config/nvim/plugin/unimpaired.lua b/config/native/plugin/unimpaired.lua → config/nvim/plugin/unimpaired.lua
diff --git a/config/native/plugin/which-key.lua → config/nvim/plugin/which-key.lua b/config/native/plugin/which-key.lua → config/nvim/plugin/which-key.lua
diff --git a/config/native/snippets/all.json → config/nvim/snippets/all.json b/config/native/snippets/all.json → config/nvim/snippets/all.json
diff --git a/flake/checks.nix b/flake/checks.nix
@@ -16,7 +16,7 @@
                 path = fs.toSource {
                   root = ./..;
                   fileset = fs.unions [
-                    ./../config/native
+                    ./../config/nvim
                     ./../.luacheckrc
                   ];
                 };
@@ -30,10 +30,10 @@
         in
         {
           luacheck = makeCheckJob "luacheck" ''
-            ${pkgs.lua.pkgs.luacheck}/bin/luacheck --codes --no-cache ./config/native
+            ${pkgs.lua.pkgs.luacheck}/bin/luacheck --codes --no-cache ./config/nvim
           '';
           typecheck = makeCheckJob "typecheck" ''
-            ${self'.packages.nvim-typecheck}/bin/nvim-typecheck ./config/native
+            ${self'.packages.nvim-typecheck}/bin/nvim-typecheck ./config/nvim
           '';
         };
     };

diff --git a/flake/devshells.nix b/flake/devshells.nix
@@ -13,7 +13,7 @@
             +
               # bash
               ''
-                ln -fs ${self'.packages.full-luarc-json} ./config/native/.luarc.json
+                ln -fs ${self'.packages.full-luarc-json} ./config/nvim/.luarc.json
                 ln -fs ${self'.packages.no-plugins-luarc-json} ./.luarc.json
               '';
           packages =

diff --git a/flake/packages/neovim-pde-dev.nix b/flake/packages/neovim-pde-dev.nix
@@ -7,24 +7,23 @@
 let
   devConfig = config.override { onlyNix = true; };
   pkg = neovim-pde.override {
-    # this is a hack to load everything in 'native' folder
-    appName = "native";
+    appName = "nvim";
     selfContained = false;
     devMode = true;
     config = devConfig;
   };
 in
 (writeShellScriptBin "nvim-dev" ''
-  if [[ ! $NVIM_PDE_DEV_NATIVE_CONFIG_PATH ]]; then
-    echo "must set NVIM_PDE_DEV_NATIVE_CONFIG_PATH"
+  if [[ ! $NVIM_PDE_DEV_CONFIG_PATH ]]; then
+    echo "must set NVIM_PDE_DEV_CONFIG_PATH"
     exit 1
   fi
 
-  XDG_CONFIG_DIRS="${devConfig}:$NVIM_PDE_DEV_NATIVE_CONFIG_PATH" \
-    ${lib.getExe pkg} -u $NVIM_PDE_DEV_NATIVE_CONFIG_PATH/native/init.lua "$@"
+  XDG_CONFIG_DIRS="${devConfig}:$NVIM_PDE_DEV_CONFIG_PATH" \
+    ${lib.getExe pkg} -u $NVIM_PDE_DEV_CONFIG_PATH/nvim/init.lua "$@"
 '').overrideAttrs
   {
     shellHook = ''
-      export NVIM_PDE_DEV_NATIVE_CONFIG_PATH="$PWD/config"
+      export NVIM_PDE_DEV_CONFIG_PATH="$PWD/config"
     '';
   }
diff --git a/readme.md b/readme.md
@@ -22,7 +22,7 @@ to configure Neovim.
 ## Things to note
 
 -   Uses `NVIM_APPNAME` to differentiate from other Neovim instances. It's set to `neovim-pde` or `neovim-pde-hm` for
-    home-manager or `native` when running in "dev mode" (configurable).
+    home-manager (configurable) or `nvim` when running in "dev mode".
 
 ### Home Manager
 
@@ -48,7 +48,7 @@ You always need to rebuild it, but `nix build` and then `./result/bin/nvim` is q
 
 Another solution implemented in this repo is `nvim-dev` command that becomes available inside devShell here.
 It runs the neovim package defined in the repo with plugins and `nix`-generated lua files provided, but the native lua
-config gets read "live" from `./config/native` here in the repo. This allows for instant feedback and dynamic
+config gets read "live" from `./config/nvim` here in the repo. This allows for instant feedback and dynamic
 development just like when using neovim without nix.
 
 ## Notes