update i3 config, vimrc

.config/i3/config

@@ -3,7 +3,7 @@
 # i3wm configuration file
 # -----------------------
 #
-# Version: 0.16_kali - 2018/09/11
+# Version: 0.20_kali - 2018/10/07
 # Author: Brainfuck
 # https://github.com/brainfucksec/kali-dotfiles
 #
@@ -150,57 +150,56 @@ bindsym $mod+Shift+e exec --no-startup-id xfce4-session-logout
 ###############################################
 
 # customize workspaces name
-#set $ws1    
-#set $ws2    
-#set $ws3    
-#set $ws4    
-#set $ws5    
+set $ws1 1  
+set $ws2 2  
+set $ws3 3  
+set $ws4 4  
+set $ws5 5  
+set $ws6 6  
 
 # switch to workspace
-bindsym $mod+1 workspace 1
-bindsym $mod+2 workspace 2
-bindsym $mod+3 workspace 3
-bindsym $mod+4 workspace 4
-bindsym $mod+5 workspace 5
-bindsym $mod+6 workspace 6
+bindsym $mod+1 workspace $ws1
+bindsym $mod+2 workspace $ws2
+bindsym $mod+3 workspace $ws3
+bindsym $mod+4 workspace $ws4
+bindsym $mod+5 workspace $ws5
+bindsym $mod+6 workspace $ws6
 bindsym $mod+7 workspace 7
 bindsym $mod+8 workspace 8
 bindsym $mod+9 workspace 9
 bindsym $mod+0 workspace 0
 
 # move focused container to workspace
-bindsym $mod+Shift+1 move container to workspace 1
-bindsym $mod+Shift+2 move container to workspace 2
-bindsym $mod+Shift+3 move container to workspace 3
-bindsym $mod+Shift+4 move container to workspace 4
-bindsym $mod+Shift+5 move container to workspace 5
-bindsym $mod+Shift+6 move container to workspace 6
+bindsym $mod+Shift+1 move container to workspace $ws1
+bindsym $mod+Shift+2 move container to workspace $ws2
+bindsym $mod+Shift+3 move container to workspace $ws3
+bindsym $mod+Shift+4 move container to workspace $ws4
+bindsym $mod+Shift+5 move container to workspace $ws5
+bindsym $mod+Shift+6 move container to workspace $ws6
 bindsym $mod+Shift+7 move container to workspace 7
 bindsym $mod+Shift+8 move container to workspace 8
 bindsym $mod+Shift+9 move container to workspace 9
 bindsym $mod+Shift+0 move container to workspace 0
 
 ## Workspaces assignment
-#
 # force a window on a named workspace
 # xprop | grep 'CLASS', to get the name of the window class
-#assign [class="Xfce4-terminal"]	1
-assign [class="Firefox"]	    2
-assign [class="Tor Browser"]    2
-assign [class="Vim"]            3
-assign [class="Zathura"]        4
+#assign [class="Xfce4-terminal"]	$ws1
+assign [class="Firefox"]	    $ws2
+assign [class="Tor Browser"]    $ws2
+assign [class="Vim"]            $ws4
+assign [class="Zathura"]        $ws5
+assign [class='vlc']            $ws6
 
 # enable floating mode for selected windows
-#for_window [class="Thunar"] floating enable border pixel 2
-#for_window [class="Lxappearance"] floating enable border pixel 2
 for_window [class="Nitrogen"] floating enable border pixel 2
 for_window [class="Bleachbit"] floating enable border pixel 2
 for_window [class="Tor Browser"] floating enable border pixel 2
 for_window [class="Xfce4-notifyd"] floating enable border none focus mode_toggle
 
 
 ###############################################
-# My Keybindings
+# My Shortcuts
 ###############################################
 
 # applications
@@ -217,7 +216,3 @@ bindsym $mod+t exec --no-startup-id sh -c ~/bin/tor-browser_en-US/Browser/start-
 ###############################################
 
 ## Section not used! start up applications are managed from xfce
-
-# compton
-#exec --no-startup-id /usr/bin/compton --config ~/.config/compton.conf
-#exec --no-startup-id xfce4-pulseaudio-plugin

.vimrc

@@ -8,14 +8,18 @@
 "   ## ##    ##  ##     ## ##    ##  ##    ##
 "    ###    #### ##     ## ##     ##  ######
 "
+""""""""""""""""""""""""""""""""""""""""""""""
 
 """"""""""""""""""""""""""""""""""""""""""""""
 "
 " vim configuration file
+" ----------------------
 "
-" Version: 0.40_kali - 2018/06/09 10:20:38
+" Version: 0.50_kali - 2018/10/07 19:56:57
 " Author: Brainfuck
 "
+" https://github.com/brainfucksec/dotfiles
+"
 """"""""""""""""""""""""""""""""""""""""""""""
 
 
@@ -38,7 +42,7 @@ filetype plugin indent on
 " the plugins.
 let mapleader = ","
 
-" vimwiki plugin settings
+" vimwiki
 let g:vimwiki_list = [{'path': '~/documents/vimwiki/index.wiki'}]
 
 
@@ -89,12 +93,14 @@ autocmd BufWritePre * :%s/\s\+$//e
 """"""""""""""""""""""""""""""""""""""""""""""
 " => Colors and fonts
 """"""""""""""""""""""""""""""""""""""""""""""
+
 " Terminal settings
 set t_Co=256
-set termguicolors
+"set termguicolors
 
 " Colorscheme
-colorscheme iceberg
+" colorscheme from pywal
+colorscheme wal
 set background=dark
 
 " Extend background color to the whole screen (xfce4-terminal fix)
@@ -111,6 +117,9 @@ set encoding=utf8
 " Use Unix for new files and autodetect the rest
 set ffs=unix,dos,mac
 
+" Force Markdown syntax
+autocmd BufRead,BufNew *.md set filetype=markdown
+
 " Turn backup off, swap file off
 set nobackup
 set noswapfile
@@ -120,8 +129,12 @@ set noswapfile
 " => Memory, CPU
 """"""""""""""""""""""""""""""""""""""""""""
 
-" Keep more info in memory to speed thing up
+" This makes vim act like all other editors, buffers can
+" exist in the background without being in a window.
+" http://items.sjbach.com/319/configuring-vim-right
 set hidden
+
+" Sets how many lines of history VIM has to remember
 set history=100
 
 
@@ -139,20 +152,24 @@ set smarttab
 set shiftwidth=4
 set tabstop=4
 
+" 1 tab == 2 spaces for selected filetypes
+autocmd FileType xml,html,xhtml setlocal shiftwidth=2 tabstop=2
+autocmd BufRead,BufNew *.css setlocal shiftwidth=2 tabstop=2
+
 set ai "Auto indent
 set si "Smart indent
 set wrap "Wrap lines
 
 " indentLine: indent lines style
 let g:indentLine_char = '│'
+"let g:indentLine_setColors = 0
 
 
 """"""""""""""""""""""""""""""""""""""""""""
 " => Autocompletion, linting
 """"""""""""""""""""""""""""""""""""""""""""
 
 " Completion popup settings (:help 'completeopt')
-set completeopt-=preview
 set completeopt+=menuone,noinsert,noselect
 
 " Shut off completion messages
@@ -193,7 +210,7 @@ set noshowmode
 
 " Set colorscheme
 let g:lightline = {
-      \ 'colorscheme': 'iceberg',
+      \ 'colorscheme': 'molokai',
       \ }
 
 
@@ -207,6 +224,9 @@ map \r :source ~/.vimrc<CR>
 " Cancel a search with Ctrl+l
 nnoremap <silent> <C-l> :nohl<CR><C-l>
 
+" Make jj do Esc
+inoremap jj <Esc>
+
 " Don't use arrow keys
 map <up> <nop>
 map <down> <nop>