@@ -0,0 +1,7 @@
+setlocal tabstop=4
+setlocal softtabstop=4
+setlocal shiftwidth=4
+setlocal expandtab
+setlocal autoindent
+setlocal smarttab
+setlocal formatoptions=croql

@@ -7,7 +7,6 @@ paq 'airblade/vim-gitgutter'
 paq{ 'vim/vim-colors-plain', url='https://git.peppe.rs' }
 paq 'dbeniamine/vim-mail'
 paq 'tpope/vim-surround'
-paq 'plasticboy/vim-markdown'
 paq{ 'vim/better-text-objs', url='https://git.peppe.rs' }
 paq 'wellle/targets.vim'
 paq 'tpope/vim-rsi'

@@ -83,6 +83,8 @@ set shortmess+=c
 ]], false)
 
 -- complete from buffer
-map('i', '<expr><Tab>', '<C-n>', options)
+vim.api.nvim_exec([[
+inoremap <expr> <Tab> getline('.')[col('.') - 2] =~ '\w' ? "<C-N>" : "<Tab>"
+]], false)
 
 return M

@@ -19,7 +19,8 @@ inbox +Inbox \
         drafts +Drafts \
         trash +Trash \
         archive +Archive \
-        spam +Junk
+        spam +Junk \
+        lob +Inbox/Lobste.rs
 }
 
 set prompt='> '

@@ -1,20 +1,30 @@
 [user]
-       name = Anirudh Oppiliappan
-       email = x@icyphox.sh
-       signingkey = 8A93F96F78C5D4C4
+        name = Anirudh Oppiliappan
+        email = x@icyphox.sh
+        signingkey = 8A93F96F78C5D4C4
 [commit]
-	   gpgsign = true
-       verbose = true
+        gpgsign = true
+        verbose = true
 [gpg]
-       program = gpg
+        program = gpg
 [credential]
-	helper = store
+        helper = store
 
 [sendemail]
-    smtpserver = smtp.migadu.com
-    smtpuser = x@icyphox.sh
-    smtpencryption = ssl
-    smtpserverport = 465
+        smtpserver = smtp.migadu.com
+        smtpuser = x@icyphox.sh
+        smtpencryption = ssl
+        smtpserverport = 465
 
 [init]
-    defaultBranch = master
+        defaultBranch = master
+[diff]
+	tool = vimdiff3
+[difftool "vimdiff3"]
+	path = nvim
+        prompt = false
+[merge]
+	tool = vimdiff3
+[mergetool "vimdiff3"]
+	path = nvim
+        prompt = false

@@ -25,8 +25,8 @@
 # window binds
 bind -n C-M-y previous-window
 bind -n C-M-o next-window
-bind-key c split-window -h
-bind-key v new-window
+bind-key c split-window -h -c "#{pane_current_path}"
+bind-key v new-window -c "#{pane_current_path}"
 bind-key s choose-session
 bind-key ) swap-window -t +2
 bind-key ( swap-window -t -1

@@ -0,0 +1,7 @@
+#!/bin/sh
+
+[[ "$#" = 0 ]] && {
+    printf '%s\n' "usage: file1 file2 ... fileN"
+    exit
+}
+nvim -d "$@"

@@ -17,4 +17,4 @@ salt = on
 
 [data]
 __passphrase__ = on
-znc = "CBC8DE0DF2241526D4F1A56F0D210AE7910A1832803116ED17184A68A9EBA361238E41B264BDCB145D263E835D1CE9AC5B9872"
+znc = "322521FB3C64FE5D45CC4CF2714F63A73065545A7F108B47362487AE3136BD8F9E50A591CED64EF08B315732847FE40D8BC737"

@@ -390,17 +390,18 @@ title.type = window
 
 [layout]
 default.buffer = "core;weechat;1"
-default.buffer = "irc;server.deavmi;2"
-default.buffer = "irc;deavmi.#crxn;3"
-default.buffer = "irc;deavmi.#general;4"
-default.buffer = "irc;deavmi.#programming;5"
-default.buffer = "irc;deavmi.*status;6"
-default.buffer = "irc;server.rizon;7"
-default.buffer = "irc;rizon.#buddy;8"
-default.buffer = "irc;rizon.#homescreen;9"
-default.buffer = "irc;rizon.#rice;10"
-default.buffer = "irc;rizon.*status;11"
-default.buffer = "irc;rizon.brynjar;12"
+default.buffer = "irc;server.freenode;2"
+default.buffer = "irc;freenode.##crustaceans;3"
+default.buffer = "irc;freenode.#kisslinux;4"
+default.buffer = "irc;freenode.#kubernetes;5"
+default.buffer = "irc;freenode.#lobsters;6"
+default.buffer = "irc;freenode.#neovim;7"
+default.buffer = "irc;freenode.#openbsd;8"
+default.buffer = "irc;freenode.*status;9"
+default.buffer = "irc;server.rizon;10"
+default.buffer = "irc;rizon.#buddy;11"
+default.buffer = "irc;rizon.#homescreen;12"
+default.buffer = "irc;rizon.#rice;13"
 default.window = "1;0;0;0;irc;rizon.Carp"
 default.current = on