From bb625123d1f09c6f87eba1266fede3a66d3f1e87 Mon Sep 17 00:00:00 2001
From: Urbain Vaes <urbain@vaes.uk>
Date: Fri, 9 Mar 2018 11:47:33 +0000
Subject: Add binding to force update i3 status

---
 i3/.config/i3/config       | 29 +++--------------------------
 i3/.config/i3blocks/config |  3 ++-
 vim/.vimrc                 |  5 ++++-
 3 files changed, 9 insertions(+), 28 deletions(-)

diff --git a/i3/.config/i3/config b/i3/.config/i3/config
index 3b39417..6ded158 100644
--- a/i3/.config/i3/config
+++ b/i3/.config/i3/config
@@ -1,27 +1,7 @@
-# This file has been auto-generated by i3-config-wizard(1).
-# It will not be overwritten, so edit it as you like.
-#
-# Should you change your keyboard layout some time, delete
-# this file and re-run i3-config-wizard(1).
-#
-
-# i3 config file (v4)
-#
-# Please see http://i3wm.org/docs/userguide.html for a complete reference!
-
+# Modifier
 set $mod Mod4
 
-# Font for window titles. Will also be used by the bar unless a different font
-# is used in the bar {} block below.
-# This font is widely installed, provides lots of unicode glyphs, right-to-left
-# text rendering and scalability on retina/hidpi displays (thanks to pango).
 font pango:DejaVu Sans Mono, Awesome 8
-# Before i3 v4.8, we used to recommend this one as the default:
-# font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1
-# The font above is very space-efficient, that is, it looks good, sharp and
-# clear in small sizes. However, its unicode glyph coverage is limited, the old
-# X core fonts rendering does not support right-to-left and this being a bitmap
-# font, it doesn’t scale on retina/hidpi displays.
 
 # Use Mouse+$mod to drag floating windows to their wanted position
 floating_modifier $mod
@@ -36,11 +16,7 @@ bindsym $mod+Shift+Return exec --no-startup-id i3-sensible-terminal -name scratc
 # kill focused window
 bindsym $mod+d kill
 
-# start dmenu (a program launcher)
-# bindsym $mod+p exec dmenu_run
-# There also is the (new) i3-dmenu-desktop which only displays applications
-# shipping a .desktop file. It is a wrapper around dmenu, so you need that
-# installed.
+# Launcher
 bindsym $mod+p exec --no-startup-id i3-dmenu-desktop
 bindsym $mod+Shift+p exec --no-startup-id rofi -show window
 
@@ -117,6 +93,7 @@ bindsym $mod+Shift+bracketright move container to workspace number 10
 bindsym $mod+Shift+c reload
 bindsym $mod+Shift+r restart
 bindsym $mod+Shift+e exit
+bindsym $mod+Shift+u exec --no-startup-id pkill -RTMIN+1 i3blocks
 
 mode "resize" {
         bindsym h resize shrink width  10 px or 10 ppt
diff --git a/i3/.config/i3blocks/config b/i3/.config/i3blocks/config
index 48faf62..fa2f5aa 100644
--- a/i3/.config/i3blocks/config
+++ b/i3/.config/i3blocks/config
@@ -27,6 +27,7 @@
 command=/usr/lib/i3blocks/$BLOCK_NAME
 separator_block_width=15
 markup=pango
+signal=1
 
 [primary]
 label=<span color='gray'></span>
@@ -82,6 +83,6 @@ instance=/
 interval=60
 
 [time]
-label=<span color='gray'></span>
+label=<span color='gray'></span>
 command=date '+%Y-%m-%d %H:%M'
 interval=5
diff --git a/vim/.vimrc b/vim/.vimrc
index 30bc942..20c0688 100644
--- a/vim/.vimrc
+++ b/vim/.vimrc
@@ -11,11 +11,11 @@ let maplocalleader = ","
 " }}}
 "" Plugins {{{
 call plug#begin('~/.vim/plugged')
-
 Plug 'LnL7/vim-nix'
 Plug 'PotatoesMaster/i3-vim-syntax'
 Plug 'SirVer/ultisnips'
 Plug 'airblade/vim-gitgutter'
+Plug 'AndrewRadev/splitjoin.vim'
 Plug 'beloglazov/vim-online-thesaurus'
 Plug 'christoomey/vim-tmux-navigator'
 Plug 'critiqjo/lldb.nvim'
@@ -53,6 +53,7 @@ Plug 'tpope/vim-fugitive'
 Plug 'tpope/vim-obsession'
 Plug 'tpope/vim-repeat'
 Plug 'tpope/vim-rsi'
+Plug 'tpope/vim-scriptease'
 Plug 'tpope/vim-sensible'
 Plug 'tpope/vim-surround'
 Plug 'tpope/vim-unimpaired'
@@ -334,6 +335,8 @@ nnoremap <silent> ]b :BufSurfForward<cr>
 nnoremap <silent> [B :BufSurfBack<cr>:bd! #<cr>
 nnoremap <silent> ]B :BufSurfForward<cr>:bd! #<cr>
 
+nnoremap ,s :source %<cr>
+
 " }}}
 "" Colorscheme {{{
 function! SaveColo(...)
-- 
cgit v1.2.3