Updates :)

7 files changed, 64 insertions, 37 deletions

diff --git a/dot_Xdefaults b/dot_Xdefaults
index 24fcfbc..2890111 100644
--- a/dot_Xdefaults
+++ b/dot_Xdefaults
@@ -2,11 +2,11 @@
 
 #xterm*scrollTtyOutput:	false
 xterm*rightScrollBar:	true
-xterm*faceName:	inconsolata:pixelsize=14
+xterm*faceName:	Ubuntu Mono:pixelsize=16
 xterm*utf8:	2
-xterm*scrollBar:	true
+xterm*scrollBar:	false
 xterm*saveLines:	512
-xterm*geometry:	80x30
+xterm*geometry:	80x25
 xterm*scrollTtyKeypress:	true
 xterm*dynamicColors:	true
 xterm*jumpScroll:	true
@@ -14,6 +14,7 @@ xterm*eightBitInput:	true
 xterm*multiScroll:	true
 xterm*toolBar:	false
 
+#*reverseVideo:true
 *Text.background:	#efefef
 *foreground:	#dddddd
 *background:	#111111
@@ -52,7 +53,8 @@ Rxvt*shading:	30
 
 #URxvt.font:	-misc-fixed-medium-r-normal--13-120-75-75-c-70-iso8859-1
 #URxvt.font:	-misc-fixed-medium-r-normal--15-120-90--c-90-iso8859-1
-URxvt.font: xft:inconsolata:size=11
+URxvt.font: xft:Ubuntu Mono:size=11
+#URxvt.font: xft:ProFontIIx:size=10
 
 #xft.rgba:	rgb
 #xft.hinting:	true
@@ -64,7 +66,9 @@ Xft.antialias: true
 
 URxvt.perl-ext-common:	default,clipboard,url-select,matcher,resize-font
 URxvt.keysym.M-u: perl:url-select:select_next
-URxvt.url-select.launcher: /usr/bin/firefox -new-tab
+#URxvt.url-select.launcher: /usr/bin/firefox -new-tab
+URxvt.url-select.launcher: /usr/bin/opera
+#URxvt.url-select.launcher: /usr/bin/dillo
 URxvt.url-select.underline: true
 URxvt.resize-font.smaller: C-Down
 URxvt.resize-font.bigger: C-Up
diff --git a/dot_bashrc_chitanda b/dot_bashrc_chitanda
index b6a95ac..aa9c757 100644
--- a/dot_bashrc_chitanda
+++ b/dot_bashrc_chitanda
@@ -5,6 +5,9 @@
 # If not running interactively, don't do anything
 [[ $- != *i* ]] && return
 
+export HISTSIZE=2000
+export HISTFILESIZE=2000
+
 complete -cf sudo
 complete -cf man
 shopt -s autocd
@@ -17,12 +20,13 @@ export EDITOR='vim'
 
 export GOPATH=$HOME/go
 
-export PATH=$HOME/usr/bin:$HOME/go/bin:$PATH
+export PATH=$HOME/usr/bin:$HOME/go/bin:$HOME/.local/bin:$PATH
 export LD_LIBRARY_PATH=$HOME/usr/lib
 
 # PROMPT_COMMAND='echo -ne "\033]0;${USER}@${HOSTNAME}: ${PWD}\007"'
 
 export WINEARCH=win32
+export WINEPREFIX=/home/lx.nobackup/wine
 
 # -- GIT prompt
 GIT_PROMPT_FETCH_REMOTE_STATUS=0
@@ -43,7 +47,7 @@ alias tulipier='ssh auvolat@tulipier.ens.fr'
 alias dgsas='ssh dg@sas.eleves.ens.fr'
 alias dgwww='ssh -t dg@sas.eleves.ens.fr ssh www2.eleves.ens.fr'
 
-alias irc='TERM=xterm ssh -t katchup@adnab.me /usr/local/bin/irc'
+alias irc='ssh -t katchup@adnab.me /usr/local/bin/irc'
 
 
 alias drsync='rsync -arzv --delete --progress'
@@ -51,3 +55,12 @@ alias drsync='rsync -arzv --delete --progress'
 # expand -t 4 $HOME/Core/TODO
 
 keychain ~/.ssh/id_rsa --quiet
+
+export LUA_PATH='/home/lx/.luarocks/share/lua/5.3/?.lua;/home/lx/.luarocks/share/lua/5.3/?/init.lua;/usr/share/lua/5.3/?.lua;/usr/share/lua/5.3/?/init.lua;/usr/lib/lua/5.3/?.lua;/usr/lib/lua/5.3/?/init.lua;./?.lua;./?/init.lua'
+export LUA_CPATH='/home/lx/.luarocks/lib/lua/5.3/?.so;/usr/lib/lua/5.3/?.so;/usr/lib/lua/5.3/loadall.so;./?.so'
+
+export PYTHONPATH=.
+
+alias anac='source /home/lx.nobackup/anaconda2/bin/activate'
+
+source '/home/lx/usr/lib/azure-cli/az.completion'
diff --git a/dot_i3/config.chitanda b/dot_i3/config.chitanda
index 06df504..4b48ace 100644
--- a/dot_i3/config.chitanda
+++ b/dot_i3/config.chitanda
@@ -41,7 +41,8 @@ floating_modifier $mod
 bindsym $mod+Return exec i3-sensible-terminal
 
 # bindsym $mod+Shift+X exec xscreensaver-command -lock
-bindsym $mod+Shift+X exec i3lock -d -c 111111 -I 5
+#bindsym $mod+Shift+X exec i3lock -d -c 111111 -I 5
+bindsym $mod+Shift+X exec /home/lx/.i3/i3lock-dpms
 
 # music control
 bindsym $mod+Shift+P exec mpc toggle
@@ -227,6 +228,10 @@ exec_always xsetroot -cursor_name arrow
 #exec_always feh --bg-scale /home/katchup/wp/undessindedragon2.jpg
 #exec_always feh --bg-scale /home/katchup/Stuff/wp/lain_87_1680.jpg
 #exec_always feh --bg-scale /home/katchup/Stuff/wp/wanikani.png
+#exec_always feh --bg-scale /home/lx/stuff/LimitsToGrowthWorld3.jpg
+#exec_always feh --bg-scale /usr/share/archlinux/wallpaper/archlinux-elation.jpg
+exec_always feh --bg-scale /home/lx/stuff/qMDYqjh.jpg
+
 #exec_always /home/katchup/lab/wkwwin/script.sh
 #exec xscreensaver -nosplash
 exec pulseaudio --start
diff --git a/dot_i3/i3status.conf b/dot_i3/i3status.conf
index 2cc395e..a59d837 100644
--- a/dot_i3/i3status.conf
+++ b/dot_i3/i3status.conf
@@ -1,39 +1,40 @@
 
 
 general {
-        colors = true
-		color_good = "#93D44F"
-		color_bad = "#FF8D8D"
-		color_degraded = "#FFC123"
-        interval = 5
+	output_format = i3bar
+	colors = true
+	color_good = "#93D44F"
+	color_bad = "#FF8D8D"
+	color_degraded = "#FFC123"
+	interval = 5
 }
 
 order += "ipv6"
 # order += "run_watch DHCP"
-# order += "run_watch VPN"
-order += "wireless wlan0"
-order += "ethernet eth0"
+order += "run_watch VPN"
+order += "wireless wlp2s0"
+order += "ethernet enp0s25"
 order += "disk /home"
-order += "mpd"
+# order += "mpd"
 order += "volume master"
 order += "battery 1"
 order += "cpu_temperature 1"
 order += "load"
 order += "time"
 
-mpd {
-    format_up = "%artist - %title"
-    format_down = " - "
-    host = "127.0.0.1"
-    port = 6600
-}
+# mpd {
+#    format_up = "%artist - %title"
+#    format_down = " - "
+#    host = "127.0.0.1"
+#    port = 6600
+#}
 
-wireless wlan0 {
+wireless wlp2s0 {
         format_up = "W: (%quality at %essid) %ip"
         format_down = "W: down"
 }
 
-ethernet eth0 {
+ethernet enp0s25 {
         # if you use %speed, i3status requires root privileges
         format_up = "E: %ip"
         format_down = "E: down"
@@ -55,7 +56,7 @@ run_watch DHCP {
 }
 
 run_watch VPN {
-        pidfile = "/var/run/openvpn-*.pid"
+        pidfile = "/var/run/openvpn@*.pid"
 }
 
 time {
diff --git a/dot_inputrc b/dot_inputrc
index eae4e53..063e24c 100644
--- a/dot_inputrc
+++ b/dot_inputrc
@@ -1,12 +1,10 @@
+set editing-mode vi
 
 "\e[A": history-search-backward
-
 "\e[B": history-search-forward
 
 set show-all-if-ambiguous on
-
 set completion-ignore-case on
-
 set bell-style none
 
 # mappings for Ctrl-left-arrow and Ctrl-right-arrow for word moving
diff --git a/dot_tmux.conf b/dot_tmux.conf
index 0f09c74..fe5de5b 100644
--- a/dot_tmux.conf
+++ b/dot_tmux.conf
@@ -3,8 +3,8 @@ unbind C-s
 bind-key C-s copy-mode
 unbind q
 bind-key q copy-mode
-bind-key -t vi-copy 'v' begin-selection
-bind-key -t vi-copy 'y' copy-selection
+#bind-key -t vi-copy 'v' begin-selection
+#bind-key -t vi-copy 'y' copy-selection
 unbind p
 bind p paste-buffer
 
@@ -24,9 +24,7 @@ unbind ^A
 bind ^A select-pane -t :.+
 
 # Enable mouse control (clickable windows, panes, resizable panes)
-set -g mouse-select-window on
-set -g mouse-select-pane on
-set -g mouse-resize-pane on
+set -g mouse on
 
 # don't rename windows automatically
 set-option -g allow-rename off
@@ -59,7 +57,7 @@ set -g pane-active-border-fg brightred
 
 ## Status bar design
 # status line
-set -g status-utf8 on
+#set -g status-utf8 on
 set -g status-justify left
 set -g status-bg default
 set -g status-fg colour12
diff --git a/dot_vimrc b/dot_vimrc
index 885a5d2..dc7fc76 100644
--- a/dot_vimrc
+++ b/dot_vimrc
@@ -9,6 +9,14 @@ map <leader>m <Esc>:set expandtab ts=2 sw=2 sts=2<CR>
 map <leader>t <Esc>:set noexpandtab ts=4 sw=4 sts=4<CR>
 map <leader>T <Esc>:set expandtab ts=4 sw=4 sts=4<CR>
 
+au FileType python setl sw=4 sts=4 et
+au FileType html setl sw=2 sts=2 et
+au FileType htmldjango setl sw=2 sts=2 et
+au FileType json setl sw=2 sts=2 et
+au FileType yaml setl sw=2 sts=2 et
+au FileType css setl sw=4 sts=4 et
+au FileType lua setl ts=4 sw=4 noet
+
 " Folds:
 map <leader>f <Esc>:set fen fdn=3 fdm=indent fml=1 fdc=3<CR>
 
@@ -24,7 +32,7 @@ set bg=dark
 set mouse=a
 set number
 set relativenumber
-set smartindent
+filetype plugin indent on
 set term=xterm-256color
 
 set cursorline
@@ -37,7 +45,7 @@ let g:sclangTerm = "urxvt -e"
 autocmd FileType tex setlocal spell spelllang=en
 highlight SpellBad ctermfg=red ctermbg=none
 
-let NERDTreeIgnore=['\.o$', '\.cmo$', '\.cmx$', '\.cmi$', '\.lib$', '\.pyc$']
+let NERDTreeIgnore=['\.o$', '\.cmo$', '\.cmx$', '\.cmi$', '\.lib$', '\.pyc$', '^__pycache__$']
 
 set wildmode=list:longest