diff --git a/home-manager/modules/tippy/nvim.nix b/home-manager/modules/tippy/nvim.nix
index e4dccb8..1d53367 100644
--- a/home-manager/modules/tippy/nvim.nix
+++ b/home-manager/modules/tippy/nvim.nix
@@ -7,21 +7,22 @@
 {
   programs.neovim = {
     enable = true;
-    # package = pkgs.neovim-nightly;
-    # package = pkgs.neovim.override {
-    #   lua = pkgs.luajit;
-    # };
+    defaultEditor = true;
     viAlias = false;
     vimAlias = true;
     vimdiffAlias = true;
-    withNodeJs = false;
+    withNodeJs = true;
     withRuby = false;
     withPython3 = false;
-    defaultEditor = true;
     coc.enable = false;
-    # plugins = [ pkgs.vimPlugins.nvim-treesitter.withAllGrammars ];
     extraPackages = with pkgs; [
-      # luajitPackages.luarocks
+      (lua5_1.withPackages (
+        ps: with ps; [
+          luarocks
+          luv
+        ]
+      ))
+      imagemagick
     ];
   };
 
@@ -61,11 +62,11 @@
     recursive = true;
     force = true;
   };
-  xdg.dataFile."nvim/lazy/nvim-treesitter" = {
-    source = "${pkgs.vimPlugins.nvim-treesitter.withAllGrammars.outPath}";
-    recursive = true;
-    force = true;
-  };
+  # xdg.dataFile."nvim/lazy/nvim-treesitter" = {
+  #   source = "${pkgs.vimPlugins.nvim-treesitter.withAllGrammars.outPath}";
+  #   recursive = true;
+  #   force = true;
+  # };
 
   home.global-persistence = {
     directories = [
@@ -78,11 +79,8 @@
   home.packages = with pkgs; [
     unzip
     gnumake
-    luajitPackages.luarocks-nix
     gcc
     rust-bin.nightly.latest.minimal
-    # luarocks-nix
-    # luajit
     # lsps
     nil
     nixd
diff --git a/nixos/modules/base/baseline-apps.nix b/nixos/modules/base/baseline-apps.nix
index 39e0f98..2eb47e6 100644
--- a/nixos/modules/base/baseline-apps.nix
+++ b/nixos/modules/base/baseline-apps.nix
@@ -26,7 +26,12 @@
     mosh.enable = true;
     mtr.enable = true;
     traceroute.enable = true;
-
+    # neovim = {
+    #   enable = true;
+    #   defaultEditor = true;
+    #   vimAlias = true;
+    #   viAlias = false;
+    # };
     fuse = {
       mountMax = 32767;
       userAllowOther = true;
@@ -57,5 +62,13 @@
     fd
     nix-output-monitor
     nix-tree
+    # # neovim
+    # unzip
+    # gnumake
+    # luajit
+    # luaPackages.lua
+    # luajitPackages.luarocks
+    # luajitPackages.magick
+    # gcc
   ];
 }