From 6fd72eb67de65b4ce4c3cf46e3390e7b9cc4a83e Mon Sep 17 00:00:00 2001 From: Oleg Broytman Date: Tue, 6 Mar 2018 11:44:03 +0300 Subject: [PATCH] Update configs after upgrading to Debian 9 "stretch" --- .XCompose | 51 ++++++++++++++++++++++++++++++++++++++ .fvwm/main.m4 | 1 + .gtkrc-2.0 | 12 +++++++++ .mailcap | 52 +++++++++++++++++++-------------------- .xinitrc | 6 ++--- .xserverrc | 2 +- bin/git-open | 21 ++++++++++++++++ bin/git-open-remote | 19 ++++++++++++++ lib/X11/fonts | 5 +++- lib/config/dbus | 9 ------- lib/config/gpg-agent | 9 +------ lib/config/gpg-agent-ssh | 11 --------- lib/config/gpg-agent-stop | 7 +----- lib/config/python | 3 +-- 14 files changed, 140 insertions(+), 68 deletions(-) create mode 100755 bin/git-open create mode 100755 bin/git-open-remote delete mode 100644 lib/config/dbus delete mode 100644 lib/config/gpg-agent-ssh diff --git a/.XCompose b/.XCompose index 8e558ad..010e5c0 100644 --- a/.XCompose +++ b/.XCompose @@ -29,3 +29,54 @@ include "%S/en_US.UTF-8/Compose" : "„" U201E # открывающая кавычка-лапка (RUS) : "“" U201C # закрывающая кавычка-лапка (RUS) + +# Greek + : "Α" U0391 # GREEK CAPITAL LETTER ALPHA + : "α" U03B1 # GREEK SMALL LETTER ALPHA + : "Β" U0392 # GREEK CAPITAL LETTER BETA + : "β" U03B2 # GREEK SMALL LETTER BETA + : "Δ" U0394 # GREEK CAPITAL LETTER DELTA + : "δ" U03B4 # GREEK SMALL LETTER DELTA + : "Ε" U0395 # GREEK CAPITAL LETTER EPSILON + : "ε" U03B5 # GREEK SMALL LETTER EPSILON + : "Φ" U03A6 # GREEK CAPITAL LETTER PHI + : "φ" U03C6 # GREEK SMALL LETTER PHI + : "Γ" U0393 # GREEK CAPITAL LETTER GAMMA + : "γ" U03B3 # GREEK SMALL LETTER GAMMA + : "Η" U0397 # GREEK CAPITAL LETTER ETA + : "η" U03B7 # GREEK SMALL LETTER ETA + : "Ι" U0399 # GREEK CAPITAL LETTER IOTA + : "ι" U03B9 # GREEK SMALL LETTER IOTA + : "Θ" U0398 # GREEK CAPITAL LETTER THETA + : "θ" U03B8 # GREEK SMALL LETTER THETA + : "Κ" U039A # GREEK CAPITAL LETTER KAPPA + : "κ" U03BA # GREEK SMALL LETTER KAPPA + : "Λ" U039B # GREEK CAPITAL LETTER LAMDA + : "λ" U03BB # GREEK SMALL LETTER LAMDA + : "Μ" U039C # GREEK CAPITAL LETTER MU + : "μ" U03BC # GREEK SMALL LETTER MU + : "Ν" U039D # GREEK CAPITAL LETTER NU + : "ν" U03BD # GREEK SMALL LETTER NU + : "Ο" U039F # GREEK CAPITAL LETTER OMICRON + : "ο" U03BF # GREEK SMALL LETTER OMICRON +

: "Π" U03A0 # GREEK CAPITAL LETTER PI +

: "π" U03C0 # GREEK SMALL LETTER PI + : "Χ" U03A7 # GREEK CAPITAL LETTER CHI + : "χ" U03C7 # GREEK SMALL LETTER CHI + : "Ρ" U03A1 # GREEK CAPITAL LETTER RHO + : "ρ" U03C1 # GREEK SMALL LETTER RHO + : "Σ" U03A3 # GREEK CAPITAL LETTER SIGMA + : "σ" U03C3 # GREEK SMALL LETTER SIGMA + : "Τ" U03A4 # GREEK CAPITAL LETTER TAU + : "τ" U03C4 # GREEK SMALL LETTER TAU + : "Υ" U03A5 # GREEK CAPITAL LETTER UPSILON + : "υ" U03C5 # GREEK SMALL LETTER UPSILON + : "Ω" U03A9 # GREEK CAPITAL LETTER OMEGA + : "ω" U03C9 # GREEK SMALL LETTER OMEGA + : "Ξ" U039E # GREEK CAPITAL LETTER XI + : "ξ" U03BE # GREEK SMALL LETTER XI + : "Ψ" U03A8 # GREEK CAPITAL LETTER PSI + : "ψ" U03C8 # GREEK SMALL LETTER PSI + : "Ζ" U0396 # GREEK CAPITAL LETTER ZETA + : "ζ" U03B6 # GREEK SMALL LETTER ZETA + <0> : "µ" U00B5 # MICRO SIGN diff --git a/.fvwm/main.m4 b/.fvwm/main.m4 index 6470257..ec53dcf 100644 --- a/.fvwm/main.m4 +++ b/.fvwm/main.m4 @@ -267,6 +267,7 @@ Style "*Pidgin*" MinOverlapPercentPlacement # (S)MPlayer Style "*MPlayer*" Layer 6, PositionPlacement 350p 100p +Style "*mpv" Layer 6, PositionPlacement 350p 100p Style "*clock" !Title, Sticky, WindowListSkip, Color Black/#40c040, NeverFocus, PositionPlacement 50-50w +1p, Layer 2 Style "emacs" NoPPosition diff --git a/.gtkrc-2.0 b/.gtkrc-2.0 index f690556..ae67df8 100644 --- a/.gtkrc-2.0 +++ b/.gtkrc-2.0 @@ -131,3 +131,15 @@ style "tooltips" widget "gtk-tooltips*" style "tooltips" gtk-recent-files-max-age=1 + +gtk-button-images=1 +gtk-menu-images=1 +gtk-cursor-theme-size=0 +gtk-enable-event-sounds=0 +gtk-enable-input-feedback-sounds=0 +gtk-toolbar-icon-size=GTK_ICON_SIZE_LARGE_TOOLBAR +gtk-toolbar-style=GTK_TOOLBAR_BOTH +gtk-xft-antialias=1 +gtk-xft-hinting=1 +gtk-xft-hintstyle="hintfull" +gtk-xft-rgba="none" diff --git a/.mailcap b/.mailcap index a081400..a64b193 100644 --- a/.mailcap +++ b/.mailcap @@ -1,7 +1,7 @@ # MIME types -> viewers map, RFC 1524. -application/ogg; smplayer %s; description="Ogg container files"; test=test -n "$DISPLAY" -a -n "`which smplayer 2>/dev/null`" -application/ogg; mplayer %s; description="Ogg container files"; test=test -n "$DISPLAY" -a -n "`which mplayer 2>/dev/null`" +application/ogg; smplay %s; description="Ogg container files"; test=test -n "$DISPLAY" -a -n "`which smplayer 2>/dev/null`" -a -n "`which smplay 2>/dev/null`" +application/ogg; mplay %s; description="Ogg container files"; test=test -n "$DISPLAY" -a -n "`which mplayer 2>/dev/null`" -a -n "`which mplay 2>/dev/null`" application/ogg; audtool --playlist-clear --playlist-addurl %s --playback-play; description="Ogg container files"; test=test -n "$DISPLAY" -a -n "`which audtool 2>/dev/null`" && test "`audtool --get-volume`" -gt 0 application/ogg; audacious %s; description="Ogg container files"; test=test -n "$DISPLAY" -a -n "`which audacious 2>/dev/null`" application/ogg; foobar %s; description="Ogg container files"; test=test -n "$DISPLAY" -a -n "`which foobar 2>/dev/null`" @@ -41,41 +41,41 @@ application/vnd.openxmlformats-officedocument.wordprocessingml.document; docx2tx audio/mpeg; audtool --playlist-clear --playlist-addurl %s --playback-play; description="MPEG audio files"; test=test -n "$DISPLAY" -a -n "`which audtool 2>/dev/null`" && test "`audtool --get-volume`" -gt 0 audio/mpeg; audacious %s; description="MPEG audio files"; test=test -n "$DISPLAY" -a -n "`which audacious 2>/dev/null`" audio/mpeg; foobar %s; description="MPEG audio files"; test=test -n "$DISPLAY" -a -n "`which foobar 2>/dev/null`" -audio/mpeg; smplayer %s; description="MPEG audio files"; test=test -n "$DISPLAY" -a -n "`which smplayer 2>/dev/null`" -audio/mpeg; mplayer %s; description="MPEG audio files"; test=test -n "$DISPLAY" -a -n "`which mplayer 2>/dev/null`" +audio/mpeg; smplay %s; description="MPEG audio files"; test=test -n "$DISPLAY" -a -n "`which smplayer 2>/dev/null`" -a -n "`which smplay 2>/dev/null`" +audio/mpeg; mplay %s; description="MPEG audio files"; test=test -n "$DISPLAY" -a -n "`which mplayer 2>/dev/null`" -a -n "`which mplay 2>/dev/null`" audio/mpeg3; audtool --playlist-clear --playlist-addurl %s --playback-play; description="MPEG audio files"; test=test -n "$DISPLAY" -a -n "`which audtool 2>/dev/null`" && test "`audtool --get-volume`" -gt 0 audio/mpeg3; audacious %s; description="MPEG audio files"; test=test -n "$DISPLAY" -a -n "`which audacious 2>/dev/null`" audio/mpeg3; foobar %s; description="MPEG audio files"; test=test -n "$DISPLAY" -a -n "`which foobar 2>/dev/null`" -audio/mpeg3; smplayer %s; description="MPEG audio files"; test=test -n "$DISPLAY" -a -n "`which smplayer 2>/dev/null`" -audio/mpeg3; mplayer %s; description="MPEG audio files"; test=test -n "$DISPLAY" -a -n "`which mplayer 2>/dev/null`" +audio/mpeg3; smplay %s; description="MPEG audio files"; test=test -n "$DISPLAY" -a -n "`which smplayer 2>/dev/null`" -a -n "`which smplay 2>/dev/null`" +audio/mpeg3; mplay %s; description="MPEG audio files"; test=test -n "$DISPLAY" -a -n "`which mplayer 2>/dev/null`" -a -n "`which mplay 2>/dev/null`" audio/mpegurl; audtool --playlist-clear --playlist-addurl %s --playback-play; description="MPEG URLs"; test=test -n "$DISPLAY" -a -n "`which audtool 2>/dev/null`" && test "`audtool --get-volume`" -gt 0 -audio/mpegurl; smplayer -playlist %s; description="MPEG audio files"; test=test -n "$DISPLAY" -a -n "`which smplayer 2>/dev/null`" -audio/mpegurl; mplayer -playlist %s; description="MPEG audio files"; test=test -n "$DISPLAY" -a -n "`which mplayer 2>/dev/null`" +audio/mpegurl; smplay -playlist %s; description="MPEG audio files"; test=test -n "$DISPLAY" -a -n "`which smplayer 2>/dev/null`" -a -n "`which smplay 2>/dev/null`" +audio/mpegurl; mplay -playlist %s; description="MPEG audio files"; test=test -n "$DISPLAY" -a -n "`which mplayer 2>/dev/null`" -a -n "`which mplay 2>/dev/null`" audio/ogg; audtool --playlist-clear --playlist-addurl %s --playback-play; description="Ogg Vorbis audio files"; test=test -n "$DISPLAY" -a -n "`which audtool 2>/dev/null`" && test "`audtool --get-volume`" -gt 0 audio/ogg; audacious %s; description="Ogg Vorbis audio files"; test=test -n "$DISPLAY" -a -n "`which audacious 2>/dev/null`" audio/ogg; foobar %s; description="Ogg Vorbis audio files"; test=test -n "$DISPLAY" -a -n "`which foobar 2>/dev/null`" -audio/ogg; smplayer %s; description="MPEG audio files"; test=test -n "$DISPLAY" -a -n "`which smplayer 2>/dev/null`" -audio/ogg; mplayer %s; description="MPEG audio files"; test=test -n "$DISPLAY" -a -n "`which mplayer 2>/dev/null`" +audio/ogg; smplay %s; description="MPEG audio files"; test=test -n "$DISPLAY" -a -n "`which smplayer 2>/dev/null`" -a -n "`which smplay 2>/dev/null`" +audio/ogg; mplay %s; description="MPEG audio files"; test=test -n "$DISPLAY" -a -n "`which mplayer 2>/dev/null`" -a -n "`which mplay 2>/dev/null`" audio/x-mod; audtool --playlist-clear --playlist-addurl %s --playback-play; description="MOD audio files"; test=test -n "$DISPLAY" -a -n "`which audtool 2>/dev/null`" && test "`audtool --get-volume`" -gt 0 audio/x-mod; audacious %s; description="MOD audio files"; test=test -n "$DISPLAY" -a -n "`which audacious 2>/dev/null`" audio/x-mod; foobar %s; description="MOD audio files"; test=test -n "$DISPLAY" -a -n "`which foobar 2>/dev/null`" audio/x-mpeg; audtool --playlist-clear --playlist-addurl %s --playback-play; description="MPEG audio files"; test=test -n "$DISPLAY" -a -n "`which audtool 2>/dev/null`" && test "`audtool --get-volume`" -gt 0 audio/x-mpeg; audacious %s; description="MPEG audio files"; test=test -n "$DISPLAY" -a -n "`which audacious 2>/dev/null`" audio/x-mpeg; foobar %s; description="MPEG audio files"; test=test -n "$DISPLAY" -a -n "`which foobar 2>/dev/null`" -audio/x-mpeg; smplayer %s; description="MPEG audio files"; test=test -n "$DISPLAY" -a -n "`which smplayer 2>/dev/null`" -audio/x-mpeg; mplayer %s; description="MPEG audio files"; test=test -n "$DISPLAY" -a -n "`which mplayer 2>/dev/null`" +audio/x-mpeg; smplay %s; description="MPEG audio files"; test=test -n "$DISPLAY" -a -n "`which smplayer 2>/dev/null`" -a -n "`which smplay 2>/dev/null`" +audio/x-mpeg; mplay %s; description="MPEG audio files"; test=test -n "$DISPLAY" -a -n "`which mplayer 2>/dev/null`" -a -n "`which mplay 2>/dev/null`" audio/x-pn-realaudio; realplay %s; description="RealAudio files"; test=test -n "$DISPLAY" -a -n "`which realplay 2>/dev/null`" audio/x-realaudio; realplay %s; description="RealAudio files"; test=test -n "$DISPLAY" -a -n "`which realplay 2>/dev/null`" audio/x-wav; audtool --playlist-clear --playlist-addurl %s --playback-play; description="WAV audio files"; test=test -n "$DISPLAY" -a -n "`which audtool 2>/dev/null`" && test "`audtool --get-volume`" -gt 0 audio/x-wav; audacious %s; description="WAV audio files"; test=test -n "$DISPLAY" -a -n "`which audacious 2>/dev/null`" audio/x-wav; foobar %s; description="WAV audio files"; test=test -n "$DISPLAY" -a -n "`which foobar 2>/dev/null`" -audio/x-wav; smplayer %s; description="WAV audio files"; test=test -n "$DISPLAY" -a -n "`which smplayer 2>/dev/null`" -audio/x-wav; mplayer %s; description="WAV audio files"; test=test -n "$DISPLAY" -a -n "`which mplayer 2>/dev/null`" +audio/x-wav; smplay %s; description="WAV audio files"; test=test -n "$DISPLAY" -a -n "`which smplayer 2>/dev/null`" -a -n "`which smplay 2>/dev/null`" +audio/x-wav; mplay %s; description="WAV audio files"; test=test -n "$DISPLAY" -a -n "`which mplayer 2>/dev/null`" -a -n "`which mplay 2>/dev/null`" audio/*; audtool --playlist-clear --playlist-addurl %s --playback-play; description="Audio files"; test=test -n "$DISPLAY" -a -n "`which audtool 2>/dev/null`" && test "`audtool --get-volume`" -gt 0 audio/*; audacious %s; description="Audio files"; test=test -n "$DISPLAY" -a -n "`which audacious 2>/dev/null`" audio/*; foobar %s; description="Audio files"; test=test -n "$DISPLAY" -a -n "`which foobar 2>/dev/null`" -audio/*; smplayer %s; description="Audio files"; test=test -n "$DISPLAY" -a -n "`which smplayer 2>/dev/null`" -audio/*; mplayer %s; description="Audio files"; test=test -n "$DISPLAY" -a -n "`which mplayer 2>/dev/null`" +audio/*; smplay %s; description="Audio files"; test=test -n "$DISPLAY" -a -n "`which smplayer 2>/dev/null`" -a -n "`which smplay 2>/dev/null`" +audio/*; mplay %s; description="Audio files"; test=test -n "$DISPLAY" -a -n "`which mplayer 2>/dev/null`" -a -n "`which mplay 2>/dev/null`" image/gif; xli %s; description="GIF image files"; test=test -n "$DISPLAY" -a -n "`which xli 2>/dev/null`" image/gif; xloadimage %s; description="GIF image files"; test=test -n "$DISPLAY" -a -n "`which xloadimage 2>/dev/null`" @@ -121,16 +121,16 @@ text/*; gview %s; edit=gvim -f %s; compose=gvim -f %s; description="Text"; test= text/*; less %s; edit=vim %s; needsterminal; description=Text; test=test -n "`which less 2>/dev/null`" text/*; more %s; edit=vi %s; needsterminal; description=Text; test=test -n "`which more 2>/dev/null`" -video/mpeg; smplayer %s; description="MPEG video files"; test=test -n "$DISPLAY" -a -n "`which smplayer 2>/dev/null`" -video/mpeg; mplayer %s; description="MPEG video files"; test=test -n "$DISPLAY" -a -n "`which mplayer 2>/dev/null`" -video/ogg; smplayer %s; description="Ogg Theora files"; test=test -n "$DISPLAY" -a -n "`which smplayer 2>/dev/null`" -video/ogg; mplayer %s; description="Ogg Theora files"; test=test -n "$DISPLAY" -a -n "`which mplayer 2>/dev/null`" -video/quicktime; smplayer %s; description="QuickTime video files"; test=test -n "$DISPLAY" -a -n "`which smplayer 2>/dev/null`" -video/quicktime; mplayer %s; description="QuickTime video files"; test=test -n "$DISPLAY" -a -n "`which mplayer 2>/dev/null`" -video/x-msvideo; smplayer %s; description="AVI video files"; test=test -n "$DISPLAY" -a -n "`which smplayer 2>/dev/null`" -video/x-msvideo; mplayer %s; description="AVI video files"; test=test -n "$DISPLAY" -a -n "`which mplayer 2>/dev/null`" -video/*; smplayer %s; description="Video files"; test=test -n "$DISPLAY" -a -n "`which smplayer 2>/dev/null`" -video/*; mplayer %s; description="Video files"; test=test -n "$DISPLAY" -a -n "`which mplayer 2>/dev/null`" +video/mpeg; smplay %s; description="MPEG video files"; test=test -n "$DISPLAY" -a -n "`which smplayer 2>/dev/null`" -a -n "`which smplay 2>/dev/null`" +video/mpeg; mplay %s; description="MPEG video files"; test=test -n "$DISPLAY" -a -n "`which mplayer 2>/dev/null`" -a -n "`which mplay 2>/dev/null`" +video/ogg; smplay %s; description="Ogg Theora files"; test=test -n "$DISPLAY" -a -n "`which smplayer 2>/dev/null`" -a -n "`which smplay 2>/dev/null`" +video/ogg; mplay %s; description="Ogg Theora files"; test=test -n "$DISPLAY" -a -n "`which mplayer 2>/dev/null`" -a -n "`which mplay 2>/dev/null`" +video/quicktime; smplay %s; description="QuickTime video files"; test=test -n "$DISPLAY" -a -n "`which smplayer 2>/dev/null`" -a -n "`which smplay 2>/dev/null`" +video/quicktime; mplay %s; description="QuickTime video files"; test=test -n "$DISPLAY" -a -n "`which mplayer 2>/dev/null`" -a -n "`which mplay 2>/dev/null`" +video/x-msvideo; smplay %s; description="AVI video files"; test=test -n "$DISPLAY" -a -n "`which smplayer 2>/dev/null`" -a -n "`which smplay 2>/dev/null`" +video/x-msvideo; mplay %s; description="AVI video files"; test=test -n "$DISPLAY" -a -n "`which mplayer 2>/dev/null`" -a -n "`which mplay 2>/dev/null`" +video/*; smplay %s; description="Video files"; test=test -n "$DISPLAY" -a -n "`which smplayer 2>/dev/null`" -a -n "`which smplay 2>/dev/null`" +video/*; mplay %s; description="Video files"; test=test -n "$DISPLAY" -a -n "`which mplayer 2>/dev/null`" -a -n "`which mplay 2>/dev/null`" x-world/x-vrml; freewrl -url %s; test=test -n "$DISPLAY" -a -n "`which freewrl 2>/dev/null`"; description="VRML world"; nametemplate=%s.wrl diff --git a/.xinitrc b/.xinitrc index e6fe19f..dffb5a9 100644 --- a/.xinitrc +++ b/.xinitrc @@ -38,7 +38,7 @@ setxkbmap -layout 'us,ru' -variant ',common' -option 'grp:toggle,compose:rctrl,l # X settings: shorter beep #xset b 50 400 50 # mouse acceleration -xset m 5/2 +#xset m 5/2 # keyboard autorepeat xset r on # screen saver 5 minutes @@ -74,9 +74,7 @@ if [ -z "$WINDOW_MANAGER" ]; then export WINDOW_MANAGER fi -gpg-agent --daemon --write-env-file "$HOME"/.gnupg/agent-info \ - dbus-launch --exit-with-session \ - "$WINDOW_MANAGER" +dbus-launch --exit-with-session gpg-agent --daemon "$WINDOW_MANAGER" # Stop pulseaudio, xscreensaver and xsetbg.py pulseaudio -k diff --git a/.xserverrc b/.xserverrc index ce84721..91d705f 100644 --- a/.xserverrc +++ b/.xserverrc @@ -1,2 +1,2 @@ #!/bin/sh -exec X -auth $HOME/.Xauthority -nolisten tcp -quiet +exec /usr/bin/X -nolisten tcp -quiet "$@" diff --git a/bin/git-open b/bin/git-open new file mode 100755 index 0000000..ebb6e0a --- /dev/null +++ b/bin/git-open @@ -0,0 +1,21 @@ +#! /bin/sh + +if [ -z "$1" -o -n "$2" ]; then + echo "Usage: git open url_key" >&2 + exit 1 +else + url_key="$1" +fi + +if [ -z "$url_key" ]; then + echo "Usage: git open url_key" >&2 + exit 1 +fi + +browser_section="`git config --get web.browser`" +browser_cmd="`git config --get browser.\"$browser_section\".cmd`" +if [ -z "$browser_cmd" ]; then + browser_cmd="webbrowser -n" +fi + +exec $browser_cmd "`git config --get $url_key`" diff --git a/bin/git-open-remote b/bin/git-open-remote new file mode 100755 index 0000000..45c3a7e --- /dev/null +++ b/bin/git-open-remote @@ -0,0 +1,19 @@ +#! /bin/sh + +if [ -z "$1" ]; then + branch="`git rev-parse --abbrev-ref HEAD`" + remote="`git config --get branch.$branch.remote`" +elif [ -n "$2" ]; then + echo "Usage: git open-remote [remote_name]" >&2 + exit 1 +else + remote="$1" +fi + +if [ -z "$remote" ]; then + echo "Cannot find remote for branch $branch" >&2 + echo "Usage: git open-remote [remote_name]" >&2 + exit 1 +fi + +exec git-open remote.$remote.url diff --git a/lib/X11/fonts b/lib/X11/fonts index 6a54aba..59bc43c 100644 --- a/lib/X11/fonts +++ b/lib/X11/fonts @@ -61,7 +61,10 @@ #endif Xft.antialias: true +Xft.autohint: false Xft.dpi: 96 Xft.hinting: full -Xft.hintstyle: hintslight +! Xft.hintstyle: hintslight +Xft.hintstyle: hintfull +Xft.lcdfilter: lcddefault Xft.rgba: rgb diff --git a/lib/config/dbus b/lib/config/dbus deleted file mode 100644 index 997ee83..0000000 --- a/lib/config/dbus +++ /dev/null @@ -1,9 +0,0 @@ -if [ -z "$DBUS_SESSION_BUS_ADDRESS" ]; then - - . "$HOME"/.dbus/session-bus/* - export DBUS_SESSION_BUS_ADDRESS - -else - - echo "DBUS has already been set" -fi diff --git a/lib/config/gpg-agent b/lib/config/gpg-agent index 8ff9bee..5e79e37 100644 --- a/lib/config/gpg-agent +++ b/lib/config/gpg-agent @@ -1,9 +1,2 @@ -if test -f "$HOME"/.gnupg/agent-info && - kill -0 `head -1 "$HOME"/.gnupg/agent-info | cut -d: -f 2` 2>/dev/null; then - . "$HOME"/.gnupg/agent-info - export GPG_AGENT_INFO -else - eval `gpg-agent --daemon --write-env-file "$HOME"/.gnupg/agent-info` -fi - +gpgconf --launch gpg-agent && include gpg-agent-update-tty diff --git a/lib/config/gpg-agent-ssh b/lib/config/gpg-agent-ssh deleted file mode 100644 index 61d7489..0000000 --- a/lib/config/gpg-agent-ssh +++ /dev/null @@ -1,11 +0,0 @@ -if test -f "$HOME"/.gnupg/agent-info && - kill -0 `head -1 "$HOME"/.gnupg/agent-info | cut -d: -f 2` 2>/dev/null; then - . "$HOME"/.gnupg/agent-info - export GPG_AGENT_INFO - export SSH_AUTH_SOCK - export SSH_AGENT_PID -else - eval `gpg-agent --daemon --enable-ssh-support --write-env-file "$HOME"/.gnupg/agent-info` -fi - -include gpg-agent-update-tty diff --git a/lib/config/gpg-agent-stop b/lib/config/gpg-agent-stop index 33ed837..d1b6c67 100644 --- a/lib/config/gpg-agent-stop +++ b/lib/config/gpg-agent-stop @@ -1,6 +1 @@ -if test -f "$HOME"/.gnupg/agent-info && - kill -0 `head -1 "$HOME"/.gnupg/agent-info | cut -d: -f 2` 2>/dev/null; then - kill `head -1 "$HOME"/.gnupg/agent-info | cut -d: -f 2` -else - echo GPG agent is not running >&2 -fi +gpgconf --kill gpg-agent diff --git a/lib/config/python b/lib/config/python index 8f64e02..ca338f0 100644 --- a/lib/config/python +++ b/lib/config/python @@ -6,6 +6,5 @@ export PY_VER if type -p pip >/dev/null 2>&1; then eval "`pip completion --bash`" rm -rf /tmp/pip_build_"$USER" - complete -F _pip_completion pip2 pip2.7 pip3 pip3.4 + complete -F _pip_completion pip2 pip2.7 pip3 pip3.3 pip3.4 pip3.5 pip3.6 fi - -- 2.39.5