diff --git a/dot_config/i3/bin/executable_brightness.sh b/dot_config/i3/bin/executable_brightness.sh
deleted file mode 100644
index 734efc9..0000000
--- a/dot_config/i3/bin/executable_brightness.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/bash
-
-case "$1" in
-    increase)
-        CURRENT=`cat /sys/class/backlight/intel_backlight/brightness`
-        ((FOO=CURRENT+500))
-        exec echo $FOO | tee /sys/class/backlight/intel_backlight/brightness
-        ;;
-    decrease)
-        CURRENT=`cat /sys/class/backlight/intel_backlight/brightness`
-        ((FOO=CURRENT-500))
-        exec echo $FOO | tee /sys/class/backlight/intel_backlight/brightness
-        ;;
-esac
-exit 0
diff --git a/dot_config/i3/bin/executable_exit.sh b/dot_config/i3/bin/executable_exit.sh
deleted file mode 100644
index 1b9d5c8..0000000
--- a/dot_config/i3/bin/executable_exit.sh
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/bin/sh
-lock() {
-    i3lock
-}
-
-case "$1" in
-    lock)
-        #i3lock -n -i ~/Pictures/wallpapers/wallpaper_big.png -c 000000 -f
-        sh ~/.config/i3/bin/lock.sh
-        ;;
-    logout)
-        i3-msg exit
-        ;;
-    suspend)
-         ~/.config/i3/bin/exit.sh lock && systemctl suspend
-        ;;
-    hibernate)
-         ~/.config/i3/bin/exit.sh lock && systemctl hibernate
-        ;;
-    reboot)
-        systemctl reboot
-        ;;
-    shutdown)
-        systemctl poweroff
-        ;;
-    *)
-        echo "Usage: $0 {lock|logout|suspend|hibernate|reboot|shutdown}"
-        exit 2
-esac
-
-exit 0
diff --git a/dot_config/i3/bin/executable_i3.config.keycodes b/dot_config/i3/bin/executable_i3.config.keycodes
deleted file mode 100644
index fd1e6d2..0000000
--- a/dot_config/i3/bin/executable_i3.config.keycodes
+++ /dev/null
@@ -1,165 +0,0 @@
-# WARNING
-# WARNING: This configuration file is a template for the i3-config-wizard to
-# WARNING: generate a config which uses keysyms in your current layout. It does
-# WARNING: not get loaded by i3. Please do not change it.
-# WARNING
-
-# i3 config file (v4)
-#
-# Please see http://i3wm.org/docs/userguide.html for a complete reference!
-
-set $mod Mod1
-
-# 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 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
-
-# start a terminal in the domain of the currently active window
-bindcode $mod+36 exec qubes-i3-sensible-terminal
-
-# kill focused window
-bindcode $mod+Shift+24 kill
-
-# start dmenu (a program launcher)
-bindcode $mod+40 exec --no-startup-id i3-dmenu-desktop --dmenu="dmenu -nb #d2d2d2 -nf #000000 -sb #63a0ff"
-
-# change focus
-bindcode $mod+44 focus left
-bindcode $mod+45 focus down
-bindcode $mod+46 focus up
-bindcode $mod+47 focus right
-
-# alternatively, you can use the cursor keys:
-bindcode $mod+113 focus left
-bindcode $mod+116 focus down
-bindcode $mod+111 focus up
-bindcode $mod+114 focus right
-
-# move focused window
-bindcode $mod+Shift+44 move left
-bindcode $mod+Shift+45 move down
-bindcode $mod+Shift+46 move up
-bindcode $mod+Shift+47 move right
-
-# alternatively, you can use the cursor keys:
-bindcode $mod+Shift+113 move left
-bindcode $mod+Shift+116 move down
-bindcode $mod+Shift+111 move up
-bindcode $mod+Shift+114 move right
-
-# split in horizontal orientation
-bindcode $mod+43 split h
-
-# split in vertical orientation
-bindcode $mod+55 split v
-
-# enter fullscreen mode for the focused container
-bindcode $mod+41 fullscreen
-
-# change container layout (stacked, tabbed, toggle split)
-bindcode $mod+39 layout stacking
-bindcode $mod+25 layout tabbed
-bindcode $mod+26 layout toggle split
-
-# toggle tiling / floating
-bindcode $mod+Shift+65 floating toggle
-
-# change focus between tiling / floating windows
-bindcode $mod+65 focus mode_toggle
-
-# focus the parent container
-bindcode $mod+38 focus parent
-
-# focus the child container
-#bindsym $mod+d focus child
-
-# switch to workspace
-bindcode $mod+10 workspace 1
-bindcode $mod+11 workspace 2
-bindcode $mod+12 workspace 3
-bindcode $mod+13 workspace 4
-bindcode $mod+14 workspace 5
-bindcode $mod+15 workspace 6
-bindcode $mod+16 workspace 7
-bindcode $mod+17 workspace 8
-bindcode $mod+18 workspace 9
-bindcode $mod+19 workspace 10
-
-# move focused container to workspace
-bindcode $mod+Shift+10 move container to workspace 1
-bindcode $mod+Shift+11 move container to workspace 2
-bindcode $mod+Shift+12 move container to workspace 3
-bindcode $mod+Shift+13 move container to workspace 4
-bindcode $mod+Shift+14 move container to workspace 5
-bindcode $mod+Shift+15 move container to workspace 6
-bindcode $mod+Shift+16 move container to workspace 7
-bindcode $mod+Shift+17 move container to workspace 8
-bindcode $mod+Shift+18 move container to workspace 9
-bindcode $mod+Shift+19 move container to workspace 10
-
-# reload the configuration file
-bindcode $mod+Shift+54 reload
-# restart i3 inplace (preserves your layout/session, can be used to upgrade i3)
-bindcode $mod+Shift+27 restart
-# exit i3 (logs you out of your X session)
-bindcode $mod+Shift+26 exec "i3-nagbar -t warning -m 'You pressed the exit shortcut. Do you really want to exit i3? This will end your X session.' -b 'Yes, exit i3' 'i3-msg exit'"
-
-# resize window (you can also use the mouse for that)
-mode "resize" {
-        # These bindings trigger as soon as you enter the resize mode
-
-        # Pressing left will shrink the window’s width.
-        # Pressing right will grow the window’s width.
-        # Pressing up will shrink the window’s height.
-        # Pressing down will grow the window’s height.
-        bindcode 44 resize shrink width 10 px or 10 ppt
-        bindcode 45 resize grow height 10 px or 10 ppt
-        bindcode 46 resize shrink height 10 px or 10 ppt
-        bindcode 47 resize grow width 10 px or 10 ppt
-
-        # same bindings, but for the arrow keys
-        bindcode 113 resize shrink width 10 px or 10 ppt
-        bindcode 116 resize grow height 10 px or 10 ppt
-        bindcode 111 resize shrink height 10 px or 10 ppt
-        bindcode 114 resize grow width 10 px or 10 ppt
-
-        # back to normal: Enter or Escape
-        bindcode 36 mode "default"
-        bindcode 9 mode "default"
-}
-
-bindcode $mod+27 mode "resize"
-
-# Start i3bar to display a workspace bar (plus the system information i3status
-# finds out, if available)
-bar {
-        status_command qubes-i3status
-        colors {
-            background #d2d2d2
-            statusline #00000
-
-            #class               #border #backgr #text
-            focused_workspace    #4c7899 #63a0ff #000000
-            active_workspace     #333333 #5f676a #ffffff
-            inactive_workspace   #222222 #333333 #888888
-            urgent_workspace     #BD2727 #E79E27 #000000
-        }
-}
-
-# Use a screen locker
-exec --no-startup-id "xautolock -detectsleep -time 3 -locker 'i3lock -d -c 000000' -notify 30 -notifier \"notify-send -t 2000 'Locking screen in 30 seconds'\""
-
-# Make sure all xdg autostart entries are started, this is (among other things)
-# necessary to make sure transient vm's come up
-exec --no-startup-id qubes-i3-xdg-autostart
diff --git a/dot_config/i3/bin/executable_i3blocks-battery b/dot_config/i3/bin/executable_i3blocks-battery
deleted file mode 100644
index 84d4a21..0000000
--- a/dot_config/i3/bin/executable_i3blocks-battery
+++ /dev/null
@@ -1,61 +0,0 @@
-#!/usr/bin/perl
-
-use strict;
-use warnings;
-use utf8;
-
-my $acpi;
-my $status;
-my $percent;
-my $full_text;
-my $short_text;
-my $bat_number = $ENV{BLOCK_INSTANCE} || 0;
-
-# read the first line of the "acpi" command output
-open (ACPI, "acpi -b | grep 'Battery $bat_number' |") or die;
-$acpi = <ACPI>;
-close(ACPI);
-
-# fail on unexpected output
-if ($acpi !~ /: (\w+), (\d+)%/) {
-	die "$acpi\n";
-}
-
-$status = $1;
-$percent = $2;
-$full_text = "";
-if ($status eq 'Discharging') {
-	$full_text .= "⚡ $percent%";
-	if ($acpi =~ /(\d\d:\d\d):/) {
-		$full_text .= " ($1)";
-	}
-} elsif ($status eq 'Charging') {
-	$full_text .= " $percent%";
-}
- elsif ($status eq 'Unknown' || $status eq 'Full') {
-	$full_text .= "⚡ $percent%";
-}
-
-# print text
-print "$full_text\n";
-print "$short_text\n";
-
-# consider color and urgent flag only on discharge
-if ($status eq 'Discharging') {
-
-	if ($percent < 20) {
-		print "#FF0000\n";
-	} elsif ($percent < 40) {
-		print "#FFAE00\n";
-	} elsif ($percent < 60) {
-		print "#FFF600\n";
-	} elsif ($percent < 85) {
-		print "#A8FF00\n";
-	}
-
-	if ($percent < 5) {
-		exit(33);
-	}
-}
-
-exit(0);
diff --git a/dot_config/i3/bin/executable_lock.sh b/dot_config/i3/bin/executable_lock.sh
deleted file mode 100644
index 9d6eaeb..0000000
--- a/dot_config/i3/bin/executable_lock.sh
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/bin/bash
-#
-# Dependencies: imagemagick, i3lock
-#
-# A script that takes current screenshot and blurs it to be
-# used with i3lock
-#
-# Copyright © 2016 Bharadwaj Machiraju <tunnelshade at gmail dot com>
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-scrot /tmp/screen_locked.png
-convert /tmp/screen_locked.png -blur 20x20 /tmp/screen_locked2.png
-i3lock -i /tmp/screen_locked2.png
diff --git a/dot_config/i3/bin/executable_monitor.sh b/dot_config/i3/bin/executable_monitor.sh
deleted file mode 100644
index 366af82..0000000
--- a/dot_config/i3/bin/executable_monitor.sh
+++ /dev/null
@@ -1,22 +0,0 @@
-!/bin/bash
-
-
-case "$1" in
-    one)
-        i3-msg workspace "6: Use it!"; i3-msg move workspace to output LVDS-1
-        i3-msg workspace "7: Editor"; i3-msg move workspace to output LVDS-1
-        i3-msg workspace "8: Tor"; i3-msg move workspace to output LVDS-1
-        i3-msg workspace "9: Internet"; i3-msg move workspace to output LVDS-1
-        i3-msg workspace "10: Music"; i3-msg move workspace to output LVDS-1
-        i3-msg workspace "1: Terminals"
-        ;;
-    two)
-        i3-msg workspace "6: Use it!"; i3-msg move workspace to output DP-1
-        i3-msg workspace "7: Editor"; i3-msg move workspace to output DP-1
-        i3-msg workspace "8: Tor"; i3-msg move workspace to output DP-1
-        i3-msg workspace "9: Internet"; i3-msg move workspace to output DP-1
-        i3-msg workspace "10: Music"; i3-msg move workspace to output DP-1
-        i3-msg workspace "1: Terminals"
-        ;;
-esac
-exit 0
diff --git a/dot_config/i3/bin/executable_toggletouchpad.sh b/dot_config/i3/bin/executable_toggletouchpad.sh
deleted file mode 100644
index 9d55e1f..0000000
--- a/dot_config/i3/bin/executable_toggletouchpad.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-if synclient -l | grep "TouchpadOff .*=.*0" ; then
-    synclient TouchpadOff=1 ;
-else
-    synclient TouchpadOff=0 ;
-fi
diff --git a/dot_config/i3/config b/dot_config/i3/config
deleted file mode 100644
index c103ad5..0000000
--- a/dot_config/i3/config
+++ /dev/null
@@ -1,271 +0,0 @@
-# i3 config file (v4)
-#
-# Please see http://i3wm.org/docs/userguide.html for a complete reference!
-
-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.
-font pango:monospace 7
-
-# # BORDERS ======================
-# set $bo #00adee
-# set $se #363636
-# set $ur #f7003a
-# set $dr #bb0020
-# set $t1 #888888
-# set $t2 #ffffff
-# set $bl #000000
-
-# client.focused              $bl     $bo         $bl     $t2	
-# client.unfocused            $bl     $se         $t1     $se
-# client.focused_inactive     $bl     $bl         $bo     $se
-# client.urgent               $ur     $ur         $bl     $ur
-# client.background $bl
-
-# # Really small borders and no title for windows
-# for_window [class="^."] border pixel 1
-
-# #hide_edge_borders on smart?..
-# hide_edge_borders smart #former off
-
-# for_window [class=".*"] title_format " %title"
-
-# new_window pixel 5
-
-
-# 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 8
-
-# Use Mouse+$mod to drag floating windows to their wanted position
-floating_modifier $mod
-
-# kill focused window
-bindsym $mod+Shift+q kill
-
-# start i3-dmenu-desktop (a new program launcher)
-#bindsym $mod+d exec --no-startup-id i3-dmenu-desktop
-bindsym $mod+d exec rofi -show run
-
-# Terminal shortcut
-bindsym $mod+Return exec i3-sensible-terminal
-
-# change focus
-bindsym $mod+Left focus left
-bindsym $mod+Down focus down
-bindsym $mod+Up focus up
-bindsym $mod+Right focus right
-
-bindsym $mod+j focus left
-bindsym $mod+k focus down
-bindsym $mod+l focus up
-bindsym $mod+semicolon focus right
-
-# move focused window
-bindsym $mod+Shift+Left move left
-bindsym $mod+Shift+Down move down
-bindsym $mod+Shift+Up move up
-bindsym $mod+Shift+Right move right
-
-bindsym $mod+Shift+j move left
-bindsym $mod+Shift+k move down
-bindsym $mod+Shift+l move up
-bindsym $mod+Shift+semicolon move right
-
-bindsym $mod+Shift+exclam move workspace $workspace1
-bindsym $mod+Shift+at move workspace $workspace2
-bindsym $mod+Shift+numbersign move workspace $workspace3
-bindsym $mod+Shift+dollar move workspace $workspace4
-bindsym $mod+Shift+percent move workspace $workspace5
-bindsym $mod+Shift+asciicircum move workspace $workspace6
-bindsym $mod+Shift+ampersand move workspace $workspace7
-bindsym $mod+Shift+asterisk move workspace $workspace8
-bindsym $mod+Shift+parenleft move workspace $workspace9
-bindsym $mod+Shift+parenright move workspace $workspace10
-
-# split in horizontal orientation
-bindsym $mod+h split h
-
-# split in vertical orientation
-bindsym $mod+v split v
-
-# enter fullscreen mode for the focused container
-bindsym $mod+f fullscreen toggle
-
-# change container layout (stacked, tabbed, toggle split)
-bindsym $mod+s layout stacking
-bindsym $mod+w layout tabbed
-bindsym $mod+e layout toggle split
-
-# toggle tiling / floating
-bindsym $mod+Shift+space floating toggle
-
-# change focus between tiling / floating windows
-# bindsym $mod+space focus mode_toggle
-
-# focus the parent container
-bindsym $mod+a focus parent
-
-# focus the child container
-#bindsym $mod+d focus child
-
-set $workspace1 "1"
-set $workspace2 "2"
-set $workspace3 "3"
-set $workspace4 "4"
-set $workspace5 "5"
-set $workspace6 "6"
-set $workspace7 "7"
-set $workspace8 "8"
-set $workspace9 "9"
-set $workspace10 "10"
-
-workspace $workspace1 output LVDS-1
-workspace $workspace2 output LVDS-1
-workspace $workspace3 output LVDS-1
-workspace $workspace4 output LVDS-1
-workspace $workspace5 output LVDS-1
-workspace $workspace6 output LVDS-1
-workspace $workspace7 output LVDS-1
-workspace $workspace8 output LVDS-1
-workspace $workspace9 output LVDS-1
-workspace $workspace10 output LVDS-1
-
-# switch to workspace
-bindsym $mod+1 workspace $workspace1
-bindsym $mod+2 workspace $workspace2
-bindsym $mod+3 workspace $workspace3
-bindsym $mod+4 workspace $workspace4
-bindsym $mod+5 workspace $workspace5
-bindsym $mod+6 workspace $workspace6
-bindsym $mod+7 workspace $workspace7
-bindsym $mod+8 workspace $workspace8
-bindsym $mod+9 workspace $workspace9
-bindsym $mod+0 workspace $workspace10
-
-# reload the configuration file
-#bindsym $mod+Shift+c reload
-
-# restart i3 inplace (preserves your layout/session, can be used to upgrade i3)
-bindsym $mod+Shift+r restart
-
-# resize window (you can also use the mouse for that)
-mode "resize" {
-        # These bindings trigger as soon as you enter the resize mode
-
-        # Pressing left will shrink the window’s width.
-        # Pressing right will grow the window’s width.
-        # Pressing up will shrink the window’s height.
-        # Pressing down will grow the window’s height.
-        bindsym j resize shrink width 10 px or 10 ppt
-        bindsym k resize grow height 10 px or 10 ppt
-        bindsym l resize shrink height 10 px or 10 ppt
-        bindsym semicolon resize grow width 10 px or 10 ppt
-
-        # same bindings, but for the arrow keys
-        bindsym Left resize shrink width 10 px or 10 ppt
-        bindsym Down resize grow height 10 px or 10 ppt
-        bindsym Up resize shrink height 10 px or 10 ppt
-        bindsym Right resize grow width 10 px or 10 ppt
-
-        # back to normal: Enter or Escape
-        bindsym Return mode "default"
-        bindsym Escape mode "default"
-}
-
-bindsym $mod+r mode "resize"
-
-bindsym $mod+Tab workspace next
-bindsym $mod+Shift+Tab workspace prev
-
-bindsym $mod+Shift+n exec --no-startup-id ~/.config/i3/bin/monitors.sh one
-bindsym $mod+Shift+m exec --no-startup-id ~/.config/i3/bin/monitors.sh two
-
-# Move workspaces on monitors
-bindsym Shift+$mod+bracketright move workspace to output right
-bindsym Shift+$mod+bracketleft move workspace to output left
-
-# Pulse Audio controls
-bindsym XF86AudioRaiseVolume exec --no-startup-id pactl set-sink-volume 0 +5% #increase sound volume
-bindsym XF86AudioLowerVolume exec --no-startup-id pactl set-sink-volume 0 -5% #decrease sound volume
-bindsym XF86AudioMute exec --no-startup-id pactl set-sink-mute 0 toggle # mute sound
-
-# Sreen brightness controls
-bindsym XF86MonBrightnessUp exec xbacklight -inc 20 # increase screen brightness
-bindsym XF86MonBrightnessDown exec xbacklight -dec 20 # decrease screen brightness
-#bindsym XF86MonBrightnessUp exec ~/.config/i3/bin/brightness.sh increase # increase screen brightness
-#bindsym XF86MonBrightnessDown exec ~/.config/i3/bin/brightness.sh decrease  # decrease screen brightness
-
-# Touchpad controls
-bindsym XF86TouchpadToggle exec /some/path/toggletouchpad.sh # toggle touchpad
-
-# Media player controls
-bindsym XF86AudioPlay exec playerctl play
-bindsym XF86AudioPause exec playerctl pause
-bindsym XF86AudioNext exec playerctl next
-bindsym XF86AudioPrev exec playerctl previous
-
-# Set background wallpaper
-exec --no-startup-id nm-applet
-exec --no-startup-id blueman-applet
-exec --no-startup-id volumeicon
-exec_always --no-startup-id feh --bg-scale ~/.config/i3/personal/wallpaper.jpg
-
-# Logout commands
-set $mode_system System (l) lock, (e) logout, (s) suspend, (h) hibernate, (r) reboot, (Shift+s) shutdown
-mode "$mode_system" {
-    bindsym l exec --no-startup-id ~/.config/i3/bin/exit.sh lock, mode "default"
-    bindsym e exec --no-startup-id ~/.config/i3/bin/exit.sh logout, mode "default"
-    bindsym s exec --no-startup-id ~/.config/i3/bin/exit.sh suspend, mode "default"
-    bindsym h exec --no-startup-id ~/.config/i3/bin/exit.sh hibernate, mode "default"
-    bindsym r exec --no-startup-id ~/.config/i3/bin/exit.sh reboot, mode "default"
-    bindsym Shift+s exec --no-startup-id ~/.config/i3/bin/exit.sht shutdown, mode "default"
-
-    # back to normal: Enter or Escape
-    bindsym Return mode "default"
-    bindsym Escape mode "default"
-}
-
-bindsym $mod+Escape mode "$mode_system"
-
-
-# Use a screen locker
-exec --no-startup-id "xautolock -detectsleep -time 3 -locker 'i3lock -d -c 000000' -notify 30 -notifier \"notify-send -t 2000 'Locking screen in 30 seconds'\""
-
-# Start i3bar to display a workspace bar (plus the system information i3status
-# finds out, if available)
-bar {
-	colors {
-		# Whole color settings
-		background #111111
-		statusline #ffffff
-		separator  #666666
-
-		# Type             border  background font
-		focused_workspace  #008fff #007fff #ffffff
-		active_workspace   #333333 #5f676a #ffffff
-		inactive_workspace #333333 #222222 #888888
-		urgent_workspace   #aa0000 #990000 #ffffff
- 	}
-
-  font pango:Lato-Regular 8
-
-	# i3bar position
-	position top
-
-    # Debian
-    status_command i3blocks -c ~/.config/i3/i3blocks.conf
-    #status_command i3status -c ~/.config/i3/i3status.conf
-    # Qubes
-    # status_command ~/.config/i3/bin/qubes-i3status
-}
-
-# Use a screen locker
-exec --no-startup-id "xautolock -detectsleep -time 3 -locker 'i3lock -d -c 000000' -notify 30 -notifier \"notify-send -t 2000 'Locking screen in 30 seconds'\""
-
-# Use XFCE services
-exec --no-startup-id xfsettingsd --sm-client-disable &
-
-# Use compose key for more characters
-exec --no-startup-id setxkbmap us -variant altgr-intl
diff --git a/dot_config/i3/i3blocks.conf b/dot_config/i3/i3blocks.conf
deleted file mode 100644
index 95a7c10..0000000
--- a/dot_config/i3/i3blocks.conf
+++ /dev/null
@@ -1,158 +0,0 @@
-# i3blocks config file
-#
-# Please see man i3blocks for a complete reference!
-# The man page is also hosted at http://vivien.github.io/i3blocks
-#
-# List of valid properties:
-#
-# align
-# color
-# command
-# full_text
-# instance
-# interval
-# label
-# min_width
-# name
-# separator
-# separator_block_width
-# short_text
-# signal
-# urgent
-
-
-# Global properties
-#
-# The top properties below are applied to every block, but can be overridden.
-# Each block command defaults to the script name to avoid boilerplate.
-command=/usr/share/i3blocks/$BLOCK_NAME
-separator_block_width=15
-markup=none
-
-# Mail notifications
-[mails]
-label=
-command= ~/.mail/bin/mail-status.sh
-color=#666666
-interval=10
-signal=12
-
-# CPU usage
-#
-# The script may be called with -w and -c switches to specify thresholds,
-# see the script for details.
-
-[cpu_usage]
-label=
-interval=10
-#min_width=CPU: 100.00%
-separator=false
-color=#666666
-
-# Memory usage
-#
-# The type defaults to "mem" if the instance is not specified.
-[memory]
-#label=M:
-interval=30
-#separator=false
-color=#666666
-
-#[memory]
-#label=S:
-#instance=swap
-#interval=30
-
-# Disk usage
-#
-# The directory defaults to $HOME if the instance is not specified.
-# The script may be called with a optional argument to set the alert
-# (defaults to 10 for 10%).
-[disk]
-label=
-instance=/
-interval=30
-color=#666666
-
-# Network interface monitoring
-#
-# If the instance is not specified, use the interface used for default route.
-# The address can be forced to IPv4 or IPv6 with -4 or -6 switches.
-#[iface]
-#instance=wlp3s0
-#color=#666666
-#interval=10
-#separator=false
-
-#[ssid]
-#label=
-#command=echo "$(iw dev wlp3s0 link | grep SSID | cut -d " " -f 2-)"
-#color=#d33682
-#interval=5
-#separator=false
-
-#[strength]
-#label=E
-#command=echo "$(iw dev wlp3s0 link | grep signal | cut -d " " -f 2-)"
-#interval=10
-#color=#cb4b16
-
-#[wifi]
-#color=#666666
-#label=Wi
-#instance=wlp3s0
-#interval=10
-
-#[bandwidth]
-#instance=eth0
-#interval=5
-
-#[load_average]
-#interval=10
-
-# Battery indicator
-#
-# The battery instance defaults to 0.
-[battery]
-command=~/.config/i3/bin/i3blocks-battery BAT0
-interval=5
-color=#666666
-
-# Date Time
-#
-[time]
-command=date '+%H:%M %Y-%m-%d'
-interval=5
-color=#666666
-
-# Generic media player support
-#
-# This displays "ARTIST - SONG" if a music is playing.
-# Supported players are: spotify, vlc, audacious, xmms2, mplayer, and others.
-#[mediaplayer]
-#instance=spotify
-#interval=5
-#signal=10
-
-# OpenVPN support
-#
-# Support multiple VPN, with colors.
-#[openvpn]
-#interval=20
-
-
-# Key indicators
-#
-# Add the following bindings to i3 config file:
-#
-# bindsym --release Caps_Lock exec pkill -SIGRTMIN+11 i3blocks
-# bindsym --release Num_Lock  exec pkill -SIGRTMIN+11 i3blocks
-#[keyindicator]
-#instance=CAPS
-#interval=once
-#signal=11
-
-#[keyindicator]
-#instance=NUM
-#interval=once
-#signal=11
diff --git a/dot_config/i3/i3status.conf b/dot_config/i3/i3status.conf
deleted file mode 100644
index dcf8af5..0000000
--- a/dot_config/i3/i3status.conf
+++ /dev/null
@@ -1,60 +0,0 @@
-# i3status configuration file.
-# see "man i3status" for documentation.
-
-# It is important that this file is edited as UTF-8.
-# The following line should contain a sharp s:
-# ß
-# If the above line is not correctly displayed, fix your editor first!
-
-general {
-        colors = true
-        interval = 5
-}
-
-order += "disk /"
-order += "disk /home"
-order += "wireless _first_"
-# order += "ethernet _first_"
-order += "battery all"
-order += "load"
-order += "run_watch VPN"
-order += "cpu_usage"
-# order += "cpu_temperature 0"
-order += "tztime local"
-
-wireless _first_ {
-        format_up = "W: (%quality at %essid) %ip"
-        format_down = "W: down"
-}
-
-ethernet _first_ {
-        # if you use %speed, i3status requires root privileges
-        format_up = "E: %ip (%speed)"
-        format_down = "E: down"
-}
-
-cpu_temperature 0 {
-     format = " T: %degrees °C "
-     path = "/sys/devices/platform/coretemp.0/temp1_input"
-}
-
-cpu_usage {
-        format = "CPU: %usage "
-}
-
-battery all {
-        format = "BAT: %status %percentage %remaining"
-}
-
-tztime local {
-        format = "%Y-%m-%d %H:%M:%S"
-}
-
-load {
-        format = "LOAD: %1min"
-}
-
-disk "/" {
-        format = "Avail: %avail"
-}
-
diff --git a/dot_gitconfig b/dot_gitconfig
index ff2240b..c567e22 100644
--- a/dot_gitconfig
+++ b/dot_gitconfig
@@ -1,6 +1,3 @@
-[core]
-  editor = vi
-  excludesfile = ./.gitignore_global
 [include]
   path      = .gituser # Store personal data in external file
 [alias]
@@ -13,7 +10,7 @@
   ls        = ls-files
   pl        = pull
   ps        = push
-  r         = rebase
+  r         = rebase  
   s         = status
   sa        = stash apply
   sc        = stash clear
@@ -47,4 +44,7 @@
   autoSetupRemote = true
 [pull]
   rebase    = true
+[core]
+	editor = nvim
+	excludesfile = /Users/felix.delattre/.gitignore_global