53 files changed, 160 insertions, 476 deletions
diff --git a/TMV/.bashrc b/.bashrc
index dcaf4ef..f43a0f1 100644
--- a/TMV/.bashrc
+++ b/.bashrc
@@ -19,3 +19,9 @@ cat /home/mas/TODO.leny
 
 LS_COLORS='rs=0:di=01;34:ln=01;36:mh=00:pi=40;33:so=01;35:do=01;35:bd=40;33;01:cd=40;33;01:or=40;31;01:mi=00:su=37;41:sg=30;43:ca=30;41:tw=30;42:ow=34;42:st=37;44:ex=01;32:*.tar=01;31:*.tgz=01;31:*.arc=01;31:*.arj=01;31:*.taz=01;31:*.lha=01;31:*.lz4=01;31:*.lzh=01;31:*.lzma=01;31:*.tlz=01;31:*.txz=01;31:*.tzo=01;31:*.t7z=01;31:*.zip=01;31:*.z=01;31:*.dz=01;31:*.gz=01;31:*.lrz=01;31:*.lz=01;31:*.lzo=01;31:*.xz=01;31:*.zst=01;31:*.tzst=01;31:*.bz2=01;31:*.bz=01;31:*.tbz=01;31:*.tbz2=01;31:*.tz=01;31:*.deb=01;31:*.rpm=01;31:*.jar=01;31:*.war=01;31:*.ear=01;31:*.sar=01;31:*.rar=01;31:*.alz=01;31:*.ace=01;31:*.zoo=01;31:*.cpio=01;31:*.7z=01;31:*.rz=01;31:*.cab=01;31:*.wim=01;31:*.swm=01;31:*.dwm=01;31:*.esd=01;31:*.jpg=01;35:*.jpeg=01;35:*.mjpg=01;35:*.mjpeg=01;35:*.gif=01;35:*.bmp=01;35:*.pbm=01;35:*.pgm=01;35:*.ppm=01;35:*.tga=01;35:*.xbm=01;35:*.xpm=01;35:*.tif=01;35:*.tiff=01;35:*.png=01;35:*.svg=01;35:*.svgz=01;35:*.mng=01;35:*.pcx=01;35:*.mov=01;35:*.mpg=01;35:*.mpeg=01;35:*.m2v=01;35:*.mkv=01;35:*.webm=01;35:*.webp=01;35:*.ogm=01;35:*.mp4=01;35:*.m4v=01;35:*.mp4v=01;35:*.vob=01;35:*.qt=01;35:*.nuv=01;35:*.wmv=01;35:*.asf=01;35:*.rm=01;35:*.rmvb=01;35:*.flc=01;35:*.avi=01;35:*.fli=01;35:*.flv=01;35:*.gl=01;35:*.dl=01;35:*.xcf=01;35:*.xwd=01;35:*.yuv=01;35:*.cgm=01;35:*.emf=01;35:*.ogv=01;35:*.ogx=01;35:*.aac=00;36:*.au=00;36:*.flac=00;36:*.m4a=00;36:*.mid=00;36:*.midi=00;36:*.mka=00;36:*.mp3=00;36:*.mpc=00;36:*.ogg=00;36:*.ra=00;36:*.wav=00;36:*.oga=00;36:*.opus=00;36:*.spx=00;36:*.xspf=00;36:*.gba=1;32;45:*.wbfs=1;32;45:';
 export LS_COLORS
+
+PATH="/home/mas/.local/usr/bin:/home/mas/perl5/bin${PATH:+:${PATH}}"; export PATH;
+PERL5LIB="/home/mas/perl5/lib/perl5${PERL5LIB:+:${PERL5LIB}}"; export PERL5LIB;
+PERL_LOCAL_LIB_ROOT="/home/mas/perl5${PERL_LOCAL_LIB_ROOT:+:${PERL_LOCAL_LIB_ROOT}}"; export PERL_LOCAL_LIB_ROOT;
+PERL_MB_OPT="--install_base \"/home/mas/perl5\""; export PERL_MB_OPT;
+PERL_MM_OPT="INSTALL_BASE=/home/mas/perl5"; export PERL_MM_OPT;
diff --git a/TMV/.config/aliasrc b/.config/aliasrc
index af8948d..af8948d 100644
--- a/TMV/.config/aliasrc
+++ b/.config/aliasrc
diff --git a/TMV/.config/directories b/.config/directories
index 5ac49e5..5ac49e5 100644
--- a/TMV/.config/directories
+++ b/.config/directories
diff --git a/TMV/.config/discord/discord.css b/.config/discord/discord.css
index 243ccd7..243ccd7 100644
--- a/TMV/.config/discord/discord.css
+++ b/.config/discord/discord.css
diff --git a/TMV/.config/i3/config b/.config/i3/config
index b7fe139..831a4f3 100644
--- a/TMV/.config/i3/config
+++ b/.config/i3/config
@@ -196,11 +196,11 @@ bar {
 
 ###PERSONAL EDITS###
 
-bindsym $mod+Shift+W exec notify-send -t 5000 -i /home/mas/Pictures/icons/firefox.png "Opening" "<span color='#ff6600' font='26px'><b>firefox</b></span>" ; exec firefox
+bindsym $mod+Shift+W exec notify-send -t 5000 -i /usr/share/icons/hicolor/256x256/apps/firefox.png "Opening" "<span color='#ff6600' font='26px'><b>firefox</b></span>" ; exec firefox
 bindsym $mod+Shift+X exec "i3-nagbar -t warning -f fixed -m 'You pressed the shutting shortcut. Do you really eant to shut you computer?' -B 'Yes, shut it.' 'sudo poweroff'"
 bindsym $mod+Shift+BackSpace exec "i3-nagbar -t warning -f fixed -m 'You pressed the restarting shortcut. Do you really eant to restart you computer?' -B 'Yes, restart it.' 'sudo reboot'"
-bindsym $mod+Shift+T exec notify-send -t 5000 -i /home/mas/Pictures/icons/tor.png "Opening" "<span color='#40ff00' font='26px'><b>tor</b></span>" ; exec tor
-bindsym $mod+Shift+P exec notify-send -t 5000 -i /home/mas/Pictures/icons/firefox.png "Opening" "<span color='#ff6600' font='26px'><b>firefox</b></span>" ; exec firefox --private-window
+bindsym $mod+Shift+T exec notify-send -t 5000 -i /home/mas/Pictures/icons/teams.png "Opening" "<span color='purple' font='26px'><b>Teams</b></span>" ; exec teams
+bindsym $mod+Shift+P exec passmenu
 
 
 exec --no-startup-id feh --bg-scale /home/mas/Pictures/retrowave-pyramid.png
@@ -365,7 +365,14 @@ bindsym XF86AudioNext exec playerctl next
 
 #screenshot
 bindsym Print exec notify-send -t 5000 -i /home/mas/Pictures/icons/screenshot.png "Launching" "<span color='cyan' font='26px'><b>scrot</b></span>" ; exec scrot --silent --exec 'mv $f ~/Pictures && sxiv ~/Pictures/$f'
-bindsym $mod+Shift+C exec notify-send -t 5000 -i /home/mas/Pictures/icons/chromium.png "Opening" "<span color='#5D7FD2' font='26px'><b>chromium</b></span>" ; exec chromium
+bindsym $mod+Shift+C exec notify-send -t 5000 -i /usr/share/icons/hicolor/256x256/apps/chromium.png "Opening" "<span color='#5D7FD2' font='26px'><b>chromium</b></span>" ; exec chromium
+
 
 bindsym $mod+F10 exec dmenumount
 bindsym $mod+F11 exec dmenuumount
+
+bindsym $mod+Shift+V exec notify-send -t 5000 -i /usr/share/icons/hicolor/128x128/mimetypes/virtualbox.png "Launching" "<span color='blue' font='26px'><b>VirtualBox</b></span>" ; exec VirtualBox
+bindsym $mod+Shift+M exec notify-send -t 5000 -i /usr/share/icons/hicolor/256x256/apps/thunderbird.png "Launching" "<span color='blue' font='26px'><b>Thunderbird</b></span>" ; exec thunderbird
+bindsym $mod+Shift+U exec setxkbmap us && exec notify-send -t 5000 "US xkbmap"
+bindsym $mod+Shift+F exec setxkbmap fr && exec notify-send -t 5000 "FR xkbmap"
+bindsym $mod+Shift+I exec networkmanager_dmenu
diff --git a/TMV/.config/ibus/rime/build/default.custom.yaml b/.config/ibus/rime/build/default.custom.yaml
index ea410a0..ea410a0 100644
--- a/TMV/.config/ibus/rime/build/default.custom.yaml
+++ b/.config/ibus/rime/build/default.custom.yaml
diff --git a/TMV/.config/ibus/rime/build/default.yaml b/.config/ibus/rime/build/default.yaml
index ed14c97..ed14c97 100644
--- a/TMV/.config/ibus/rime/build/default.yaml
+++ b/.config/ibus/rime/build/default.yaml
diff --git a/TMV/.config/ibus/rime/build/stroke.prism.bin b/.config/ibus/rime/build/stroke.prism.bin
index 59275bf..59275bf 100644
--- a/TMV/.config/ibus/rime/build/stroke.prism.bin
+++ b/.config/ibus/rime/build/stroke.prism.bin
diff --git a/TMV/.config/ibus/rime/build/stroke.reverse.bin b/.config/ibus/rime/build/stroke.reverse.bin
index 0e9c84b..0e9c84b 100644
--- a/TMV/.config/ibus/rime/build/stroke.reverse.bin
+++ b/.config/ibus/rime/build/stroke.reverse.bin
diff --git a/TMV/.config/ibus/rime/build/stroke.schema.yaml b/.config/ibus/rime/build/stroke.schema.yaml
index 5effb6a..5effb6a 100644
--- a/TMV/.config/ibus/rime/build/stroke.schema.yaml
+++ b/.config/ibus/rime/build/stroke.schema.yaml
diff --git a/TMV/.config/ibus/rime/build/stroke.table.bin b/.config/ibus/rime/build/stroke.table.bin
index dfff234..dfff234 100644
--- a/TMV/.config/ibus/rime/build/stroke.table.bin
+++ b/.config/ibus/rime/build/stroke.table.bin
diff --git a/TMV/.config/ibus/rime/build/terra_pinyin.prism.bin b/.config/ibus/rime/build/terra_pinyin.prism.bin
index 6276259..6276259 100644
--- a/TMV/.config/ibus/rime/build/terra_pinyin.prism.bin
+++ b/.config/ibus/rime/build/terra_pinyin.prism.bin
diff --git a/TMV/.config/ibus/rime/build/terra_pinyin.reverse.bin b/.config/ibus/rime/build/terra_pinyin.reverse.bin
index 6d39612..6d39612 100644
--- a/TMV/.config/ibus/rime/build/terra_pinyin.reverse.bin
+++ b/.config/ibus/rime/build/terra_pinyin.reverse.bin
diff --git a/TMV/.config/ibus/rime/build/terra_pinyin.schema.yaml b/.config/ibus/rime/build/terra_pinyin.schema.yaml
index 6b840e2..6b840e2 100644
--- a/TMV/.config/ibus/rime/build/terra_pinyin.schema.yaml
+++ b/.config/ibus/rime/build/terra_pinyin.schema.yaml
diff --git a/TMV/.config/ibus/rime/build/terra_pinyin.table.bin b/.config/ibus/rime/build/terra_pinyin.table.bin
index a2683d3..a2683d3 100644
--- a/TMV/.config/ibus/rime/build/terra_pinyin.table.bin
+++ b/.config/ibus/rime/build/terra_pinyin.table.bin
diff --git a/TMV/.config/ibus/rime/default.custom.yaml b/.config/ibus/rime/default.custom.yaml
index ea410a0..ea410a0 100644
--- a/TMV/.config/ibus/rime/default.custom.yaml
+++ b/.config/ibus/rime/default.custom.yaml
diff --git a/TMV/.config/ibus/rime/installation.yaml b/.config/ibus/rime/installation.yaml
index e80bb8c..e80bb8c 100644
--- a/TMV/.config/ibus/rime/installation.yaml
+++ b/.config/ibus/rime/installation.yaml
diff --git a/TMV/.config/ibus/rime/luna_pinyin.userdb/000054.log b/.config/ibus/rime/luna_pinyin.userdb/000054.log
index e69de29..e69de29 100644
--- a/TMV/.config/ibus/rime/luna_pinyin.userdb/000054.log
+++ b/.config/ibus/rime/luna_pinyin.userdb/000054.log
diff --git a/TMV/.config/ibus/rime/luna_pinyin.userdb/000055.ldb b/.config/ibus/rime/luna_pinyin.userdb/000055.ldb
index c8f1117..c8f1117 100644
--- a/TMV/.config/ibus/rime/luna_pinyin.userdb/000055.ldb
+++ b/.config/ibus/rime/luna_pinyin.userdb/000055.ldb
diff --git a/TMV/.config/ibus/rime/luna_pinyin.userdb/CURRENT b/.config/ibus/rime/luna_pinyin.userdb/CURRENT
index f774e85..f774e85 100644
--- a/TMV/.config/ibus/rime/luna_pinyin.userdb/CURRENT
+++ b/.config/ibus/rime/luna_pinyin.userdb/CURRENT
diff --git a/TMV/.config/ibus/rime/luna_pinyin.userdb/LOCK b/.config/ibus/rime/luna_pinyin.userdb/LOCK
index e69de29..e69de29 100644
--- a/TMV/.config/ibus/rime/luna_pinyin.userdb/LOCK
+++ b/.config/ibus/rime/luna_pinyin.userdb/LOCK
diff --git a/TMV/.config/ibus/rime/luna_pinyin.userdb/LOG b/.config/ibus/rime/luna_pinyin.userdb/LOG
index 876c63d..876c63d 100644
--- a/TMV/.config/ibus/rime/luna_pinyin.userdb/LOG
+++ b/.config/ibus/rime/luna_pinyin.userdb/LOG
diff --git a/TMV/.config/ibus/rime/luna_pinyin.userdb/LOG.old b/.config/ibus/rime/luna_pinyin.userdb/LOG.old
index be9908a..be9908a 100644
--- a/TMV/.config/ibus/rime/luna_pinyin.userdb/LOG.old
+++ b/.config/ibus/rime/luna_pinyin.userdb/LOG.old
diff --git a/TMV/.config/ibus/rime/luna_pinyin.userdb/MANIFEST-000052 b/.config/ibus/rime/luna_pinyin.userdb/MANIFEST-000052
index c84dc73..c84dc73 100644
--- a/TMV/.config/ibus/rime/luna_pinyin.userdb/MANIFEST-000052
+++ b/.config/ibus/rime/luna_pinyin.userdb/MANIFEST-000052
diff --git a/TMV/.config/ibus/rime/sync/0473e284-5ff2-42f2-91ba-319c9ef261b2/default.custom.yaml b/.config/ibus/rime/sync/0473e284-5ff2-42f2-91ba-319c9ef261b2/default.custom.yaml
index ea410a0..ea410a0 100644
--- a/TMV/.config/ibus/rime/sync/0473e284-5ff2-42f2-91ba-319c9ef261b2/default.custom.yaml
+++ b/.config/ibus/rime/sync/0473e284-5ff2-42f2-91ba-319c9ef261b2/default.custom.yaml
diff --git a/TMV/.config/ibus/rime/sync/0473e284-5ff2-42f2-91ba-319c9ef261b2/installation.yaml b/.config/ibus/rime/sync/0473e284-5ff2-42f2-91ba-319c9ef261b2/installation.yaml
index e80bb8c..e80bb8c 100644
--- a/TMV/.config/ibus/rime/sync/0473e284-5ff2-42f2-91ba-319c9ef261b2/installation.yaml
+++ b/.config/ibus/rime/sync/0473e284-5ff2-42f2-91ba-319c9ef261b2/installation.yaml
diff --git a/TMV/.config/ibus/rime/sync/0473e284-5ff2-42f2-91ba-319c9ef261b2/luna_pinyin.userdb.txt b/.config/ibus/rime/sync/0473e284-5ff2-42f2-91ba-319c9ef261b2/luna_pinyin.userdb.txt
index d19e12d..d19e12d 100644
--- a/TMV/.config/ibus/rime/sync/0473e284-5ff2-42f2-91ba-319c9ef261b2/luna_pinyin.userdb.txt
+++ b/.config/ibus/rime/sync/0473e284-5ff2-42f2-91ba-319c9ef261b2/luna_pinyin.userdb.txt
diff --git a/TMV/.config/ibus/rime/sync/0473e284-5ff2-42f2-91ba-319c9ef261b2/terra_pinyin.userdb.txt b/.config/ibus/rime/sync/0473e284-5ff2-42f2-91ba-319c9ef261b2/terra_pinyin.userdb.txt
index 2377080..2377080 100644
--- a/TMV/.config/ibus/rime/sync/0473e284-5ff2-42f2-91ba-319c9ef261b2/terra_pinyin.userdb.txt
+++ b/.config/ibus/rime/sync/0473e284-5ff2-42f2-91ba-319c9ef261b2/terra_pinyin.userdb.txt
diff --git a/TMV/.config/ibus/rime/sync/0473e284-5ff2-42f2-91ba-319c9ef261b2/user.yaml b/.config/ibus/rime/sync/0473e284-5ff2-42f2-91ba-319c9ef261b2/user.yaml
index de25e72..de25e72 100644
--- a/TMV/.config/ibus/rime/sync/0473e284-5ff2-42f2-91ba-319c9ef261b2/user.yaml
+++ b/.config/ibus/rime/sync/0473e284-5ff2-42f2-91ba-319c9ef261b2/user.yaml
diff --git a/TMV/.config/ibus/rime/terra_pinyin.userdb/000072.ldb b/.config/ibus/rime/terra_pinyin.userdb/000072.ldb
index 9e3bfbe..9e3bfbe 100644
--- a/TMV/.config/ibus/rime/terra_pinyin.userdb/000072.ldb
+++ b/.config/ibus/rime/terra_pinyin.userdb/000072.ldb
diff --git a/TMV/.config/ibus/rime/terra_pinyin.userdb/000074.log b/.config/ibus/rime/terra_pinyin.userdb/000074.log
index b01175c..b01175c 100644
--- a/TMV/.config/ibus/rime/terra_pinyin.userdb/000074.log
+++ b/.config/ibus/rime/terra_pinyin.userdb/000074.log
diff --git a/TMV/.config/ibus/rime/terra_pinyin.userdb/CURRENT b/.config/ibus/rime/terra_pinyin.userdb/CURRENT
index 60f8f3c..60f8f3c 100644
--- a/TMV/.config/ibus/rime/terra_pinyin.userdb/CURRENT
+++ b/.config/ibus/rime/terra_pinyin.userdb/CURRENT
diff --git a/TMV/.config/ibus/rime/terra_pinyin.userdb/LOCK b/.config/ibus/rime/terra_pinyin.userdb/LOCK
index e69de29..e69de29 100644
--- a/TMV/.config/ibus/rime/terra_pinyin.userdb/LOCK
+++ b/.config/ibus/rime/terra_pinyin.userdb/LOCK
diff --git a/TMV/.config/ibus/rime/terra_pinyin.userdb/LOG b/.config/ibus/rime/terra_pinyin.userdb/LOG
index 0cbc8f1..0cbc8f1 100644
--- a/TMV/.config/ibus/rime/terra_pinyin.userdb/LOG
+++ b/.config/ibus/rime/terra_pinyin.userdb/LOG
diff --git a/TMV/.config/ibus/rime/terra_pinyin.userdb/LOG.old b/.config/ibus/rime/terra_pinyin.userdb/LOG.old
index d7cbe28..d7cbe28 100644
--- a/TMV/.config/ibus/rime/terra_pinyin.userdb/LOG.old
+++ b/.config/ibus/rime/terra_pinyin.userdb/LOG.old
diff --git a/TMV/.config/ibus/rime/terra_pinyin.userdb/MANIFEST-000073 b/.config/ibus/rime/terra_pinyin.userdb/MANIFEST-000073
index fd2dc1c..fd2dc1c 100644
--- a/TMV/.config/ibus/rime/terra_pinyin.userdb/MANIFEST-000073
+++ b/.config/ibus/rime/terra_pinyin.userdb/MANIFEST-000073
diff --git a/TMV/.config/ibus/rime/user.yaml b/.config/ibus/rime/user.yaml
index de25e72..de25e72 100644
--- a/TMV/.config/ibus/rime/user.yaml
+++ b/.config/ibus/rime/user.yaml
diff --git a/TMV/.config/inputrc b/.config/inputrc
index f9b94dd..f9b94dd 100644
--- a/TMV/.config/inputrc
+++ b/.config/inputrc
diff --git a/TMV/.config/mpv/input.conf b/.config/mpv/input.conf
index e0de762..e0de762 100644
--- a/TMV/.config/mpv/input.conf
+++ b/.config/mpv/input.conf
diff --git a/TMV/.config/mpv/mpv.conf b/.config/mpv/mpv.conf
index ff66aed..ff66aed 100644
--- a/TMV/.config/mpv/mpv.conf
+++ b/.config/mpv/mpv.conf
diff --git a/TMV/.config/newsboat/config b/.config/newsboat/config
index 8a56287..8a56287 100644
--- a/TMV/.config/newsboat/config
+++ b/.config/newsboat/config
diff --git a/TMV/.config/zathura/zathurarc b/.config/zathura/zathurarc
index 9fa50ca..9fa50ca 100644
--- a/TMV/.config/zathura/zathurarc
+++ b/.config/zathura/zathurarc
diff --git a/TMV/.profile b/.profile
index 633492b..633492b 100644
--- a/TMV/.profile
+++ b/.profile
diff --git a/.vimrc b/.vimrc
new file mode 100644
index 0000000..73e50fc
--- /dev/null
+++ b/.vimrc
@@ -0,0 +1,143 @@
+let mapleader ='\'
+
+if ! filereadable(expand('~/.config/nvim/autoload/plug.vim'))
+	echo "Downloading junegunn/vim-plug to manage plugins..."
+	silent !mkdir -p ~/.config/nvim/autoload/
+	silent !curl "https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim" > ~/.config/nvim/autoload/plug.vim
+	autocmd VimEnter * PlugInstall
+endif
+
+
+set bg=dark
+set go=a
+set mouse=a
+set nohlsearch
+set clipboard=unnamedplus
+
+" Some basics:
+	nnoremap c "_c
+	set nocompatible
+	filetype plugin on
+	syntax on
+	set encoding=utf-8
+	set number relativenumber
+
+" Automatically deletes all trailing whitespace on save.
+	autocmd BufWritePre * %s/\s\+$//e
+
+" Run xrdb whenever Xdefaults or Xresources are updated.
+	autocmd BufWritePost *Xresources,*Xdefaults !xrdb %
+
+
+	colorscheme delek
+
+call plug#begin('~/.vim/plugged')
+
+Plug 'Shougo/deoplete.nvim'
+Plug 'artur-shaik/vim-javacomplete2' , { 'for': 'java'}
+Plug 'majutsushi/tagbar', { 'on': 'TagbarToggle' }
+Plug 'SirVer/ultisnips'
+Plug 'scrooloose/nerdtree', { 'on': ['NERDTreeToggle', 'NERDTreeFind'] }
+Plug 'w0rp/ale'
+Plug 'ctrlpvim/ctrlp.vim'
+
+call plug#end()
+"Ctrlp Settings {{{
+
+let g:ctrlp_map = '<c-p>'
+
+let g:ctrlp_cmd = 'ctrlp'
+let g:ctrlp_dont_split = 'nerd'
+let g:ctrlp_working_path_mode = 'rw'
+set wildignore+=*/.git/*,*/tmp/*,*.swp/*,*/node_modules/*,*/temp/*,*/Builds/*,*/ProjectSettings/*
+" Set no max file limit
+let g:ctrlp_max_files = 0
+" Search from current directory instead of project root
+
+
+function! CtrlPCommand()
+  let c = 0
+  let wincount = winnr('$')
+  " Don't open it here if current buffer is not writable (e.g. NERDTree)
+  while !empty(getbufvar(+expand("<abuf>"), "&buftype")) && c < wincount
+    exec 'wincmd w'
+    let c = c + 1
+  endwhile
+  exec 'CtrlP'
+endfunction
+let g:ctrlp_cmd = 'call CtrlPCommand()'
+
+"RipGrep
+if executable('rg')
+  set grepprg=rg\ --color=never
+  let g:ctrlp_user_command = 'rg %s --files --color=never --glob ""'
+  let g:ctrlp_use_caching = 0
+endif
+let g:ctrlp_custom_ignore = {
+      \ 'dir':  '',
+      \ 'file': '\.so$\|\.dat$|\.DS_Store$|\.meta|\.zip|\.rar|\.ipa|\.apk',
+      \ }
+" }}}
+"Ale Settings {{{
+
+let g:ale_echo_msg_error_str = 'E'
+let g:ale_echo_msg_warning_str = 'W'
+let g:ale_sign_error = '✘✘'
+let g:ale_sign_warning = '⚠⚠'
+let g:ale_open_list = 0
+let g:ale_loclist = 0
+"g:ale_javascript_eslint_use_global = 1
+let g:ale_linters = {
+      \  'cs':['syntax', 'semantic', 'issues'],
+      \  'python': ['pylint'],
+      \  'java': ['javac']
+      \ }
+" }}}
+" Deoplete {{{
+
+let g:deoplete#enable_at_startup = 1
+
+let g:deoplete#auto_complete_start_length = 2
+let g:deoplete#sources = {}
+let g:deoplete#sources._=['buffer', 'ultisnips', 'file', 'dictionary']
+let g:deoplete#sources.javascript = ['tern', 'omni', 'file', 'buffer', 'ultisnips']
+
+" Use smartcase.
+let g:deoplete#enable_smart_case = 1
+
+
+"set completeopt-=preview
+
+""use TAB as the mapping
+inoremap <silent><expr> <TAB>
+      \ pumvisible() ?  "\<C-n>" :
+      \ <SID>check_back_space() ? "\<TAB>" :
+      \ deoplete#mappings#manual_complete()
+function! s:check_back_space() abort "" {{{
+  let col = col('.') - 1
+  return !col || getline('.')[col - 1]  =~ '\s'
+endfunction "" }}}
+" }}}
+" UltiSnips {{{
+
+" Trigger configuration. Do not use <tab> if you use https://github.com/Valloric/YouCompleteMe.
+let g:UltiSnipsExpandTrigger="<c-j>"
+let g:UltiSnipsJumpForwardTrigger="<c-b>"
+let g:UltiSnipsJumpBackwardTrigger="<c-z>"
+
+" If you want :UltiSnipsEdit to split your window.
+let g:UltiSnipsEditSplit="vertical"
+
+let g:UltiSnipsSnippetDirectories = ['~/.vim/UltiSnips', 'UltiSnips']
+let g:UltiSnipsSnippetsDir="~/.vim/UltiSnips"
+
+" }}}
+" Java {{{
+
+" Easy compile java in vim
+autocmd FileType java set makeprg=javac\ %
+set errorformat=%A%f:%l:\ %m,%-Z%p^,%-C.%#
+" Java completion
+autocmd FileType java setlocal omnifunc=javacomplete#Complete
+autocmd FileType java JCEnable
+" }}}
diff --git a/TMV/Pictures/icons/chromium.png b/Pictures/icons/chromium.png
index 09a1ebe..09a1ebe 100644
--- a/TMV/Pictures/icons/chromium.png
+++ b/Pictures/icons/chromium.png
diff --git a/TMV/Pictures/icons/discord.png b/Pictures/icons/discord.png
index 967081f..967081f 100644
--- a/TMV/Pictures/icons/discord.png
+++ b/Pictures/icons/discord.png
diff --git a/TMV/Pictures/icons/firefox.png b/Pictures/icons/firefox.png
index 93541eb..93541eb 100644
--- a/TMV/Pictures/icons/firefox.png
+++ b/Pictures/icons/firefox.png
diff --git a/TMV/Pictures/icons/screenshot.png b/Pictures/icons/screenshot.png
index edc5732..edc5732 100644
--- a/TMV/Pictures/icons/screenshot.png
+++ b/Pictures/icons/screenshot.png
diff --git a/TMV/Pictures/icons/tor.png b/Pictures/icons/tor.png
index d4a0dc0..d4a0dc0 100644
--- a/TMV/Pictures/icons/tor.png
+++ b/Pictures/icons/tor.png
diff --git a/TMV/Pictures/retrowave-pyramid.png b/Pictures/retrowave-pyramid.png
index 3d5df96..3d5df96 100644
--- a/TMV/Pictures/retrowave-pyramid.png
+++ b/Pictures/retrowave-pyramid.png
diff --git a/TMV/.conkyrc b/TMV/.conkyrc
deleted file mode 100644
index 71a1584..0000000
--- a/TMV/.conkyrc
+++ /dev/null
@@ -1,322 +0,0 @@
-conky.config = {
-
-font = 'Roboto:size=11:bold',
-background = true,
-cpu_avg_samples = 2,
-diskio_avg_samples = 10,
-double_buffer = true,
-if_up_strictness = 'address',
-net_avg_samples = 2,
-no_buffers = true,
-temperature_unit = 'celsius',
-text_buffer_size = 2048,
-update_interval = 1,
-imlib_cache_size = 0,
-alignment = 'middle_right',
-gap_x = 20,
-gap_y = 0,
-minimum_height = 600,
-minimum_width = 240,
-maximum_width = 260,
-border_inner_margin = 10,
-border_outer_margin = 1,
-border_width = 1,
-default_bar_width = 250,
-default_bar_height = 10,
-default_gauge_height = 25,
-default_gauge_width = 40,
-default_graph_height = 40,
-default_graph_width = 153,
-default_shade_color = '#000000',
-default_outline_color = '#000000',
-draw_borders = true,
-draw_graph_borders = true,
-draw_shades = false,
-draw_outline = false,
-stippled_borders = 0,
-extra_newline = false,
-format_human_readable = true,
-max_text_width = 0,
-max_user_text = 16384,
-override_utf8_locale = true,
-short_units = true,
-top_name_width = 21,
-top_name_verbose = false,
-uppercase = false,
-use_spacer = 'none',
-use_xft = true,
-xftalpha = 1,
-own_window = true,
-own_window_argb_value =230,
-own_window_argb_visual = true,
-own_window_class = 'Conky',
-own_window_hints = 'undecorated,below,above,sticky,skip_taskbar,skip_pager',
-own_window_transparent = false,
-own_window_title = 'system_conky',
-own_window_type = 'normal',
-
--- CONKYMATIC VARIABLES -------------------------------------------------------------
-
-color0 = '#6C2E8B', -- Time
-color1 = '#3D2D83', -- Date
-color2 = '#C583B6', -- Weather
-color3 = '#C583B6', -- Headings
-color4 = '#972E73', -- Sub-headings
-color5 = '#6C2D7A', -- Text (extra. Not used in default template)
-color6 = '#6C2E8B', -- Data values
-color7 = '#231C51', -- Horizontal rules
-color8 = '#31276E', -- Data bars, normal state
-color9 = '#fc1b0f', -- Data bars, warning state
-default_color = '#972E73', -- Window border
-own_window_colour = '#040217', -- Window background color
-
-};
-
-conky.text = [[
-#
-# -----------------------------------------------------------------------------------------
-#
-# EXECUTE EXTERNAL SCRIPTS
-#
-# DOWNLOAD AND CACHE WEATHER DATA FROM YAHOO EVERY 5 MINUTES
-#${execi 300 curl -f -s -S -k "https://query.yahooapis.com/v1/public/yql?q=select%20*%20from%20weather.forecast%20where%20woeid%20in%20(select%20woeid%20from%20geo.places(1)%20where%20text%3D%22paris%2C%20france%22)%20and%20u%3D%22c%22&format=json&env=store%3A%2F%2Fdatatables.org%2Falltableswithkeys" -o ./Cache/weather.json}\
-#
-# COPY AND CACHE THE CURRENT WEATHER AND FORECAST ICONS
-#${execi 300 cp -f ./Weather-Icons-PNG/$(jq .query.results.channel.item.condition.code ./Cache/weather.json   | grep -oP '"\K[^"\047]+(?=["\047])').png ./Cache/weather.png}\
-#${execi 300 cp -f ./Weather-Icons-PNG/$(jq .query.results.channel.item.forecast[1].code ./Cache/weather.json | grep -oP '"\K[^"\047]+(?=["\047])').png ./Cache/forecast1.png}\
-#${execi 300 cp -f ./Weather-Icons-PNG/$(jq .query.results.channel.item.forecast[2].code ./Cache/weather.json | grep -oP '"\K[^"\047]+(?=["\047])').png ./Cache/forecast2.png}\
-#${execi 300 cp -f ./Weather-Icons-PNG/$(jq .query.results.channel.item.forecast[3].code ./Cache/weather.json | grep -oP '"\K[^"\047]+(?=["\047])').png ./Cache/forecast3.png}\
-#${execi 300 cp -f ./Weather-Icons-PNG/$(jq .query.results.channel.item.forecast[4].code ./Cache/weather.json | grep -oP '"\K[^"\047]+(?=["\047])').png ./Cache/forecast4.png}\
-#${execi 300 cp -f ./Weather-Icons-PNG/$(jq .query.results.channel.item.forecast[5].code ./Cache/weather.json | grep -oP '"\K[^"\047]+(?=["\047])').png ./Cache/forecast5.png}\
-#
-# -----------------------------------------------------------------------------------------
-#
-# CURRENT TIME
-${font Roboto:size=24}${color0}${alignc}${voffset -4}\
-${time %H:%M:%S}\
-${font}${color}
-#
-# CURRENT DATE
-${font Roboto:size=13}${alignc}${voffset 2}${color1}\
-${time %B %d, %Y}\
-${font}${color}
-#
-# HORIZONTAL RULE
-${color7}${hr 2}
-#
-# -----------------------------------------------------------------------------------------
-#
-# SUNRISE AND SUNSET
-#${font Roboto:size=11:weight:bold}${color3}${alignc}\
-#SUNRISE       SUNSET
-#${color}\
-#${voffset 1}${alignc}${color2} \
-# Use Awk to capitalize AM/PM
-#${execi 300 jq -r .query.results.channel.astronomy.sunrise ./Cache/weather.json | awk '{ print toupper($0) }'}      \
-#${execi 300 jq -r .query.results.channel.astronomy.sunset  ./Cache/weather.json | awk '{ print toupper($0) }'}\
-#${font}${color}
-#
-# -----------------------------------------------------------------------------------------
-#
-# HORIZONTAL RULE
-#${voffset -2}${color7}${hr 2}
-#
-# -----------------------------------------------------------------------------------------
-#
-# CURRENT TEMPERATURE
-#${font Roboto:size=20}${color2}${voffset 0}${offset 55}\
-#${execi 300 jq .query.results.channel.item.condition.temp ./Cache/weather.json | grep -oP '"\K[^"\047]+(?=["\047])' #remove quotes}°\
-#${font}${color}
-#
-# CURRENT WEATHER ICON
-# The icon gets pulled from from the cache file
-#${image ./Cache/weather.png -p 147,120 -s 56x56}
-#
-# HIGH AND LOW TEMPERATURE DATA
-# Data gets pulled from the json file. We use awk to round the number
-#${font Roboto:size=10:weight:bold}${color2}${voffset -18}${offset 45}\
-#${execi 300 jq -r .query.results.channel.item.forecast[0].low ./Cache/weather.json  | awk '{print int($1+0.5)}' # round num}°  |  \
-#${execi 300 jq -r .query.results.channel.item.forecast[0].high ./Cache/weather.json | awk '{print int($1+0.5)}' # round num}°\
-#${font}${color}
-#
-# WEATHER DESCRIPTION
-# Data gets pulled from json file. We use awk to capitalize each word.
-#${font Roboto:size=14}${alignc}${color2}${voffset 0}\
-#${execi 300 jq -r .query.results.channel.item.condition.text ./Cache/weather.json | sed -e "s/\b\(.\)/\u\1/g"}\
-#${font}${color}
-#
-# CITY NAME
-# Data gets pulled from json file.
-#${font Roboto:size=10:weight:bold}${alignc}${color2}${voffset 2}\
-#${execi 300 jq -r .query.results.channel.location.city ./Cache/weather.json},\
-#${execi 300 jq -r .query.results.channel.location.region ./Cache/weather.json}  \
-#
-#LONGITUDE AND LATITUDE
-# Round the longitude and latitude values up
-#${execi 300 jq -r .query.results.channel.item.lat ./Cache/weather.json  | awk '{print int($1+0.5)}' # round num} N  \
-#${execi 30 jq -r .query.results.channel.item.long ./Cache/weather.json | awk '{print int($1+0.5)}' # round num} W    \
-#${font}${color}
-#
-# -----------------------------------------------------------------------------------------
-#
-# HORIZONTAL RULE
-#${voffset 0}${color7}${hr 2}
-#
-# -----------------------------------------------------------------------------------------
-#
-# WEATHER FORECAST ICONS
-#${image ./Cache/forecast1.png -p 6,236 -s 35x35}\
-#${image ./Cache/forecast2.png -p 56,236 -s 35x35}\
-#${image ./Cache/forecast3.png -p 104,236 -s 35x35}\
-#${image ./Cache/forecast4.png -p 152,236 -s 35x35}\
-#${image ./Cache/forecast5.png -p 200,236 -s 35x35}\
-#
-# 5 DAY FORECAST TEMPERATURES
-# Data gets pulled from the forecast json file. We use awk to round the number
-#${font SourceSansPro:size=11:weight:bold}${color2}\
-#${voffset 33}\
-#${goto 27}${execi  300 jq -r .query.results.channel.item.forecast[1].high ./Cache/weather.json | awk '{print int($1+0.5)}' # round num}°\
-#${goto 76}${execi  300 jq -r .query.results.channel.item.forecast[2].high ./Cache/weather.json | awk '{print int($1+0.5)}' # round num}°\
-#${goto 124}${execi 300 jq -r .query.results.channel.item.forecast[3].high ./Cache/weather.json | awk '{print int($1+0.5)}' # round num}°\
-#${goto 172}${execi 300 jq -r .query.results.channel.item.forecast[4].high ./Cache/weather.json | awk '{print int($1+0.5)}' # round num}°\
-#${goto 222}${execi 300 jq -r .query.results.channel.item.forecast[5].high ./Cache/weather.json | awk '{print int($1+0.5)}' # round num}°\
-#${font}${color}
-#
-# WEEKDAY NAMES
-#${font SourceSansPro-:size=11:weight:bold}${color2}\
-#${voffset -2}\
-#${goto 25}${execi  300 jq -r  .query.results.channel.item.forecast[1].day ./Cache/weather.json }\
-#${goto 71}${execi  300 jq -r  .query.results.channel.item.forecast[2].day ./Cache/weather.json }\
-#${goto 122}${execi 300 jq -r  .query.results.channel.item.forecast[3].day ./Cache/weather.json }\
-#${goto 168}${execi 300 jq -r  .query.results.channel.item.forecast[4].day ./Cache/weather.json }\
-#${goto 217}${execi 300 jq -r  .query.results.channel.item.forecast[5].day ./Cache/weather.json }\
-#${font}${color}
-#
-# -----------------------------------------------------------------------------------------
-#
-# HORIZONTAL RULE
-#${voffset -5}${color7}${hr 2}
-#
-# -----------------------------------------------------------------------------------------
-########################## REAL BEGINNING #########################
-# BATTERY STATUS BAR
-# Note: If the battery level drops below 20% it changes to red
-${font Roboto:size=11:weight:bold} \
-${if_match ${battery_percent} < 20}${color9}\
-${battery_bar 10,134 BAT0}    ${color3}BAT${alignr}${color9}${battery_percent}%\
-${else}${color8}\
-${battery_bar 10,134 BAT0}   ${color3}BAT  ${alignr}${color6}${battery_percent}%\
-${endif}\
-${font}
-#
-# CPU BAR
-# Note: If greater than 80% of the CPU is being used it turns red
-${font Roboto:size=11:weight:bold}${color8} \
-${cpubar cpu0 10,134}   \
-${color3}CPU${alignr}\
-${color6}${cpu cpu0}% \
-${font}
-#
-# RAM BAR
-${font Roboto:size=11:weight:bold}${color8} \
-${membar 10,134}   \
-${color3}RAM${alignr}${color6}\
-${memperc}% \
-${font}
-#
-# -----------------------------------------------------------------------------------------
-#
-# HORIZONTAL RULE
-${voffset -5}${color7}${hr 2}
-#
-# -----------------------------------------------------------------------------------------
-#
-# CPU TEMP
-${color3} CPU ${alignr}${color}${color6}${execi 10 sensors | grep 'Core 0' | awk {'print $3'}}
-#
-# CPU GRAPH
-${voffset 5}${alignc}${color6}${cpugraph 0 15,235 0 0 -l} \
-${font}${color}
-#
-# -----------------------------------------------------------------------------------------
-#
-# HORIZONTAL RULE
-${voffset -2}${color7}${hr 2}
-#
-# -----------------------------------------------------------------------------------------
-#
-# Used and free space on root and home
-${voffset -2}${font Roboto:size=11:weight:bold}\
-${color3}R: ${fs_used /root} Used ${alignr}${color6}${fs_free /root} Free
-${color3}H: ${fs_used /home} Used ${alignr}${color6}${fs_free /home} Free\
-${font}${color}
-#
-# -----------------------------------------------------------------------------------------
-#
-# HORIZONTAL RULE
-${voffset -2}${color7}${hr 2}
-#
-# -----------------------------------------------------------------------------------------
-#
-# UPTIME AND TOTAL NUMBER OF PROCESSES
-${voffset -2}${font Roboto:size=11:weight:bold}${color3}\
- Uptime ${alignr}${color6} $uptime_short ${color3}
- Processes${alignr}${color6}${processes}
-#
-# -----------------------------------------------------------------------------------------
-#
-# HORIZONTAL RULE
-${color7}${hr 2}
-#
-# -----------------------------------------------------------------------------------------
-#
-# CPU USAGE
-# Top 6 processes
-${voffset -2}${font Roboto:size=11:weight:bold}${color3}\
- CPU${alignr}${color6}Intel i7
- ${color4}${top name 1}${alignr}${color6}${top cpu 1}%
- ${color4}${top name 2}${alignr}${color6}${top cpu 2}%
- ${color4}${top name 3}${alignr}${color6}${top cpu 3}%
- ${color4}${top name 4}${alignr}${color6}${top cpu 4}%
- ${color4}${top name 5}${alignr}${color6}${top cpu 5}%
- ${color4}${top name 6}${alignr}${color6}${top cpu 6}% \
-${font}${color}
-#
-# -----------------------------------------------------------------------------------------
-#
-# HORIZONTAL RULE
-${voffset -2}${color7}${hr 2}
-#
-# -----------------------------------------------------------------------------------------
-#
-# MEMORY USAGE
-# Top 6 applications
-${voffset -2}${font Roboto:size=11:weight:bold}\
- ${color3}Memory${alignr}${color6}${memmax}
- ${color4}${top_mem name 1}${alignr}${alignr}${color6}${top_mem mem 1}%
- ${color4}${top_mem name 2}${alignr}${alignr}${color6}${top_mem mem 2}%
- ${color4}${top_mem name 3}${alignr}${alignr}${color6}${top_mem mem 3}%
- ${color4}${top_mem name 4}${alignr}${alignr}${color6}${top_mem mem 4}%
- ${color4}${top_mem name 5}${alignr}${alignr}${color6}${top_mem mem 5}%
- ${color4}${top_mem name 6}${alignr}${alignr}${color6}${top_mem mem 6}%
- ${color3}Total Used${alignr}${color6}${mem} \
-${font}${color}
-#
-# -----------------------------------------------------------------------------------------
-#
-# HORIZONTAL RULE
-${voffset -2}${color7}${hr 2}
-#
-# -----------------------------------------------------------------------------------------
-#
-# PACKAGE UPDATES
-${font Roboto:size=11:weight:bold}${color3} \
-Package Updates${alignr}${color6}${execi 1800 xbps-install -un | wc -l} \
-${font}${color}
-#
-# -----------------------------------------------------------------------------------------
-#
-# COLOR PALETTE IMAGE
-# Note: Vertical offset controls the space UNDER the image.
-#${voffset -25}${image ./Cache/colorpalette.png -p 13,870}\
-]]
diff --git a/TMV/.vimrc b/TMV/.vimrc
deleted file mode 100644
index 3896408..0000000
--- a/TMV/.vimrc
+++ /dev/null
@@ -1,150 +0,0 @@
-let mapleader ='\'
-
-if ! filereadable(expand('~/.config/nvim/autoload/plug.vim'))
-	echo "Downloading junegunn/vim-plug to manage plugins..."
-	silent !mkdir -p ~/.config/nvim/autoload/
-	silent !curl "https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim" > ~/.config/nvim/autoload/plug.vim
-	autocmd VimEnter * PlugInstall
-endif
-
-
-set bg=dark
-set go=a
-set mouse=a
-set nohlsearch
-set clipboard=unnamedplus
-
-" Some basics:
-	nnoremap c "_c
-	set nocompatible
-	filetype plugin on
-	syntax on
-	set encoding=utf-8
-	set number relativenumber
-" Enable autocompletion:
-	set wildmode=longest,list,full
-" Disables automatic commenting on newline:
-	autocmd FileType * setlocal formatoptions-=c formatoptions-=r formatoptions-=o
-
-" Goyo plugin makes text more readable when writing prose:
-	map <leader>f :Goyo \| set bg=light \| set linebreak<CR>
-
-" Spell-check set to <leader>o, 'o' for 'orthography':
-	map <leader>o :setlocal spell! spelllang=en_us<CR>
-
-" Splits open at the bottom and right, which is non-retarded, unlike vim defaults.
-	set splitbelow splitright
-
-" Nerd tree
-	map <leader>n :NERDTreeToggle<CR>
-	autocmd bufenter * if (winnr("$") == 1 && exists("b:NERDTree") && b:NERDTree.isTabTree()) | q | endif
-
-" vimling:
-	nm <leader>d :call ToggleDeadKeys()<CR>
-	imap <leader>d <esc>:call ToggleDeadKeys()<CR>a
-	nm <leader>i :call ToggleIPA()<CR>
-	imap <leader>i <esc>:call ToggleIPA()<CR>a
-	nm <leader>q :call ToggleProse()<CR>
-
-" Shortcutting split navigation, saving a keypress:
-	map <C-h> <C-w>h
-	map <C-j> <C-w>j
-	map <C-k> <C-w>k
-	map <C-l> <C-w>l
-
-" Check file in shellcheck:
-	map <leader>s :!clear && shellcheck %<CR>
-
-" Open my bibliography file in split
-	map <leader>b :vsp<space>$BIB<CR>
-	map <leader>r :vsp<space>$REFER<CR>
-
-" Replace all is aliased to S.
-	nnoremap S :%s//g<Left><Left>
-
-" Compile document, be it groff/LaTeX/markdown/etc.
-	map <leader>c :w! \| !compiler <c-r>%<CR>
-
-" Open corresponding .pdf/.html or preview
-	map <leader>p :!opout <c-r>%<CR><CR>
-
-" Runs a script that cleans out tex build files whenever I close out of a .tex file.
-	autocmd VimLeave *.tex !texclear %
-
-" Ensure files are read as what I want:
-	let g:vimwiki_ext2syntax = {'.Rmd': 'markdown', '.rmd': 'markdown','.md': 'markdown', '.markdown': 'markdown', '.mdown': 'markdown'}
-	map <leader>v :VimwikiIndex
-	let g:vimwiki_list = [{'path': '~/repos/writings', 'syntax': 'markdown', 'ext': '.md'}]
-	autocmd BufRead,BufNewFile /tmp/calcurse*,~/.calcurse/notes/* set filetype=markdown
-	autocmd BufRead,BufNewFile *.ms,*.me,*.mom,*.man set filetype=groff
-	autocmd BufRead,BufNewFile *.tex set filetype=tex
-
-" Copy selected text to system clipboard (requires gvim/nvim/vim-x11 installed):
-	vnoremap <C-c> "+y
-	map <C-p> "+P
-
-" Enable Goyo by default for mutt writting
-	autocmd BufRead,BufNewFile /tmp/neomutt* let g:goyo_width=80
-	autocmd BufRead,BufNewFile /tmp/neomutt* :Goyo | set bg=light
-
-" Automatically deletes all trailing whitespace on save.
-	autocmd BufWritePre * %s/\s\+$//e
-
-" When shortcut files are updated, renew bash and ranger configs with new material:
-	autocmd BufWritePost *bmdirs,*bmfiles !shortcuts
-" Run xrdb whenever Xdefaults or Xresources are updated.
-	autocmd BufWritePost *Xresources,*Xdefaults !xrdb %
-" Update binds when sxhkdrc is updated.
-	autocmd BufWritePost *sxhkdrc !pkill -USR1 sxhkd
-
-
-	call plug#begin('~/.vim/plugged')
-	Plug 'artur-shaik/vim-javacomplete2'
-	call plug#end()
-
-	colorscheme delek
-
-" Java autocompletion
-	autocmd FileType java setlocal omnifunc=javacomplete#Complete
-	nmap <F4> <Plug>(JavaComplete-Imports-AddSmart)
-	imap <F4> <Plug>(JavaComplete-Imports-AddSmart)
-	nmap <F5> <Plug>(JavaComplete-Imports-Add)
-	imap <F5> <Plug>(JavaComplete-Imports-Add)
-	nmap <F6> <Plug>(JavaComplete-Imports-AddMissing)
-	imap <F6> <Plug>(JavaComplete-Imports-AddMissing)
-	nmap <F7> <Plug>(JavaComplete-Imports-RemoveUnused)
-	imap <F7> <Plug>(JavaComplete-Imports-RemoveUnused)
-
-	nmap <leader>jI <Plug>(JavaComplete-Imports-AddMissing)
-	nmap <leader>jR <Plug>(JavaComplete-Imports-RemoveUnused)
-	nmap <leader>ji <Plug>(JavaComplete-Imports-AddSmart)
-	nmap <leader>jii <Plug>(JavaComplete-Imports-Add)
-
-	imap <C-j>I <Plug>(JavaComplete-Imports-AddMissing)
-	imap <C-j>R <Plug>(JavaComplete-Imports-RemoveUnused)
-	imap <C-j>i <Plug>(JavaComplete-Imports-AddSmart)
-	imap <C-j>ii <Plug>(JavaComplete-Imports-Add)
-
-	nmap <leader>jM <Plug>(JavaComplete-Generate-AbstractMethods)
-
-	imap <C-j>jM <Plug>(JavaComplete-Generate-AbstractMethods)
-
-	nmap <leader>jA <Plug>(JavaComplete-Generate-Accessors)
-	nmap <leader>js <Plug>(JavaComplete-Generate-AccessorSetter)
-	nmap <leader>jg <Plug>(JavaComplete-Generate-AccessorGetter)
-	nmap <leader>ja <Plug>(JavaComplete-Generate-AccessorSetterGetter)
-	nmap <leader>jts <Plug>(JavaComplete-Generate-ToString)
-	nmap <leader>jeq <Plug>(JavaComplete-Generate-EqualsAndHashCode)
-	nmap <leader>jc <Plug>(JavaComplete-Generate-Constructor)
-	nmap <leader>jcc <Plug>(JavaComplete-Generate-DefaultConstructor)
-
-	imap <C-j>s <Plug>(JavaComplete-Generate-AccessorSetter)
-	imap <C-j>g <Plug>(JavaComplete-Generate-AccessorGetter)
-	imap <C-j>a <Plug>(JavaComplete-Generate-AccessorSetterGetter)
-
-	vmap <leader>js <Plug>(JavaComplete-Generate-AccessorSetter)
-	vmap <leader>jg <Plug>(JavaComplete-Generate-AccessorGetter)
-	vmap <leader>ja <Plug>(JavaComplete-Generate-AccessorSetterGetter)
-
-	nmap <silent> <buffer> <leader>jn <Plug>(JavaComplete-Generate-NewClass)
-	nmap <silent> <buffer> <leader>jN <Plug>(JavaComplete-Generate-ClassInFile)
diff --git a/TMV/etc/i3status.conf b/etc/i3status.conf
index b3c138a..b3c138a 100644
--- a/TMV/etc/i3status.conf
+++ b/etc/i3status.conf