diff --git a/.zshrc b/.zshrc
index 828c5be..61e50f4 100644
--- a/.zshrc
+++ b/.zshrc
@@ -29,6 +29,8 @@ export TEXMFHOME=$HOME/.texmf
 export MANGOHUD_CONFIG=position=top-right,font_scale=0.7,round_corners=10.0
 export MOZ_ENABLE_WAYLAND=1
 export QT_AUTO_SCREEN_SCALE_FACTOR=0
+export VISUAL=nvim;
+export EDITOR=nvim;
 
 alias sudo='sudo '
 alias ls='lsd'
diff --git a/nvim/init.lua b/nvim/init.lua
index a3aab20..6ee560e 100644
--- a/nvim/init.lua
+++ b/nvim/init.lua
@@ -34,17 +34,3 @@ require("nvim-highlight-colors").setup {
 	enable_named_colors = true,
 	enable_tailwind = true,
 }
--- colorscheme
-local options = {
-  transparent = false,
-}
-local palettes = {
-  nightfox = {
-    bg1 = "#1A1B27",
-  },
-}
-require("nightfox").setup({
-  palettes = palettes,
-  options = options,
-})
-vim.cmd("colorscheme nightfox")
diff --git a/nvim/lua/settings/autocommands.lua b/nvim/lua/settings/autocommands.lua
index f8966ef..0c39313 100644
--- a/nvim/lua/settings/autocommands.lua
+++ b/nvim/lua/settings/autocommands.lua
@@ -1,6 +1,21 @@
 vim.cmd('let g:vimtex_view_general_viewer = "evince"')
 vim.cmd('let g:vimtex_compiler_method = "latexmk"')
 
+-- colorscheme
+local options = {
+  transparent = false,
+}
+local palettes = {
+  nightfox = {
+    bg1 = "#1A1B27",
+  },
+}
+require("nightfox").setup({
+  palettes = palettes,
+  options = options,
+})
+vim.cmd("colorscheme nightfox")
+
 vim.cmd([[highlight TabLineSel guifg=#192330 guibg=#192330]])
 vim.cmd([[highlight BufferCurrent guifg=#FFFFFF guibg=#192330]])
 vim.cmd([[highlight BufferCurrentIndex guifg=#FFFFFF guibg=#192330]])
@@ -12,3 +27,4 @@ vim.cmd([[highlight BufferInactiveMod guifg=#dbc074 guibg=#131a24]])
 vim.cmd([[highlight BufferInactiveSign guifg=#719cd6 guibg=#131a24]])
 
 vim.cmd([[highlight LspInlayHint guibg=#192330]])
+