diff --git a/.config/nvim/init.lua b/.config/nvim/init.lua
index a402235..5844566 100644
--- a/.config/nvim/init.lua
+++ b/.config/nvim/init.lua
@@ -1,4 +1,28 @@
+--========================================--
+--     ::-----------------------:         --
+--   .--------------------------:         --
+--    :---------------:--------:          --
+--                     :------.           --
+--                   :------.             --
+--                 .------:         .:::  --
+--                ------:          :----- --
+--              :------.           -----. --
+--            .------:              ...   --
+--          .------:          .::.        --
+--         :------.          :----:       --
+--       .------.          :------.       --
+--     .------:          .------.         --
+--   .------:          .------:           --
+--  :-------:::::::::::------.            --
+-- :-----------------------:              --
+-- .---------------------:                --
+--========================================--
+--        null2264's NeoVim Config        --
+--========================================--
+
+require("null")
+
 -- FIXME: Turn all these to LUA
-vim.cmd('source ~/.config/vim/vim_nix')
-vim.cmd('source ~/.config/vim/vim_uni')
-vim.cmd('source ~/.config/vim/vim_plug')
+vim.cmd("source ~/.config/vim/vim_nix")
+vim.cmd("source ~/.config/vim/vim_uni")
+vim.cmd("source ~/.config/vim/vim_plug")
diff --git a/.config/nvim/lua/null/config.lua b/.config/nvim/lua/null/config.lua
new file mode 100644
index 0000000..e69de29
diff --git a/.config/nvim/lua/null/init.lua b/.config/nvim/lua/null/init.lua
new file mode 100644
index 0000000..b56700e
--- /dev/null
+++ b/.config/nvim/lua/null/init.lua
@@ -0,0 +1,6 @@
+-- vim_uni
+require("null.config")
+-- vim_plug
+require("null.plug")
+-- vim_nix
+require("null.nix")  -- n*x specific stuff
diff --git a/.config/nvim/lua/null/nix.lua b/.config/nvim/lua/null/nix.lua
new file mode 100644
index 0000000..e69de29
diff --git a/.config/nvim/lua/null/plug.lua b/.config/nvim/lua/null/plug.lua
new file mode 100644
index 0000000..e69de29
diff --git a/.config/vim/vim_nix b/.config/vim/vim_nix
index 0dfe915..8d1bc2d 100644
--- a/.config/vim/vim_nix
+++ b/.config/vim/vim_nix
@@ -14,7 +14,11 @@ else
 	set viminfo+='1000,n$XDG_DATA_HOME/nvim/nviminfo
 endif
 set runtimepath=$XDG_CONFIG_HOME/vim,$VIMRUNTIME,$XDG_CONFIG_HOME/vim/after
-let $MYVIMRC="$XDG_CONFIG_HOME/vim/vimrc"
+if !has('nvim')
+	let $MYVIMRC="$XDG_CONFIG_HOME/vim/vimrc"
+else
+	let $MYVIMRC="$XDG_CONFIG_HOME/nvim/init.lua"
+endif
 
 " ----- Mutt
 au BufRead /tmp/mutt-* set tw=72
diff --git a/.config/vim/vim_uni b/.config/vim/vim_uni
index e962d16..63aec03 100644
--- a/.config/vim/vim_uni
+++ b/.config/vim/vim_uni
@@ -11,6 +11,7 @@ set ignorecase
 set smartcase
 set mouse=a
 set background=dark
+set ffs=unix
 " set complete+=kspell
 " set completeopt=menuone,longest
 " set list lcs=trail:·,tab:··\|,nbsp:·