diff --git a/home-manager/neovim/default.nix b/home-manager/neovim/default.nix
index adae6ef..cd30a2a 100644
--- a/home-manager/neovim/default.nix
+++ b/home-manager/neovim/default.nix
@@ -1,18 +1,45 @@
-{ pkgs, theme, ... }:
-let
-  pkg_src = pkgs.unstable;
-in
+{ config, lib, pkgs, user, theme, ... }:
+
 {
+  home.packages = with pkgs.unstable; [
+    xclip
+
+    # language servers
+    lua-language-server
+    terraform-ls
+    tflint
+    nodejs
+    nodePackages.bash-language-server
+    nodePackages.yaml-language-server
+    nodePackages.prettier
+    nodePackages.eslint_d
+    nodePackages.typescript-language-server
+    nodePackages.typescript
+    nodePackages.dockerfile-language-server-nodejs
+    nodePackages.vscode-langservers-extracted
+    nodePackages.volar
+    lldb
+    vscode-extensions.vadimcn.vscode-lldb
+    marksman
+    clang-tools
+    cmake-language-server
+    texlab
+    nixd
+    nixpkgs-fmt
+  ];
 
   # symlink for a stable path 
-  home.file.".vscode-extensions/vscode-lldb".source = pkg_src.vscode-extensions.vadimcn.vscode-lldb;
+  home.file.".vscode-extensions/vscode-lldb".source = pkgs.unstable.vscode-extensions.vadimcn.vscode-lldb;
+
+  home.sessionVariables = {
+    EDITOR = "nvim";
+  };
 
   programs = {
     neovim = {
       enable = true;
-      package = pkg_src.neovim-unwrapped;
-      defaultEditor = true;
-      plugins = with pkg_src.vimPlugins; [
+      package = pkgs.unstable.neovim-unwrapped;
+      plugins = with pkgs.unstable.vimPlugins; [
         # theme
         nvim-solarized-lua
 
@@ -84,41 +111,6 @@ in
         # debugging
         nvim-dap
         nvim-dap-ui
-
-        # neorg 
-        neorg
-        neorg-telescope
-      ];
-
-      withNodeJs = true;
-
-      extraPackages = with pkg_src; [
-        # language servers
-        lua-language-server
-        terraform-ls
-        tflint
-        nodePackages.bash-language-server
-        nodePackages.yaml-language-server
-        nodePackages.prettier
-        nodePackages.eslint_d
-        nodePackages.typescript-language-server
-        nodePackages.typescript
-        nodePackages.dockerfile-language-server-nodejs
-        nodePackages.vscode-langservers-extracted
-        nodePackages.volar
-        lldb
-        vscode-extensions.vadimcn.vscode-lldb
-        marksman
-        clang-tools
-        cmake-language-server
-        texlab
-        nixd
-        nixpkgs-fmt
-      ];
-
-      extraLuaPackages = luaPackages: [
-        luaPackages.lua-utils-nvim
-        luaPackages.pathlib-nvim
       ];
 
       extraConfig = ''
@@ -153,7 +145,6 @@ in
 
             ${builtins.readFile ./project-nvim.lua }
             ${builtins.readFile ./dap.lua }
-            ${builtins.readFile ./neorg.lua }
 
             vim.g.gitblame_date_format = "%r"
 
diff --git a/home-manager/neovim/neorg.lua b/home-manager/neovim/neorg.lua
index eb9fe84..2296608 100644
--- a/home-manager/neovim/neorg.lua
+++ b/home-manager/neovim/neorg.lua
@@ -2,15 +2,6 @@ local neorg = require("neorg")
 
 neorg.setup({
     load = {
-        ["core.defaults"] = {},
-        ["core.concealer"] = {},
-        ["core.dirman"] = {
-            config = {
-                workspaces = {
-                    notes = "~/notes",
-                },
-                default_workspace = "notes",
-            },
-        },
+        ["core.defaults"] = {}
     }
 })