From d86f8477fc98e8869d8ee16728b4520c8a334eb1 Mon Sep 17 00:00:00 2001
From: coolneng <akasroua@gmail.com>
Date: Thu, 22 Oct 2020 14:24:36 +0200
Subject: [PATCH] Migrate from neovim to vim

---
 .gitignore                                                   | 5 +++--
 fish/.config/fish/config.fish                                | 5 ++---
 .../.config/nvim => vim/.vim}/UltiSnips/markdown.snippets    | 0
 neovim/.config/nvim/init.vim => vim/.vimrc                   | 5 ++++-
 4 files changed, 9 insertions(+), 6 deletions(-)
 rename {neovim/.config/nvim => vim/.vim}/UltiSnips/markdown.snippets (100%)
 rename neovim/.config/nvim/init.vim => vim/.vimrc (92%)

diff --git a/.gitignore b/.gitignore
index 60301a4..ed021f5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,8 +2,9 @@ weechat/.weechat/*.log
 weechat/.weechat/logs
 weechat/.weechat/script/
 weechat/.weechat/sec.conf
-neovim/.config/nvim/.netrwhist
-neovim/.config/nvim/plugged
+vim/.vim/.netrwhist
+vim/.vim/plugged
+vim/.vim/autoload
 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 2a46a87..34f7075 100644
--- a/fish/.config/fish/config.fish
+++ b/fish/.config/fish/config.fish
@@ -1,5 +1,5 @@
 # Text Editor
-set -x EDITOR nvim
+set -x EDITOR vim
 
 # Man colors
 set -g man_standout -o blue
@@ -8,12 +8,11 @@ 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 -fu"
+alias jc "journalctl -eu"
 
 # Additional paths
 set PATH $PATH $HOME/.emacs.d/bin
diff --git a/neovim/.config/nvim/UltiSnips/markdown.snippets b/vim/.vim/UltiSnips/markdown.snippets
similarity index 100%
rename from neovim/.config/nvim/UltiSnips/markdown.snippets
rename to vim/.vim/UltiSnips/markdown.snippets
diff --git a/neovim/.config/nvim/init.vim b/vim/.vimrc
similarity index 92%
rename from neovim/.config/nvim/init.vim
rename to vim/.vimrc
index d1a78cf..7a1d4e6 100644
--- a/neovim/.config/nvim/init.vim
+++ b/vim/.vimrc
@@ -31,7 +31,7 @@ let g:UltiSnipsExpandTrigger = '<tab>'
 let g:UltiSnipsJumpForwardTrigger = '<tab>'
 let g:UltiSnipsJumpBackwardTrigger = '<s-tab>'
 ""Vim-plug
-call plug#begin('~/.config/nvim/plugged')
+call plug#begin('~/.vim/plugged')
 Plug 'plasticboy/vim-markdown', { 'for': 'markdown' }
 Plug 'junegunn/goyo.vim', { 'on': 'Goyo' }
 Plug 'SirVer/ultisnips', { 'for': 'markdown' }
@@ -42,6 +42,9 @@ 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