Fix conflicts

master
Quentin Duchemin 2019-06-13 10:58:24 +02:00
commit eae02c0f8d
Signed by: Chosto
GPG Key ID: 0547178FEEDE7D6B
2 changed files with 11 additions and 1 deletions

View File

@ -7,8 +7,18 @@
title_use_system_font = False title_use_system_font = False
use_custom_url_handler = True use_custom_url_handler = True
[keybindings] [keybindings]
go_down = <Primary><Shift>Down
go_left = <Primary><Shift>Left
go_next = <Primary><Shift>n
go_prev = <Primary><Shift>p
go_right = <Primary><Shift>Right
go_up = <Primary><Shift>Up
layout_launcher = <Shift><Alt>l layout_launcher = <Shift><Alt>l
reset_clear = <Primary><Shift>l reset_clear = <Primary><Shift>l
resize_down = <Primary><Alt>Down
resize_left = <Primary><Alt>Left
resize_right = <Primary><Alt>Right
resize_up = <Primary><Alt>Up
switch_to_tab_1 = None switch_to_tab_1 = None
switch_to_tab_2 = None switch_to_tab_2 = None
[layouts] [layouts]

2
.zshrc
View File

@ -110,7 +110,7 @@ alias pica02='sshfs qduchemi@pica02.picasoft.net:/DATA/docker /mnt/pica02'
alias pica_test='sshfs qduchemi@pica01-test.picasoft.net:/DATA/docker /mnt/pica01-test' alias pica_test='sshfs qduchemi@pica01-test.picasoft.net:/DATA/docker /mnt/pica01-test'
# SSH port forwarding for Picasoft LDAP # SSH port forwarding for Picasoft LDAP
alias ldap_pica='sudo ssh -L 389:localhost:389 qduchemi@monitoring.picasoft.net -i /home/.ssh/id_rsa' alias ldap_pica='sudo ssh -L 389:localhost:389 qduchemi@monitoring.picasoft.net -i ~/.ssh/id_rsa'
# Start ssh-agent and retain passphrase for 1 hour # Start ssh-agent and retain passphrase for 1 hour
# ssh-add is not used for convenience # ssh-add is not used for convenience