diff --git a/.gitignore b/.gitignore
index ed021f5..60301a4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,9 +2,8 @@ weechat/.weechat/*.log
 weechat/.weechat/logs
 weechat/.weechat/script/
 weechat/.weechat/sec.conf
-vim/.vim/.netrwhist
-vim/.vim/plugged
-vim/.vim/autoload
+neovim/.config/nvim/.netrwhist
+neovim/.config/nvim/plugged
 deluge/.config/deluge/state/
 deluge/.config/deluge/*.state
 deluge/.config/deluge/icons/
diff --git a/fish/.config/fish/config.fish b/fish/.config/fish/config.fish
index 34f7075..2a46a87 100644
--- a/fish/.config/fish/config.fish
+++ b/fish/.config/fish/config.fish
@@ -1,5 +1,5 @@
 # Text Editor
-set -x EDITOR vim
+set -x EDITOR nvim
 
 # Man colors
 set -g man_standout -o blue
@@ -8,11 +8,12 @@ set -g man_bold -o magenta
 # Aliases
 alias f "fff"
 alias bc "bc -l"
+alias vim "nvim"
 alias docker-compose "podman-compose"
 alias hdmi-audio "pactl set-card-profile 0 output:hdmi-stereo-extra1"
 alias laptop-audio "pacmd set-card-profile 0 output:analog-stereo+input:analog-stereo"
 alias sc "systemctl"
-alias jc "journalctl -eu"
+alias jc "journalctl -fu"
 
 # Additional paths
 set PATH $PATH $HOME/.emacs.d/bin
diff --git a/vim/.vim/UltiSnips/markdown.snippets b/neovim/.config/nvim/UltiSnips/markdown.snippets
similarity index 100%
rename from vim/.vim/UltiSnips/markdown.snippets
rename to neovim/.config/nvim/UltiSnips/markdown.snippets
diff --git a/vim/.vimrc b/neovim/.config/nvim/init.vim
similarity index 92%
rename from vim/.vimrc
rename to neovim/.config/nvim/init.vim
index 7a1d4e6..d1a78cf 100644
--- a/vim/.vimrc
+++ b/neovim/.config/nvim/init.vim
@@ -31,7 +31,7 @@ let g:UltiSnipsExpandTrigger = '<tab>'
 let g:UltiSnipsJumpForwardTrigger = '<tab>'
 let g:UltiSnipsJumpBackwardTrigger = '<s-tab>'
 ""Vim-plug
-call plug#begin('~/.vim/plugged')
+call plug#begin('~/.config/nvim/plugged')
 Plug 'plasticboy/vim-markdown', { 'for': 'markdown' }
 Plug 'junegunn/goyo.vim', { 'on': 'Goyo' }
 Plug 'SirVer/ultisnips', { 'for': 'markdown' }
@@ -42,9 +42,6 @@ call plug#end()
 colorscheme iceberg
 set bg=dark
 set termguicolors
-""Sets the colorscheme in tmux
-let &t_8f = "\<Esc>[38;2;%lu;%lu;%lum"
-let &t_8b = "\<Esc>[48;2;%lu;%lu;%lum"
 ""Disabe status line
 set laststatus=0
 ""Set Markdown filetype for neomutt