From 1ad3818c4d62667da8b118aba91f84f57b2f630c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Th=C3=A9ophile=20Bastian?= Date: Tue, 13 Dec 2016 16:06:25 +0100 Subject: [PATCH] Update config files --- files/.Xdefaults | 2 +- files/.bash_sshagent | 5 ++ files/.config/i3/bin/screenshot | 16 ++++++ files/.config/i3/config | 4 ++ files/.config/terminator/config | 8 ++- files/.ssh/config | 83 +++++++++++++++++++++--------- files/.vim/spell/en.utf-8.add | 1 + files/.vim/spell/en.utf-8.add.spl | Bin 536 -> 549 bytes files/.vim/spell/fr.utf-8.add | 3 ++ files/.vim/spell/fr.utf-8.add.spl | Bin 196 -> 273 bytes files/.vimrc | 13 +++-- 11 files changed, 105 insertions(+), 30 deletions(-) create mode 100755 files/.config/i3/bin/screenshot diff --git a/files/.Xdefaults b/files/.Xdefaults index 977e227..018d284 100644 --- a/files/.Xdefaults +++ b/files/.Xdefaults @@ -8,7 +8,7 @@ URxvt.urgentOnBell: True URxvt.scrollBar: false -URxvt.font: xft:Monospace:size=10 +URxvt.font: xft:Monospace:size=9 URxvt.letterSpace: -1 ! Copy-paste diff --git a/files/.bash_sshagent b/files/.bash_sshagent index e057107..45c9a0b 100644 --- a/files/.bash_sshagent +++ b/files/.bash_sshagent @@ -1,5 +1,10 @@ #!/bin/bash +if ! which gpg-connect-agent > /dev/null 2>&1; then + # GPG-agent is not installed on this machine, don't do anything. + return +fi + mkdir -p ~/.gnupg # Start the gpg-agent if not already running diff --git a/files/.config/i3/bin/screenshot b/files/.config/i3/bin/screenshot new file mode 100755 index 0000000..a17e92a --- /dev/null +++ b/files/.config/i3/bin/screenshot @@ -0,0 +1,16 @@ +#!/bin/bash + +BASEPATH="$HOME/Images/screenshots" +cName="$BASEPATH/$(date +%F_%H-%M-%S).png" + +case "$1" in + 'root') + import -window root "$cName" + ;; + 'active') + import -window $(xdotool getwindowfocus -f) -frame "$cName" + ;; + *) + >&2 echo -e "Error: bad action type. Usage:\n$0 [root|active]" + exit 1 +esac diff --git a/files/.config/i3/config b/files/.config/i3/config index a304e32..084b934 100644 --- a/files/.config/i3/config +++ b/files/.config/i3/config @@ -156,6 +156,10 @@ bindsym $mod+Shift+KP_4 exec ~/.config/i3/bin/screenplace left bindsym $mod+Shift+KP_5 exec ~/.config/i3/bin/screenplace reset bindsym $mod+Shift+KP_6 exec ~/.config/i3/bin/screenplace right +# Screenshot +bindsym $mod+Print exec ~/.config/i3/bin/screenshot root +bindsym $mod+Shift+Print exec ~/.config/i3/bin/screenshot active + # reload the configuration file bindsym $mod+Shift+c reload # restart i3 inplace (preserves your layout/session, can be used to upgrade i3) diff --git a/files/.config/terminator/config b/files/.config/terminator/config index 2ffe337..b513ac7 100644 --- a/files/.config/terminator/config +++ b/files/.config/terminator/config @@ -23,10 +23,11 @@ background_darkness = 0.79 background_image = None background_type = transparent - font = Sans 10 + font = Monospace 9 foreground_color = "#fffeab" scrollbar_position = hidden show_titlebar = False + use_system_font = False [[Proj_nocursor]] background_color = "#ffffff" background_image = None @@ -49,5 +50,10 @@ palette = "#2e3436:#cc0000:#4e9a06:#ca5307:#3465a4:#75507b:#06989a:#d3d7cf:#555753:#ef2929:#8ae234:#ff751d:#657689:#ad7fa8:#34e2e2:#eeeeec" scrollbar_position = hidden show_titlebar = False + [[vsmall_font]] + background_image = None + font = Sans 6 + foreground_color = "#ffffff" + use_system_font = False [[with_titlebar]] background_image = None diff --git a/files/.ssh/config b/files/.ssh/config index b667756..46cbebe 100644 --- a/files/.ssh/config +++ b/files/.ssh/config @@ -1,39 +1,76 @@ -Host sas.ens -User tbastian -Hostname sas.eleves.ens.fr +Host sas + User tbastian + Hostname sas.eleves.ens.fr Host minecraft -User minecraft -Hostname games.tobast.fr + User minecraft + Hostname games.tobast.fr Host teeworlds -User teeworlds -Hostname games.tobast.fr + User teeworlds + Hostname games.tobast.fr Host insurgency -Host insurgency -User insurgency -Hostname games.tobast.fr + User insurgency + Hostname games.tobast.fr Host factorio -User factorio -Hostname games.tobast.fr + User factorio + Hostname games.tobast.fr Host orac -User btheophile -Hostname orac.amt.edu.au + User btheophile + Hostname orac.amt.edu.au Host www.tobast -User www -Hostname tobast.fr + User www + Hostname tobast.fr Host proloVM -User tobast -Hostname prologin.org -Port 42022 + User tobast + Hostname prologin.org + Port 42022 + +Host rosa + Hostname prologin.org Host git-pass -User gogs -Hostname git.tobast.fr -Identityfile ~/.password-store/id_rsa_pass -IdentitiesOnly yes + User gogs + Hostname git.tobast.fr + Identityfile ~/.password-store/id_rsa_pass + IdentitiesOnly yes + +Host promethee + User root + Hostname promethee.tobast.fr + ProxyJump paquebot + +Host gourous + User gourous + Hostname sas.eleves.ens.fr + SendEnv LC_REALUSER + +# Virtual networks, safe anyway +Host 10.42.0.* + StrictHostKeyChecking no + UserKnownHostsFile=/dev/null + +Host paquebot + User tbastian + Hostname paquebot.ens.fr +Host thym + User tbastian + Hostname thym.ens.fr +Host allege + User tbastian + Hostname allege.ens.fr + +Host annuaire-dev + User annuaire-dev + Hostname www.eleves.ens.fr + SendEnv LC_REALUSER + +Host tartelette + User tobast + ProxyJump paquebot + Hostname tartelette.tobast.fr diff --git a/files/.vim/spell/en.utf-8.add b/files/.vim/spell/en.utf-8.add index ed05e2c..35f3c28 100644 --- a/files/.vim/spell/en.utf-8.add +++ b/files/.vim/spell/en.utf-8.add @@ -31,3 +31,4 @@ Javascript frontend spelllang=fr Reprojection +Prologin diff --git a/files/.vim/spell/en.utf-8.add.spl b/files/.vim/spell/en.utf-8.add.spl index a00b6617f308eda4f1df30a5707750ee13d63d5f..5c6bac08d6acd6ab4f45d8dacd47a4ee6cc92981 100644 GIT binary patch delta 56 zcmbQivXq4{%+t5HAT=k)=syDkWA8@3PDUA~)O;p}e8wWi6h=k{hL%*u9L9XcbP(G( JbMi9AA^^0V4jljh delta 43 ycmZ3=GJ}OL%+t5HAT=k)=syDkW6MUqPDXylR3?Ue#v;ZPMn(pPmek3c8H)fAr3=9T diff --git a/files/.vim/spell/fr.utf-8.add b/files/.vim/spell/fr.utf-8.add index 2fd02c0..6da70bf 100644 --- a/files/.vim/spell/fr.utf-8.add +++ b/files/.vim/spell/fr.utf-8.add @@ -8,3 +8,6 @@ Vandermonde iid PPV d'overfitting +Prologin +qu'intelligemment +non-bloquante diff --git a/files/.vim/spell/fr.utf-8.add.spl b/files/.vim/spell/fr.utf-8.add.spl index 581248c27338b3951bc4d1b45907b8737deb9b62..09292caa8e3fe215ff67dc2c6330d35b9455376d 100644 GIT binary patch literal 273 zcmXAkF%H5o3`O%JCT`FJpiV5zRYxQSR`#|DQKgWEG*se9oC6NPjo`aU20P#HJND&t zo}=~t@KZ{Cw_QJ&F~oabU|?~_104oDp*52k86zW :!make +map :w:!make imap :echo 'F1 help disabled' map :!git status -map {{ :lprev -map }} :lnext -map {} :ll +map [[ :lprev +map ]] :lnext +map [] :ll nnoremap w :call TrimWhitespace()