From 13c6216796475b5add8c2e9b2d60c8d72613f620 Mon Sep 17 00:00:00 2001
From: Smirnov Olexandr <ss2316544@gmail.com>
Date: Mon, 4 Jan 2021 14:42:57 +0200
Subject: [PATCH] Update nvim

---
 bin/ipp                     |  5 +----
 config/alacritty.yml        |  3 +--
 config/i3/config            |  5 +++--
 config/nvim/init.vim        | 17 +++++++++++------
 script/autolock             |  2 ++
 script/dmenu/dmenu-power.sh |  2 +-
 6 files changed, 19 insertions(+), 15 deletions(-)
 create mode 100755 script/autolock

diff --git a/bin/ipp b/bin/ipp
index bc44cbf..8efadf8 100755
--- a/bin/ipp
+++ b/bin/ipp
@@ -1,5 +1,2 @@
 #!/bin/sh
-if [ -f '/usr/bin/curl' ]
-then curl ipinfo.io/ip
-else wget -qO- ipinfo.io/ip
-fi
+curl ipinfo.io/ip
diff --git a/config/alacritty.yml b/config/alacritty.yml
index 2e603fb..87a608a 100644
--- a/config/alacritty.yml
+++ b/config/alacritty.yml
@@ -1,5 +1,5 @@
 window:
-  title: Alacritty
+  title: Terminal
   class:
     instance: Alacritty
     general: Alacritty
@@ -7,7 +7,6 @@ window:
     x: 0
     y: 0
 
-  
 font:
   antialias: lcd
   hinting: true
diff --git a/config/i3/config b/config/i3/config
index 77e65e8..377c803 100644
--- a/config/i3/config
+++ b/config/i3/config
@@ -4,7 +4,7 @@ set $mod Mod4
 set $alt Mod1
 floating_modifier $mod
 
-# Font
+# Set font
 font monospace 10
 font pango:JetBrains Mono 10
 
@@ -26,7 +26,7 @@ exec --no-startup-id exec nitrogen --restore
 exec --no-startup-id exec setxkbmap "us,ua" ",winkeys" "grp:alt_shift_toggle" -option "ctrl:nocaps"
 exec --no-startup-id exec org.telegram.desktop
 exec --no-startup-id exec lxsession
-exec --no-startup-id exec xautolock -time 3 -locker "betterlockscreen --off 180 -t \"Computer is lockerd\" -l"
+exec_always --no-startup-id exec $HOME/.script/autolock
 exec_always --no-startup-id exec $HOME/.config/i3/bar.sh
 exec --no-startup-id exec discord
 #exec --no-startup-id exec conky
@@ -36,6 +36,7 @@ exec --no-startup-id exec discord
 
 # Kill window
 bindsym $mod+q kill
+bindsym --release $mod+Shift+q exec xkill
 
 # Restart i3wm
 bindsym $mod+Control+r restart
diff --git a/config/nvim/init.vim b/config/nvim/init.vim
index 0d7e2b5..7b11334 100644
--- a/config/nvim/init.vim
+++ b/config/nvim/init.vim
@@ -9,10 +9,10 @@ call plug#begin('~/.vim/plugged')
     Plug 'itchyny/lightline.vim'                   " Status line
     Plug 'vimwiki/vimwiki', {'on': 'VimwikiIndex'} " Notes manager in (n)vim
     
-    " Color sheme
+    " Color scheme
     Plug 'Smirnov-O/nten16.vim'
 
-    " Project/file nafigation
+    " Project/file navigation
     Plug 'scrooloose/nerdtree',    {'on': 'NERDTreeToggle'}
     Plug 'ryanoasis/vim-devicons', {'on': 'NERDTreeToggle'}
     Plug 'preservim/tagbar',       {'on': 'TagbarToggle'} 
@@ -32,6 +32,7 @@ call plug#begin('~/.vim/plugged')
     Plug 'mattn/emmet-vim',              {'on':  'Emmet'}
     Plug 'cakebaker/scss-syntax.vim',    {'for': 'scss'}
     Plug 'PotatoesMaster/i3-vim-syntax', {'for': 'i3'}
+    Plug 'fatih/vim-go',                 {'for': 'go'}
 call plug#end()
 
 " Colors
@@ -40,7 +41,7 @@ set background=dark
 colo nten16
 set t_Co=256
 
-" Syntax & line numbars
+" Syntax & line numbers
 syntax on
 set number
 set relativenumber
@@ -88,6 +89,10 @@ set smartcase
 set hidden
 set smartindent
 
+" Spell
+set spell
+set spelllang=en_us
+
 " Disable sound
 set visualbell t_vb=
 
@@ -178,6 +183,9 @@ let g:floaterm_width     = 0.6
 let g:floaterm_autoclose = 2
 nmap <A-t> :FloatermNew<CR>
 
+" Go
+let g:go_template_autocreate = 0
+
 " == Maping
 let mapleader=","
 
@@ -212,6 +220,3 @@ noremap <A-9> :tabn 9<CR>
 " Buffer(s)
 noremap <leader>p :bnext<CR>
 noremap <leader>o :bprev<CR>
-
-" Autostart
-"autocmd VimEnter * execute "source ~/.config/nvim/init.vim"
diff --git a/script/autolock b/script/autolock
new file mode 100755
index 0000000..005a8a1
--- /dev/null
+++ b/script/autolock
@@ -0,0 +1,2 @@
+#!/bin/sh
+xautolock -time 3 -locker "betterlockscreen --off 180 -t 'Computer is lokerd' -l"
diff --git a/script/dmenu/dmenu-power.sh b/script/dmenu/dmenu-power.sh
index 49d9694..f04c909 100755
--- a/script/dmenu/dmenu-power.sh
+++ b/script/dmenu/dmenu-power.sh
@@ -4,7 +4,7 @@ Lock
 Logout
 Reboot")
 
-choice=$(echo -e "${options[@]}" | dmenu -p "Power" $@)
+choice=$(echo -e "${options[@]}"|dmenu -p "Power" $@)
 case "$choice" in
     "ShutDown")
         case "$(echo -e "Yes\nNo"|dmenu -p "ShutDown" $@)" in