Merge branch 'master' of github.com:kompetenzbolzen/vimconfig

9 files changed, 59 insertions, 10 deletions

diff --git a/.gitmodules b/.gitmodules
index d792749..582eadc 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -16,3 +16,6 @@
 [submodule ".vim/bundle/vim-signify"]
 	path = .vim/bundle/vim-signify
 	url = https://github.com/mhinz/vim-signify.git
+[submodule ".vim/bundle/Conque-shell"]
+	path = .vim/bundle/Conque-shell
+	url = https://github.com/vim-scripts/Conque-Shell.git
diff --git a/.i3/config b/.i3/config
index 6aa9b88..8841d8f 100644
--- a/.i3/config
+++ b/.i3/config
@@ -41,6 +41,8 @@ bindsym  $mod+b exec "brave"
 # kill focused window
 bindsym $mod+Shift+q kill
 
+bindsym $mod+Shift+w exec "i3lock -i ~/vimconfig/lock.png"
+
 # start dmenu (a program launcher)
 bindsym $mod+d exec dmenu_run
 # There also is the (new) i3-dmenu-desktop which only displays applications
diff --git a/.vim/bundle/nerdtree b/.vim/bundle/nerdtree
-Subproject 3c0633578281463638235597d8208612544606a
+Subproject 1c803b36f632c151c755456b68101153f407ec5
diff --git a/.vim/bundle/nerdtree-git-plugin b/.vim/bundle/nerdtree-git-plugin
-Subproject 325a1298b0c9d8a4c61388a2f9956a534a9068c
+Subproject 0501cdfbe3064d1f2d0987929565bccee5f5a6a
diff --git a/.vim/bundle/vim-airline b/.vim/bundle/vim-airline
-Subproject 3abbfabf55a683699a7587fe02eb9f0ccd60eab
+Subproject 2db9b27e39bfd84cb432e001b4a3f41f633b3b7
diff --git a/.vim/bundle/vim-airline-themes b/.vim/bundle/vim-airline-themes
-Subproject 01b3098642df1bced40473c924c0b6aa37427fe
+Subproject e6f233231b232b6027cde6aebeeb18d9138e532
diff --git a/.vim/bundle/vim-signify b/.vim/bundle/vim-signify
-Subproject f34fea0eff09d0fb4ec54aec3c07345e6c4486d
+Subproject ac23bd95d5fe0c7a7bf4a331e9d37eb72697c46
diff --git a/.vim/vimrc b/.vim/vimrc
index cbadca7..fc9a936 100644
--- a/.vim/vimrc
+++ b/.vim/vimrc
@@ -22,19 +22,20 @@ filetype plugin indent on
 "autocmd vimenter * NERDTree
 
 "Switch windows with keys
-nmap <silent> <C-k> :wincmd k<CR>
-nmap <silent> <C-j> :wincmd j<CR>
-nmap <silent> <C-h> :wincmd h<CR>
-nmap <silent> <C-l> :wincmd l<CR>
+nmap <silent> <C-w-k> :wincmd k<CR>
+nmap <silent> <C-w-j> :wincmd j<CR>
+nmap <silent> <C-w-h> :wincmd h<CR>
+nmap <silent> <C-w-l> :wincmd l<CR>
 
-nmap <F5> :NERDTreeToggle<CR>
-nmap <F6> :TlistToggle<CR>
+nmap <silent> <F5> :NERDTreeToggle<CR>
+nmap <silent> <F6> :TlistToggle<CR>
+nmap <silent> <F7> :terminal<CR>
 
 "Tab mgmt
-nmap <F1> :tabclose<CR>
-nmap <F2> :tabprevious<CR>
-nmap <F3> :tabnext<CR>
-nmap <F4> :tabnew<CR>
+nmap <silent> <F1> :tabclose<CR>
+nmap <silent> <F2> :tabprevious<CR>
+nmap <silent> <F3> :tabnext<CR>
+nmap <silent> <F4> :tabnew<CR>
 
 "^] Jump to tag, ^t jump back
 command! MakeTags !ctags -R .
@@ -42,3 +43,46 @@ command! MakeTags !ctags -R .
 "Line number Highlight
 set nu
 highlight LineNr term=bold cterm=NONE ctermfg=DarkGrey ctermbg=NONE gui=NONE guifg=DarkGrey guibg=NONE
+
+" Command HEXMODE 
+command -bar Hexmode call ToggleHex()
+
+" helper function to toggle hex mode
+function ToggleHex()
+  " hex mode should be considered a read-only operation
+  " save values for modified and read-only for restoration later,
+  " and clear the read-only flag for now
+  let l:modified=&mod
+  let l:oldreadonly=&readonly
+  let &readonly=0
+  let l:oldmodifiable=&modifiable
+  let &modifiable=1
+  if !exists("b:editHex") || !b:editHex
+    " save old options
+    let b:oldft=&ft
+    let b:oldbin=&bin
+    " set new options
+    setlocal binary " make sure it overrides any textwidth, etc.
+    silent :e " this will reload the file without trickeries 
+              "(DOS line endings will be shown entirely )
+    let &ft="xxd"
+    " set status
+    let b:editHex=1
+    " switch to hex editor
+    %!xxd
+  else
+    " restore old options
+    let &ft=b:oldft
+    if !b:oldbin
+      setlocal nobinary
+    endif
+    " set status
+    let b:editHex=0
+    " return to normal editing
+    %!xxd -r
+  endif
+  " restore values for modified and read only state
+  let &mod=l:modified
+  let &readonly=l:oldreadonly
+  let &modifiable=l:oldmodifiable
+endfunction
diff --git a/lock.png b/lock.png
new file mode 100644
index 0000000..712528b
--- /dev/null
+++ b/lock.png