summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlex Auvolat <alex@adnab.me>2015-05-20 11:01:08 -0400
committerAlex Auvolat <alex@adnab.me>2015-05-20 11:01:08 -0400
commit175b814d8f045dcd59cfacf2debf11895cc03e22 (patch)
tree9be5c6d585f100d303dc88a040f6d7516739cd18
parent5ba35c6159620093123844fa33a8bb8a5f21be7e (diff)
downloaduser-config-175b814d8f045dcd59cfacf2debf11895cc03e22.tar.gz
user-config-175b814d8f045dcd59cfacf2debf11895cc03e22.zip
Updates files as of 2015-05-20
-rw-r--r--dot_Xdefaults19
-rw-r--r--dot_bashrc10
-rw-r--r--dot_i3/config6
-rw-r--r--dot_i3/i3status.conf8
-rw-r--r--dot_inputrc40
-rw-r--r--dot_vimrc24
-rwxr-xr-xdot_xinitrc1
7 files changed, 95 insertions, 13 deletions
diff --git a/dot_Xdefaults b/dot_Xdefaults
index 0db4a55..67a4ac6 100644
--- a/dot_Xdefaults
+++ b/dot_Xdefaults
@@ -1,13 +1,26 @@
URxvt.matcher.button: 1
URxvt*scrollstyle: rxvt
-#URxvt*transparent: true
+
URxvt.perl-ext-common: default,matcher
URxvt.urlLauncher: /usr/bin/firefox
URxvt.scrollBar: off
-Rxvt*shading: 20
+
+URxvt*transparent: true
+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=12
+
+URxvt.perl-ext: default,url-select,font-size
+URxvt.keysym.M-u: perl:url-select:select_next
+URxvt.url-select.launcher: /usr/bin/firefox -new-tab
+URxvt.url-select.underline: true
+URxvt.keysym.C-Up: perl:font-size:increase
+URxvt.keysym.C-Down: perl:font-size:decrease
+
+*visualBell: false
+
sterm*scrollTtyOutput: false
xterm*rightScrollBar: true
xterm*faceName: inconsolata:pixelsize=14
@@ -47,3 +60,5 @@ Xcursor*theme: Adwaita
*color14: #46a4ff
*color15: #ffffff
+rxvt*modifier: alt
+urxvt*modifier: alt
diff --git a/dot_bashrc b/dot_bashrc
index 6739d4b..d4a765f 100644
--- a/dot_bashrc
+++ b/dot_bashrc
@@ -39,11 +39,13 @@ source /home/katchup/usr/google-cloud-sdk/completion.bash.inc
# ------------ OPAM configuration
. /home/katchup/.opam/opam-init/init.sh > /dev/null 2> /dev/null || true
-export PATH=$PATH:$HOME/usr/google-cloud-sdk/bin:$HOME/.opam/system/bin
-
+export PATH=$PATH:$HOME/usr/google-cloud-sdk/bin:$HOME/.opam/system/bin:$HOME/.local/bin
export SDL_VIDEO_X11_DGAMOUSE=0
+export PYLEARN2_DATA_PATH=/home/katchup/s/dataset
+export PATH=$PATH:$HOME/s/pylearn2/pylearn2/scripts
+
alias clipper='ssh -R 9876:localhost:9872 auvolat@sas.eleves.ens.fr'
alias cargo='ssh auvolat@cargo.ens.fr'
@@ -56,4 +58,8 @@ alias irc='TERM=xterm ssh -t adnab.me /usr/local/bin/irc'
alias ocamltop='rlwrap ocaml "$@"'
+alias drsync='rsync -arzv --delete --progress'
+
expand -t 4 $HOME/Core/TODO
+
+
diff --git a/dot_i3/config b/dot_i3/config
index 166ee6f..aa72844 100644
--- a/dot_i3/config
+++ b/dot_i3/config
@@ -47,6 +47,9 @@ bindsym $mod+Shift+X exec i3lock -d -c 111111 -I 5
bindsym $mod+Shift+P exec mpc toggle
bindsym $mod+Shift+N exec mpc next
+bindsym $mod+Shift+S exec /home/katchup/usr/bin/ss
+bindsym $mod+Shift+M exec /home/katchup/usr/bin/ms
+
# kill focused window
bindsym $mod+Shift+Q kill
@@ -152,6 +155,7 @@ for_window [class="StepMania"] floating enable
for_window [class="stepmania"] floating enable
for_window [class="anki"] floating enable
for_window [class="visu.bin"] floating enable
+for_window [class="pathfind"] floating enable
new_window 1pixel
@@ -213,6 +217,6 @@ exec_always xinput --set-prop 'HID 04d9:1133' 'Device Accel Constant Deceleratio
exec_always xinput --set-prop 'HID 04d9:1133' 'Device Accel Adaptive Deceleration' 2
exec_always xinput --set-prop 'HID 04d9:1133' 'Device Accel Velocity Scaling' 5
exec nm-applet
-exec ~/.i3/notify-serv.sh
+#exec ~/.i3/notify-serv.sh
exec xset -b # disable bell
diff --git a/dot_i3/i3status.conf b/dot_i3/i3status.conf
index 4eaab97..2cc395e 100644
--- a/dot_i3/i3status.conf
+++ b/dot_i3/i3status.conf
@@ -17,7 +17,7 @@ order += "disk /home"
order += "mpd"
order += "volume master"
order += "battery 1"
-order += "cpu_temperature 0"
+order += "cpu_temperature 1"
order += "load"
order += "time"
@@ -66,11 +66,11 @@ load {
format = "%1min"
}
-cpu_temperature 0 {
+cpu_temperature 1 {
format = "T: %degrees °C"
- path = "/sys/class/thermal/thermal_zone0/temp"
+ path = "/sys/class/thermal/thermal_zone1/temp"
}
disk "/home" {
- format = "%free"
+ format = "%avail"
}
diff --git a/dot_inputrc b/dot_inputrc
new file mode 100644
index 0000000..80a8419
--- /dev/null
+++ b/dot_inputrc
@@ -0,0 +1,40 @@
+
+"\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
+"\e[1;5C": forward-word
+"\e[1;5D": backward-word
+"\e[5C": forward-word
+"\e[5D": backward-word
+"\e\e[C": forward-word
+"\e\e[D": backward-word
+"\e[0c": forward-word
+"\e[0d": backward-word
+
+# Execute 'jobs'
+"\ej": "\C-a\C-kjobs\n"
+
+# Ajouter "| less" à la fin de la ligne
+"\el": "\C-e | less"
+
+# Ajouter "sudo" au début de la ligne
+"\ex": "\C-asudo \C-e"
+
+# Copier une seconde fois le premier argument de la commande
+# (Ne fonctionne que pour des commandes simples)
+# Pratique lorsqu'on écrit "mv nom_de\ -\ fichier_\[\ complexe\] nom_de\ -\ fichier_\[\ complexe\].txt"
+"\er": '\C-a\ef\C-k\C-y\C-y'
+
+# ouvre un dmenu avec les fichiers du dir courant
+"\ea": ' \\\'$(ls | dmenu -l 24)\\\'\e\C-e'
+
+# insère le nom du fichier le plus récemment modifié
+"\e:": '\\\'$(ls -t -1 -d * | head -n 1)\\\' \e\C-e'
diff --git a/dot_vimrc b/dot_vimrc
index 2793e55..5d22cec 100644
--- a/dot_vimrc
+++ b/dot_vimrc
@@ -6,12 +6,16 @@ let mapleader=","
" Tab modes.
map <leader>m <Esc>:set expandtab ts=2 sw=2 sts=2<CR>
-map <leader>t <Esc>:set noexpandtab ts=4 sw=4<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>
" Folds:
map <leader>f <Esc>:set fen fdn=3 fdm=indent fml=1 fdc=3<CR>
+" H-L for next-prev buffer
+nnoremap L :bnext<CR>
+nnoremap H :bprev<CR>
+
set hlsearch
syntax on
@@ -32,10 +36,11 @@ let g:sclangTerm = "urxvt -e"
autocmd FileType tex setlocal spell spelllang=fr
highlight SpellBad ctermfg=red ctermbg=none
-let NERDTreeIgnore=['\.o$', '\.cmo$', '\.cmx$', '\.cmi$']
+let NERDTreeIgnore=['\.o$', '\.cmo$', '\.cmx$', '\.cmi$', '\.bin$', '\.lib$']
set wildmode=list:longest
+au BufRead,BufNewFile *.make set filetype=make
au BufRead,BufNewFile *.md set filetype=markdown
au BufRead,BufNewFile *.lus set filetype=lustre
au BufRead,BufNewFile *.scade set filetype=scade
@@ -45,9 +50,20 @@ au BufRead,BufNewFile *.scade set filetype=scade
" Use substitute() instead of printf() to handle '%%s' modeline in LaTeX
" files.
function! AppendModeline()
- let l:modeline = printf(" vim: set ts=%d sw=%d tw=%d %set :",
- \ &tabstop, &shiftwidth, &textwidth, &expandtab ? '' : 'no')
+ let l:modeline = printf(" vim: set sts=%d ts=%d sw=%d tw=%d %set :",
+ \ &softtabstop, &tabstop, &shiftwidth, &textwidth, &expandtab ? '' : 'no')
let l:modeline = substitute(&commentstring, "%s", l:modeline, "")
call append(line("$"), l:modeline)
endfunction
nnoremap <silent> <Leader>ml :call AppendModeline()<CR>
+
+
+
+" set completeopt=menuone,menu,longest,preview
+
+set exrc " per-directory .vimrc files
+set secure " no unsafe commands in local .vimrc files
+
+
+
+
diff --git a/dot_xinitrc b/dot_xinitrc
index 9fdea95..b4edd75 100755
--- a/dot_xinitrc
+++ b/dot_xinitrc
@@ -3,6 +3,7 @@
./.xprofile
exec dbus-launch i3
+#startxfce4
#urxvt &
#exec openbox